From 3fe904e23199fe73637425a26bb81dbbf069b2f7 Mon Sep 17 00:00:00 2001 From: Lauri Pohjanheimo Date: Wed, 8 Jan 2025 16:23:02 +0200 Subject: [PATCH] RenderToRgb10Texture test 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-6331 Pick-to: 6.8 Change-Id: I4a7e64e464ea04409154be2e7b3135ecd88a29fc Reviewed-by: Assam Boudjelthia --- tests/auto/gui/rhi/qrhi/BLACKLIST | 2 -- tests/auto/gui/rhi/qrhi/tst_qrhi.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/auto/gui/rhi/qrhi/BLACKLIST b/tests/auto/gui/rhi/qrhi/BLACKLIST index 018c0fa968d..6be11331c7d 100644 --- a/tests/auto/gui/rhi/qrhi/BLACKLIST +++ b/tests/auto/gui/rhi/qrhi/BLACKLIST @@ -13,7 +13,5 @@ android # Ditto [renderToFloatTexture] android -[renderToRgb10Texture] -android [tessellation vulkan] android diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index bd9618c369a..85b88b1fded 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -6113,6 +6113,13 @@ void tst_QRhi::renderToRgb10Texture() if (!rhi->isTextureFormatSupported(QRhiTexture::RGB10A2)) QSKIP("RGB10A2 is not supported, skipping test"); +#ifdef Q_OS_ANDROID + if (impl == QRhi::OpenGLES2) { + if (rhi->driverInfo().deviceName.contains("SwiftShader")) + QSKIP("SwiftShader software acceleration is used which does not support this OpenGLES feature. See QTBUG-132934"); + } +#endif + const QSize outputSize(1920, 1080); QScopedPointer texture(rhi->newTexture(QRhiTexture::RGB10A2, outputSize, 1, QRhiTexture::RenderTarget | QRhiTexture::UsedAsTransferSource));