From a34b5d60e010a0dfd451b1d6fff6798bdedc61b4 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 Change-Id: I59c914b66645dc30e7f1a34f9aefc7fb66e95a67 Reviewed-by: Rami Potinkara Reviewed-by: Assam Boudjelthia --- 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 b3284f89795..8b8ecb09dcc 100644 --- a/tests/auto/gui/rhi/qrhi/BLACKLIST +++ b/tests/auto/gui/rhi/qrhi/BLACKLIST @@ -7,9 +7,6 @@ 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 # Ditto [renderToTextureSampleWithSeparateTextureAndSampler] android diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index 88b561c6428..24089a3d309 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");