From e8a71279c6a50cb7c78e5382440dd492f28cbe4f 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 Change-Id: I2ee093542f09f68044baa044b697a09af066fcd8 Reviewed-by: Rami Potinkara Reviewed-by: Assam Boudjelthia Reviewed-by: Lauri Pohjanheimo (cherry picked from commit fd15b2178a3468bf1fcd04b79467e1400ec6c8d3) --- 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 6386075cae4..6be11331c7d 100644 --- a/tests/auto/gui/rhi/qrhi/BLACKLIST +++ b/tests/auto/gui/rhi/qrhi/BLACKLIST @@ -11,8 +11,6 @@ android [renderToTextureTextureArray] android # Ditto -[renderToTextureSampleWithSeparateTextureAndSampler] -android [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 dcf2e0275a0..1787e887422 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -2322,6 +2322,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");