diff options
| author | Konsta Alajärvi <[email protected]> | 2025-01-09 13:14:10 +0200 |
|---|---|---|
| committer | Konsta Alajärvi <[email protected]> | 2025-01-23 08:44:56 +0000 |
| commit | d8f75f34c94aadff98722ec236a43115dfae8956 (patch) | |
| tree | 00f08cf5e8b9709b6f1f8127cde56a4fbbba5d73 | |
| parent | b80679a90f39106052f1b53f4073e679d5077a5f (diff) | |
Unblacklist tst_qrhi threeDimTexture()
Unblacklist tst_qrhi threeDimTexture() test function, by skipping
it with Android OpenGLES.
Fixes: QTQAINFRA-6333
Change-Id: I795dd73fc7b35ab065f206030458088d829be9c8
Reviewed-by: Assam Boudjelthia <[email protected]>
| -rw-r--r-- | tests/auto/gui/rhi/qrhi/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/gui/rhi/qrhi/tst_qrhi.cpp | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/gui/rhi/qrhi/BLACKLIST b/tests/auto/gui/rhi/qrhi/BLACKLIST index 8b8ecb09dcc..186ea26d779 100644 --- a/tests/auto/gui/rhi/qrhi/BLACKLIST +++ b/tests/auto/gui/rhi/qrhi/BLACKLIST @@ -4,9 +4,6 @@ android # QTBUG-92211 [renderPassDescriptorCompatibility] android -# Skip 3D textures with Android emulator, the sw-based GL there is no good -[threeDimTexture] -android # Ditto [renderToTextureSampleWithSeparateTextureAndSampler] android diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index 24089a3d309..3912b9d2653 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -5263,6 +5263,13 @@ void tst_QRhi::threeDimTexture() QFETCH(QRhi::Implementation, impl); QFETCH(QRhiInitParams *, initParams); +#ifdef Q_OS_ANDROID + if (impl == QRhi::OpenGLES2) { + QSKIP("This test fails with OpenGLES software rendering on Android emulators, " + "see QTBUG-132934."); + } +#endif + QScopedPointer<QRhi> rhi(QRhi::create(impl, initParams)); if (!rhi) QSKIP("QRhi could not be created, skipping testing 3D textures"); |