diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index f70c6e5f648..5c7bce5b61e 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -2163,13 +2163,6 @@ 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"); @@ -2177,6 +2170,11 @@ void tst_QRhi::renderToTextureTextureArray() if (!rhi->isFeatureSupported(QRhi::TextureArrays)) QSKIP("TextureArrays is not supported with this backend, skipping test"); + if (isAndroidOpenGLSwiftShader(impl, rhi.get())) { + QSKIP("SwiftShader software acceleration is used which does not support this OpenGLES " + "feature. See QTBUG-132934"); + } + const QSize outputSize(512, 256); const int ARRAY_SIZE = 8; QScopedPointer texture(rhi->newTextureArray(QRhiTexture::RGBA8, @@ -5430,13 +5428,6 @@ void tst_QRhi::threeDimTexture() 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)); if (!rhi) QSKIP("QRhi could not be created, skipping testing 3D textures"); @@ -5444,6 +5435,11 @@ void tst_QRhi::threeDimTexture() if (!rhi->isFeatureSupported(QRhi::ThreeDimensionalTextures)) QSKIP("Skipping testing 3D textures because they are reported as unsupported"); + if (isAndroidOpenGLSwiftShader(impl, rhi.get())) { + QSKIP("SwiftShader software acceleration is used which does not support this OpenGLES " + "feature. See QTBUG-132934"); + } + const int WIDTH = 512; const int HEIGHT = 256; const int DEPTH = 128;