diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-10-15 16:48:47 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-10-16 16:32:54 +0200 |
commit | 51a66f473286e4c374b4441b8da11f31151f0496 (patch) | |
tree | 44d02cb8e5b32b7cec8502f1c7885fcc1eb15f34 /tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp | |
parent | 0aa2b58b9003fa002b7727d3b1eb274c3285e555 (diff) |
tests: Port qquickitemlayer and remove direct GL checks
Change-Id: I7362ae0dcbc67005c09df5c5c704912d10a74827
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp')
-rw-r--r-- | tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp | 98 |
1 files changed, 0 insertions, 98 deletions
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: <OpenGL version> Mesa <Mesa version>[-devel] [...] - const char *version = (const char *)context.functions()->glGetString(GL_VERSION); - QList<QByteArray> 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")); |