From 83a4128ecbc260231b942f811b34fbe7595b14bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konsta=20Alaj=C3=A4rvi?= Date: Fri, 17 Jan 2025 08:16:50 +0200 Subject: [PATCH] Unblacklist tst_qrhi renderToTextureSampleWithSeparateTextureAndSampler Unblacklist test function by skipping it with Android with Vulkan. Fixes: QTQAINFRA-6335 Pick-to: 6.9 6.8 Change-Id: I2ee093542f09f68044baa044b697a09af066fcd8 Reviewed-by: Rami Potinkara Reviewed-by: Assam Boudjelthia Reviewed-by: Lauri Pohjanheimo --- tests/auto/gui/rhi/qrhi/BLACKLIST | 2 -- tests/auto/gui/rhi/qrhi/tst_qrhi.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/auto/gui/rhi/qrhi/BLACKLIST b/tests/auto/gui/rhi/qrhi/BLACKLIST index f664eaf971f..4a325f7436f 100644 --- a/tests/auto/gui/rhi/qrhi/BLACKLIST +++ b/tests/auto/gui/rhi/qrhi/BLACKLIST @@ -3,7 +3,5 @@ android # Skip 3D textures on Android emulator: Software GL implementation doesn't work and GLES 3.0 # won't be available. -[renderToTextureSampleWithSeparateTextureAndSampler] -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 5c7bce5b61e..c9d18a2f42a 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -2413,6 +2413,12 @@ void tst_QRhi::renderToTextureSampleWithSeparateTextureAndSampler() QFETCH(QRhi::Implementation, impl); QFETCH(QRhiInitParams *, initParams); +#ifdef Q_OS_ANDROID + if (impl == QRhi::Vulkan) { + QSKIP("This function fails with Vulkan on Android, see QTQAINFRA-6926 for more info."); + } +#endif + QScopedPointer rhi(QRhi::create(impl, initParams, QRhi::Flags(), nullptr)); if (!rhi) QSKIP("QRhi could not be created, skipping testing rendering");