From 7140c5b68842ed2ea92674c50787c6be9cc09df1 Mon Sep 17 00:00:00 2001 From: Lauri Pohjanheimo Date: Mon, 3 Feb 2025 16:30:13 +0200 Subject: [PATCH] QRhi test renderToTextureArrayOfTexturedQuad unblacklisted On CI an Android emulator with SwiftShader software graphics implementation is used. SwiftShader implementation is unable to emulate this OpenGL functionality. Blacklisting removed. QSKIP the test if it is run in Android platform, OpenGL and SwiftShader sw graphics implementation is found. Task-number: QTQAINFRA-6330 Change-Id: Ib0832f35b63540d57a273fc6dba1e310de917439 Reviewed-by: Nicholas Bennett --- tests/auto/gui/rhi/qrhi/BLACKLIST | 3 --- tests/auto/gui/rhi/qrhi/tst_qrhi.cpp | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/auto/gui/rhi/qrhi/BLACKLIST b/tests/auto/gui/rhi/qrhi/BLACKLIST index 3df7f70c5fc..f664eaf971f 100644 --- a/tests/auto/gui/rhi/qrhi/BLACKLIST +++ b/tests/auto/gui/rhi/qrhi/BLACKLIST @@ -1,6 +1,3 @@ -# QTBUG-87429 -[renderToTextureArrayOfTexturedQuad] -android # QTBUG-92211 [renderPassDescriptorCompatibility] android diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index 57f5d175ef8..f70c6e5f648 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -2538,6 +2538,11 @@ void tst_QRhi::renderToTextureArrayOfTexturedQuad() if (!rhi) QSKIP("QRhi could not be created, skipping testing rendering"); + if (isAndroidOpenGLSwiftShader(impl, rhi.get())) { + QSKIP("SwiftShader software acceleration is used which does not support this OpenGLES " + "feature. See QTBUG-132934"); + } + QImage inputImage; inputImage.load(QLatin1String(":/data/qt256.png")); QVERIFY(!inputImage.isNull());