From 9239e7cdef4d2cec71ac7fb68a9bf57a08f0b3e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konsta=20Alaj=C3=A4rvi?= Date: Thu, 12 Dec 2024 09:38:57 +0200 Subject: [PATCH] Unblacklist tst_qrhi renderToTextureArray Try to unblacklist renderToTextureArray test on android Fixes: QTQAINFRA-6334 Pick-to: 6.8 Change-Id: I59c914b66645dc30e7f1a34f9aefc7fb66e95a67 Reviewed-by: Rami Potinkara Reviewed-by: Assam Boudjelthia (cherry picked from commit a34b5d60e010a0dfd451b1d6fff6798bdedc61b4) --- tests/auto/gui/rhi/qrhi/BLACKLIST | 4 ---- tests/auto/gui/rhi/qrhi/tst_qrhi.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/auto/gui/rhi/qrhi/BLACKLIST b/tests/auto/gui/rhi/qrhi/BLACKLIST index 6d974dd1486..713e4ca18fb 100644 --- a/tests/auto/gui/rhi/qrhi/BLACKLIST +++ b/tests/auto/gui/rhi/qrhi/BLACKLIST @@ -4,10 +4,6 @@ android # QTBUG-92211 [renderPassDescriptorCompatibility] android -# Same here, GLES 3.0 features seem hopeless -[renderToTextureTextureArray] -android -# Ditto [renderToFloatTexture] android [tessellation vulkan] diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index 59de9942c1e..dcb5a319547 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -2079,6 +2079,13 @@ void tst_QRhi::renderToTextureTextureArray() 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, QRhi::Flags(), nullptr)); if (!rhi) QSKIP("QRhi could not be created, skipping testing rendering");