From 51a66f473286e4c374b4441b8da11f31151f0496 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 15 Oct 2020 16:48:47 +0200 Subject: tests: Port qquickitemlayer and remove direct GL checks Change-Id: I7362ae0dcbc67005c09df5c5c704912d10a74827 Reviewed-by: Andy Nichols --- tests/auto/quick/qquickimage/tst_qquickimage.cpp | 2 +- tests/auto/quick/qquickitemlayer/data/Effect.qml | 9 +- .../qquickitemlayer/data/SamplerNameChange.qml | 8 +- .../auto/quick/qquickitemlayer/data/SourceRect.qml | 12 +-- .../qquickitemlayer/data/TextureMirroring.qml | 15 +--- .../quick/qquickitemlayer/data/TextureProvider.qml | 13 +-- tests/auto/quick/qquickitemlayer/data/Visible.qml | 9 +- .../quick/qquickitemlayer/data/ZOrderChange.qml | 6 +- .../quick/qquickitemlayer/data/buildshaders.bat | 7 ++ tests/auto/quick/qquickitemlayer/data/effect.frag | 16 ++++ .../quick/qquickitemlayer/data/effect.frag.qsb | Bin 0 -> 1218 bytes .../qquickitemlayer/data/samplerNameChange.frag | 16 ++++ .../data/samplerNameChange.frag.qsb | Bin 0 -> 1178 bytes .../quick/qquickitemlayer/data/sourceRect.frag | 19 ++++ .../quick/qquickitemlayer/data/sourceRect.frag.qsb | Bin 0 -> 1393 bytes .../qquickitemlayer/data/textureMirroring.frag | 16 ++++ .../qquickitemlayer/data/textureMirroring.frag.qsb | Bin 0 -> 1132 bytes .../qquickitemlayer/data/textureProvider.frag | 16 ++++ .../qquickitemlayer/data/textureProvider.frag.qsb | Bin 0 -> 1216 bytes tests/auto/quick/qquickitemlayer/data/visible.frag | 16 ++++ .../quick/qquickitemlayer/data/visible.frag.qsb | Bin 0 -> 1216 bytes .../quick/qquickitemlayer/data/zOrderChange.frag | 16 ++++ .../qquickitemlayer/data/zOrderChange.frag.qsb | Bin 0 -> 1210 bytes .../quick/qquickitemlayer/tst_qquickitemlayer.cpp | 98 --------------------- tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 4 - 25 files changed, 132 insertions(+), 166 deletions(-) create mode 100644 tests/auto/quick/qquickitemlayer/data/buildshaders.bat create mode 100644 tests/auto/quick/qquickitemlayer/data/effect.frag create mode 100644 tests/auto/quick/qquickitemlayer/data/effect.frag.qsb create mode 100644 tests/auto/quick/qquickitemlayer/data/samplerNameChange.frag create mode 100644 tests/auto/quick/qquickitemlayer/data/samplerNameChange.frag.qsb create mode 100644 tests/auto/quick/qquickitemlayer/data/sourceRect.frag create mode 100644 tests/auto/quick/qquickitemlayer/data/sourceRect.frag.qsb create mode 100644 tests/auto/quick/qquickitemlayer/data/textureMirroring.frag create mode 100644 tests/auto/quick/qquickitemlayer/data/textureMirroring.frag.qsb create mode 100644 tests/auto/quick/qquickitemlayer/data/textureProvider.frag create mode 100644 tests/auto/quick/qquickitemlayer/data/textureProvider.frag.qsb create mode 100644 tests/auto/quick/qquickitemlayer/data/visible.frag create mode 100644 tests/auto/quick/qquickitemlayer/data/visible.frag.qsb create mode 100644 tests/auto/quick/qquickitemlayer/data/zOrderChange.frag create mode 100644 tests/auto/quick/qquickitemlayer/data/zOrderChange.frag.qsb (limited to 'tests') diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp index 8e016bd014..976a7e90ba 100644 --- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp @@ -169,7 +169,7 @@ void tst_qquickimage::imageSource_data() QTest::newRow("remote svg") << "/heart.svg" << 595.0 << 841.0 << true << false << false << ""; if (QImageReader::supportedImageFormats().contains("svgz")) QTest::newRow("remote svgz") << "/heart.svgz" << 595.0 << 841.0 << true << false << false << ""; - if (graphicsApi == QSGRendererInterface::OpenGL) { + if (graphicsApi == QSGRendererInterface::OpenGLRhi) { QTest::newRow("texturefile pkm format") << testFileUrl("logo.pkm").toString() << 256.0 << 256.0 << false << false << true << ""; QTest::newRow("texturefile ktx format") << testFileUrl("car.ktx").toString() << 146.0 << 80.0 << false << false << true << ""; QTest::newRow("texturefile async") << testFileUrl("logo.pkm").toString() << 256.0 << 256.0 << false << true << true << ""; diff --git a/tests/auto/quick/qquickitemlayer/data/Effect.qml b/tests/auto/quick/qquickitemlayer/data/Effect.qml index 678f86538d..91f27c224a 100644 --- a/tests/auto/quick/qquickitemlayer/data/Effect.qml +++ b/tests/auto/quick/qquickitemlayer/data/Effect.qml @@ -21,14 +21,7 @@ Item layer.enabled: true layer.effect: ShaderEffect { - fragmentShader: " - uniform lowp sampler2D source; - uniform lowp float qt_Opacity; - varying highp vec2 qt_TexCoord0; - void main() { - gl_FragColor = texture2D(source, qt_TexCoord0).bgra * qt_Opacity; - }" + fragmentShader: "effect.frag.qsb" } - } } diff --git a/tests/auto/quick/qquickitemlayer/data/SamplerNameChange.qml b/tests/auto/quick/qquickitemlayer/data/SamplerNameChange.qml index a4c2ebff6b..e5f7b196be 100644 --- a/tests/auto/quick/qquickitemlayer/data/SamplerNameChange.qml +++ b/tests/auto/quick/qquickitemlayer/data/SamplerNameChange.qml @@ -6,13 +6,7 @@ Rectangle { color: "blue" layer.enabled: true layer.effect: ShaderEffect { - fragmentShader: " - uniform sampler2D foo; - uniform lowp float qt_Opacity; - varying highp vec2 qt_TexCoord0; - void main() { - gl_FragColor = texture2D(foo, qt_TexCoord0) * qt_Opacity; - }" + fragmentShader: "samplerNameChange.frag.qsb" } Component.onCompleted: layer.samplerName = "foo" } diff --git a/tests/auto/quick/qquickitemlayer/data/SourceRect.qml b/tests/auto/quick/qquickitemlayer/data/SourceRect.qml index 76ad61bd14..ee8d352a8d 100644 --- a/tests/auto/quick/qquickitemlayer/data/SourceRect.qml +++ b/tests/auto/quick/qquickitemlayer/data/SourceRect.qml @@ -17,17 +17,7 @@ Item // A shader that pads the transparent pixels with blue. layer.effect: ShaderEffect { - fragmentShader: " - uniform lowp sampler2D source; - uniform lowp float qt_Opacity; - varying highp vec2 qt_TexCoord0; - void main() { - mediump vec4 c = texture2D(source, qt_TexCoord0); - if (c.a == 0.0) - c = vec4(0, 0, 1, 1); - gl_FragColor = c * qt_Opacity; - } - " + fragmentShader: "sourceRect.frag.qsb" } } } diff --git a/tests/auto/quick/qquickitemlayer/data/TextureMirroring.qml b/tests/auto/quick/qquickitemlayer/data/TextureMirroring.qml index 2827960153..afe55d0cc1 100644 --- a/tests/auto/quick/qquickitemlayer/data/TextureMirroring.qml +++ b/tests/auto/quick/qquickitemlayer/data/TextureMirroring.qml @@ -57,13 +57,7 @@ Item layer.samplerName: "source" layer.effect: ShaderEffect { property variant source: layeredEffectBox - fragmentShader: " - uniform lowp sampler2D source; - varying highp vec2 qt_TexCoord0; - void main() { - gl_FragColor = texture2D(source, qt_TexCoord0); - }" - + fragmentShader: "textureMirroring.frag.qsb" } Rectangle { @@ -149,11 +143,6 @@ Item width: 50 height: 50 property variant source: theSource - fragmentShader: " - uniform lowp sampler2D source; - varying highp vec2 qt_TexCoord0; - void main() { - gl_FragColor = texture2D(source, qt_TexCoord0); - }" + fragmentShader: "textureMirroring.frag.qsb" } } diff --git a/tests/auto/quick/qquickitemlayer/data/TextureProvider.qml b/tests/auto/quick/qquickitemlayer/data/TextureProvider.qml index 427bd41310..f9ddd1aaf0 100644 --- a/tests/auto/quick/qquickitemlayer/data/TextureProvider.qml +++ b/tests/auto/quick/qquickitemlayer/data/TextureProvider.qml @@ -1,7 +1,6 @@ import QtQuick 2.0 -Item -{ +Item { width: 200 height: 100 @@ -27,14 +26,6 @@ Item ShaderEffect { anchors.fill: parent property variant source: box - - fragmentShader: " - uniform lowp sampler2D source; - uniform lowp float qt_Opacity; - varying highp vec2 qt_TexCoord0; - void main() { - gl_FragColor = texture2D(source, qt_TexCoord0).bgra * qt_Opacity; - }" + fragmentShader: "textureProvider.frag.qsb" } - } diff --git a/tests/auto/quick/qquickitemlayer/data/Visible.qml b/tests/auto/quick/qquickitemlayer/data/Visible.qml index 8267f18250..c75039bb64 100644 --- a/tests/auto/quick/qquickitemlayer/data/Visible.qml +++ b/tests/auto/quick/qquickitemlayer/data/Visible.qml @@ -22,14 +22,7 @@ Item Component { id: shaderEffect ShaderEffect { - fragmentShader: " - uniform lowp sampler2D source; - uniform lowp float qt_Opacity; - varying highp vec2 qt_TexCoord0; - void main() { - gl_FragColor = texture2D(source, qt_TexCoord0).bgra * qt_Opacity; - } - " + fragmentShader: "visible.frag.qsb" } } diff --git a/tests/auto/quick/qquickitemlayer/data/ZOrderChange.qml b/tests/auto/quick/qquickitemlayer/data/ZOrderChange.qml index ebbd3b7e15..0b951c677e 100644 --- a/tests/auto/quick/qquickitemlayer/data/ZOrderChange.qml +++ b/tests/auto/quick/qquickitemlayer/data/ZOrderChange.qml @@ -40,11 +40,7 @@ Item { Component { id: effectComponent ShaderEffect { - fragmentShader: " - uniform sampler2D source; - uniform lowp float qt_Opacity; - varying highp vec2 qt_TexCoord0; - void main() { gl_FragColor = texture2D(source, qt_TexCoord0).xzyw * qt_Opacity; }" + fragmentShader: "zOrderChange.frag.qsb" } } } diff --git a/tests/auto/quick/qquickitemlayer/data/buildshaders.bat b/tests/auto/quick/qquickitemlayer/data/buildshaders.bat new file mode 100644 index 0000000000..cac4ad69b6 --- /dev/null +++ b/tests/auto/quick/qquickitemlayer/data/buildshaders.bat @@ -0,0 +1,7 @@ +qsb --glsl "100 es,120,150" --hlsl 50 --msl 12 -o effect.frag.qsb effect.frag +qsb --glsl "100 es,120,150" --hlsl 50 --msl 12 -o samplerNameChange.frag.qsb samplerNameChange.frag +qsb --glsl "100 es,120,150" --hlsl 50 --msl 12 -o sourceRect.frag.qsb sourceRect.frag +qsb --glsl "100 es,120,150" --hlsl 50 --msl 12 -o textureMirroring.frag.qsb textureMirroring.frag +qsb --glsl "100 es,120,150" --hlsl 50 --msl 12 -o textureProvider.frag.qsb textureProvider.frag +qsb --glsl "100 es,120,150" --hlsl 50 --msl 12 -o visible.frag.qsb visible.frag +qsb --glsl "100 es,120,150" --hlsl 50 --msl 12 -o zOrderChange.frag.qsb zOrderChange.frag diff --git a/tests/auto/quick/qquickitemlayer/data/effect.frag b/tests/auto/quick/qquickitemlayer/data/effect.frag new file mode 100644 index 0000000000..efaa63f176 --- /dev/null +++ b/tests/auto/quick/qquickitemlayer/data/effect.frag @@ -0,0 +1,16 @@ +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; + float qt_Opacity; +}; + +void main() +{ + fragColor = texture(source, qt_TexCoord0).bgra * qt_Opacity; +} diff --git a/tests/auto/quick/qquickitemlayer/data/effect.frag.qsb b/tests/auto/quick/qquickitemlayer/data/effect.frag.qsb new file mode 100644 index 0000000000..a35d2ceac5 Binary files /dev/null and b/tests/auto/quick/qquickitemlayer/data/effect.frag.qsb differ diff --git a/tests/auto/quick/qquickitemlayer/data/samplerNameChange.frag b/tests/auto/quick/qquickitemlayer/data/samplerNameChange.frag new file mode 100644 index 0000000000..0775000711 --- /dev/null +++ b/tests/auto/quick/qquickitemlayer/data/samplerNameChange.frag @@ -0,0 +1,16 @@ +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D foo; + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; + float qt_Opacity; +}; + +void main() +{ + fragColor = texture(foo, qt_TexCoord0) * qt_Opacity; +} diff --git a/tests/auto/quick/qquickitemlayer/data/samplerNameChange.frag.qsb b/tests/auto/quick/qquickitemlayer/data/samplerNameChange.frag.qsb new file mode 100644 index 0000000000..f21e589709 Binary files /dev/null and b/tests/auto/quick/qquickitemlayer/data/samplerNameChange.frag.qsb differ diff --git a/tests/auto/quick/qquickitemlayer/data/sourceRect.frag b/tests/auto/quick/qquickitemlayer/data/sourceRect.frag new file mode 100644 index 0000000000..1d4b4c2022 --- /dev/null +++ b/tests/auto/quick/qquickitemlayer/data/sourceRect.frag @@ -0,0 +1,19 @@ +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; + float qt_Opacity; +}; + +void main() +{ + vec4 c = texture(source, qt_TexCoord0); + if (c.a == 0.0) + c = vec4(0, 0, 1, 1); + fragColor = c * qt_Opacity; +} diff --git a/tests/auto/quick/qquickitemlayer/data/sourceRect.frag.qsb b/tests/auto/quick/qquickitemlayer/data/sourceRect.frag.qsb new file mode 100644 index 0000000000..d112e791b4 Binary files /dev/null and b/tests/auto/quick/qquickitemlayer/data/sourceRect.frag.qsb differ diff --git a/tests/auto/quick/qquickitemlayer/data/textureMirroring.frag b/tests/auto/quick/qquickitemlayer/data/textureMirroring.frag new file mode 100644 index 0000000000..b4ccdbe9a6 --- /dev/null +++ b/tests/auto/quick/qquickitemlayer/data/textureMirroring.frag @@ -0,0 +1,16 @@ +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; + float qt_Opacity; +}; + +void main() +{ + fragColor = texture(source, qt_TexCoord0); +} diff --git a/tests/auto/quick/qquickitemlayer/data/textureMirroring.frag.qsb b/tests/auto/quick/qquickitemlayer/data/textureMirroring.frag.qsb new file mode 100644 index 0000000000..ada6fd977d Binary files /dev/null and b/tests/auto/quick/qquickitemlayer/data/textureMirroring.frag.qsb differ diff --git a/tests/auto/quick/qquickitemlayer/data/textureProvider.frag b/tests/auto/quick/qquickitemlayer/data/textureProvider.frag new file mode 100644 index 0000000000..efaa63f176 --- /dev/null +++ b/tests/auto/quick/qquickitemlayer/data/textureProvider.frag @@ -0,0 +1,16 @@ +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; + float qt_Opacity; +}; + +void main() +{ + fragColor = texture(source, qt_TexCoord0).bgra * qt_Opacity; +} diff --git a/tests/auto/quick/qquickitemlayer/data/textureProvider.frag.qsb b/tests/auto/quick/qquickitemlayer/data/textureProvider.frag.qsb new file mode 100644 index 0000000000..11dc643c5d Binary files /dev/null and b/tests/auto/quick/qquickitemlayer/data/textureProvider.frag.qsb differ diff --git a/tests/auto/quick/qquickitemlayer/data/visible.frag b/tests/auto/quick/qquickitemlayer/data/visible.frag new file mode 100644 index 0000000000..efaa63f176 --- /dev/null +++ b/tests/auto/quick/qquickitemlayer/data/visible.frag @@ -0,0 +1,16 @@ +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; + float qt_Opacity; +}; + +void main() +{ + fragColor = texture(source, qt_TexCoord0).bgra * qt_Opacity; +} diff --git a/tests/auto/quick/qquickitemlayer/data/visible.frag.qsb b/tests/auto/quick/qquickitemlayer/data/visible.frag.qsb new file mode 100644 index 0000000000..caa8d1926d Binary files /dev/null and b/tests/auto/quick/qquickitemlayer/data/visible.frag.qsb differ diff --git a/tests/auto/quick/qquickitemlayer/data/zOrderChange.frag b/tests/auto/quick/qquickitemlayer/data/zOrderChange.frag new file mode 100644 index 0000000000..f408da4b82 --- /dev/null +++ b/tests/auto/quick/qquickitemlayer/data/zOrderChange.frag @@ -0,0 +1,16 @@ +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; + float qt_Opacity; +}; + +void main() +{ + fragColor = texture(source, qt_TexCoord0).xzyw * qt_Opacity; +} diff --git a/tests/auto/quick/qquickitemlayer/data/zOrderChange.frag.qsb b/tests/auto/quick/qquickitemlayer/data/zOrderChange.frag.qsb new file mode 100644 index 0000000000..f9e08e659c Binary files /dev/null and b/tests/auto/quick/qquickitemlayer/data/zOrderChange.frag.qsb differ diff --git a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp index 7817ebbcc5..dd5a9aa12f 100644 --- a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp +++ b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp @@ -87,10 +87,6 @@ private slots: private: void mirroringCheck(int mirroring, int x, bool shouldMirror, const QImage &fb); - - bool m_isMesaSoftwareRasterizer = false; - int m_mesaVersion = 0; - bool m_isOpenGLRenderer = true; }; tst_QQuickItemLayer::tst_QQuickItemLayer() { } @@ -98,44 +94,9 @@ tst_QQuickItemLayer::tst_QQuickItemLayer() { } void tst_QQuickItemLayer::initTestCase() { QQmlDataTest::initTestCase(); -#if QT_CONFIG(opengl) - if (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL)) { - QWindow window; - QOpenGLContext context; - window.setSurfaceType(QWindow::OpenGLSurface); - window.create(); - QVERIFY(context.create()); - QVERIFY(context.makeCurrent(&window)); - const char *vendor = (const char *)context.functions()->glGetString(GL_VENDOR); - const char *renderer = (const char *)context.functions()->glGetString(GL_RENDERER); - m_isMesaSoftwareRasterizer = strcmp(vendor, "Mesa Project") == 0 - && strcmp(renderer, "Software Rasterizer") == 0; - if (m_isMesaSoftwareRasterizer) { - // Expects format: Mesa [-devel] [...] - const char *version = (const char *)context.functions()->glGetString(GL_VERSION); - QList list = QByteArray(version).split(' '); - if (list.size() >= 3) { - list = list.at(2).split('-').at(0).split('.'); - int major = 0; - int minor = 0; - int patch = 0; - if (list.size() >= 1) - major = list.at(0).toInt(); - if (list.size() >= 2) - minor = list.at(1).toInt(); - if (list.size() >= 3) - patch = list.at(2).toInt(); - m_mesaVersion = QT_VERSION_CHECK(major, minor, patch); - } - } - window.create(); - } -#endif QQuickView view; view.showNormal(); QVERIFY(QTest::qWaitForWindowExposed(&view)); - if (view.rendererInterface()->graphicsApi() != QSGRendererInterface::OpenGL) - m_isOpenGLRenderer = false; } // The test draws a red and a blue box next to each other and tests that the @@ -144,9 +105,6 @@ void tst_QQuickItemLayer::initTestCase() void tst_QQuickItemLayer::layerSmooth() { - if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) - QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); - if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) QSKIP("Skipping due to grabWindow not functional on offscreen/minimal platforms"); @@ -169,9 +127,6 @@ void tst_QQuickItemLayer::layerSmooth() void tst_QQuickItemLayer::layerEnabled() { - if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) - QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); - if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) QSKIP("Skipping due to grabWindow not functional on offscreen/minimal platforms"); @@ -190,9 +145,6 @@ void tst_QQuickItemLayer::layerEnabled() void tst_QQuickItemLayer::layerMipmap() { - if (m_isMesaSoftwareRasterizer) - QSKIP("Mipmapping does not work with the Mesa Software Rasterizer."); - QImage fb = runTest("Mipmap.qml"); QVERIFY(fb.pixel(0, 0) != 0xff000000); QVERIFY(fb.pixel(0, 0) != 0xffffffff); @@ -205,16 +157,10 @@ void tst_QQuickItemLayer::layerMipmap() void tst_QQuickItemLayer::layerEffect() { - if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) - QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); - if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) QSKIP("Skipping due to grabWindow not functional on offscreen/minimal platforms"); - if (!m_isOpenGLRenderer) - QSKIP("Only OpenGL Renderer supports GLSL ShaderEffects"); - QImage fb = runTest("Effect.qml"); QVERIFY(!fb.size().isEmpty()); QCOMPARE(fb.pixel(0, 0), qRgb(0xff, 0, 0)); @@ -227,12 +173,6 @@ void tst_QQuickItemLayer::layerEffect() // a shader that pads transparent to blue. Everything else is red. void tst_QQuickItemLayer::layerSourceRect() { - if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) - QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); - - if (!m_isOpenGLRenderer) - QSKIP("Only OpenGL Renderer supports GLSL ShaderEffects"); - QImage fb = runTest("SourceRect.qml"); QVERIFY(!fb.size().isEmpty()); @@ -252,12 +192,6 @@ void tst_QQuickItemLayer::layerSourceRect() // directly in a stand alone ShaderEffect void tst_QQuickItemLayer::layerIsTextureProvider() { - if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) - QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); - - if (!m_isOpenGLRenderer) - QSKIP("Only OpenGL Renderer supports GLSL ShaderEffects"); - QImage fb = runTest("TextureProvider.qml"); QVERIFY(!fb.size().isEmpty()); QCOMPARE(fb.pixel(0, 0), qRgb(0xff, 0, 0)); @@ -289,12 +223,6 @@ void tst_QQuickItemLayer::layerVisibility_data() void tst_QQuickItemLayer::layerVisibility() { - if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) - QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); - - if (!m_isOpenGLRenderer) - QSKIP("Only OpenGL Renderer supports GLSL ShaderEffects"); - QFETCH(bool, visible); QFETCH(bool, effect); QFETCH(qreal, opacity); @@ -340,12 +268,6 @@ void tst_QQuickItemLayer::layerZOrder_data() void tst_QQuickItemLayer::layerZOrder() { - if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) - QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); - - if (!m_isOpenGLRenderer) - QSKIP("Only OpenGL Renderer supports GLSL ShaderEffects"); - QFETCH(bool, effect); QQuickView view; @@ -377,12 +299,6 @@ void tst_QQuickItemLayer::changeZOrder_data() void tst_QQuickItemLayer::changeZOrder() { - if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) - QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); - - if (!m_isOpenGLRenderer) - QSKIP("Only OpenGL Renderer supports GLSL ShaderEffects"); - QFETCH(bool, layered); QFETCH(bool, effect); @@ -448,12 +364,6 @@ void tst_QQuickItemLayer::disableLayer() void tst_QQuickItemLayer::changeSamplerName() { - if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) - QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); - - if (!m_isOpenGLRenderer) - QSKIP("Only OpenGL Renderer supports GLSL ShaderEffects"); - QImage fb = runTest("SamplerNameChange.qml"); QVERIFY(!fb.size().isEmpty()); QCOMPARE(fb.pixel(0, 0), qRgb(0, 0, 0xff)); @@ -461,11 +371,6 @@ void tst_QQuickItemLayer::changeSamplerName() void tst_QQuickItemLayer::itemEffect() { - if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) - QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); - if (!m_isOpenGLRenderer) - QSKIP("Only OpenGL Renderer supports GLSL ShaderEffects"); - QImage fb = runTest("ItemEffect.qml"); QVERIFY(!fb.size().isEmpty()); QCOMPARE(fb.pixel(0, 0), qRgb(0xff, 0, 0)); @@ -507,9 +412,6 @@ void tst_QQuickItemLayer::textureMirroring() { QFETCH(int, mirroring); - if (!m_isOpenGLRenderer) - QSKIP("Only OpenGL Renderer supports GLSL ShaderEffects"); - QQuickView view; view.setSource(testFileUrl("TextureMirroring.qml")); diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index a92488105e..5f88276d14 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -1606,8 +1606,6 @@ void tst_qquickwindow::headless() // Verify that the window is alive and kicking QVERIFY(window->isSceneGraphInitialized()); - const bool isGL = window->rendererInterface()->graphicsApi() == QSGRendererInterface::OpenGL; - // Store the visual result QImage originalContent = window->grabWindow(); @@ -1617,8 +1615,6 @@ void tst_qquickwindow::headless() if (threaded) { QTRY_VERIFY(invalidated.size() >= 1); - if (isGL) - QVERIFY(!window->isSceneGraphInitialized()); } // Destroy the native windowing system buffers window->destroy(); -- cgit v1.2.3