diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/rhi/qrhi/tst_qrhi.cpp | 12 | ||||
| -rw-r--r-- | tests/manual/rhi/texuploads/texuploads.cpp | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index d3524a39b7..41057a15ab 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -519,9 +519,8 @@ void tst_QRhi::nativeTexture() #ifdef TST_VK case QRhi::Vulkan: { - auto *image = static_cast<const VkImage *>(nativeTex.object); + auto image = VkImage(nativeTex.object); QVERIFY(image); - QVERIFY(*image); QVERIFY(nativeTex.layout >= 1); // VK_IMAGE_LAYOUT_GENERAL QVERIFY(nativeTex.layout <= 8); // VK_IMAGE_LAYOUT_PREINITIALIZED } @@ -530,27 +529,24 @@ void tst_QRhi::nativeTexture() #ifdef TST_GL case QRhi::OpenGLES2: { - auto *textureId = static_cast<const uint *>(nativeTex.object); + auto textureId = uint(nativeTex.object); QVERIFY(textureId); - QVERIFY(*textureId); } break; #endif #ifdef TST_D3D11 case QRhi::D3D11: { - auto *texture = static_cast<void * const *>(nativeTex.object); + auto *texture = reinterpret_cast<void *>(nativeTex.object); QVERIFY(texture); - QVERIFY(*texture); } break; #endif #ifdef TST_MTL case QRhi::Metal: { - void * const * texture = (void * const *)nativeTex.object; + auto texture = (void *)nativeTex.object; QVERIFY(texture); - QVERIFY(*texture); } break; #endif diff --git a/tests/manual/rhi/texuploads/texuploads.cpp b/tests/manual/rhi/texuploads/texuploads.cpp index a6b7d87d3e..b6500c3fc3 100644 --- a/tests/manual/rhi/texuploads/texuploads.cpp +++ b/tests/manual/rhi/texuploads/texuploads.cpp @@ -241,7 +241,7 @@ void Window::customRender() if (nativeTexture.object) { #if defined(Q_OS_MACOS) || defined(Q_OS_IOS) if (graphicsApi == Metal) { - qDebug() << "Metal texture: " << *(void**)nativeTexture.object; + qDebug() << "Metal texture: " << nativeTexture.object; // Now could cast to id<MTLTexture> and do something with // it, keeping in mind that copy operations are only done // in beginPass, while rendering into a texture may only |