From 31e6f4a2ca95536b984e8c11dcf44ee856f62eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konsta=20Alaj=C3=A4rvi?= Date: Thu, 9 Jan 2025 13:14:10 +0200 Subject: [PATCH] Unblacklist tst_qrhi threeDimTexture() Unblacklist tst_qrhi threeDimTexture() test function, by skipping it with Android OpenGLES. Fixes: QTQAINFRA-6333 Pick-to: 6.8 Change-Id: I795dd73fc7b35ab065f206030458088d829be9c8 Reviewed-by: Assam Boudjelthia (cherry picked from commit d8f75f34c94aadff98722ec236a43115dfae8956) --- tests/auto/gui/rhi/qrhi/BLACKLIST | 3 --- 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 6be11331c7d..6d974dd1486 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 # Same here, GLES 3.0 features seem hopeless [renderToTextureTextureArray] android diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index 85b88b1fded..59de9942c1e 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -5262,6 +5262,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 rhi(QRhi::create(impl, initParams)); if (!rhi) QSKIP("QRhi could not be created, skipping testing 3D textures");