diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-01-24 17:04:17 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-18 11:13:53 +0000 |
| commit | fe663ceeac87a510a3472b14974135ac0ca6091f (patch) | |
| tree | 0d9b0adfccd16f0d3406b4e12ed0ace9770c5ee0 | |
| parent | 6ccf3a8537f98856df78afce2eb5a041b1f8cf72 (diff) | |
Un-blacklist tst_QQuickFramebufferObject: skip offscreen/software rendering
Task-number: QTBUG-65614
Change-Id: I31e2a61e3b2df2432042c8b6028df63cc9cb8d22
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 8fb4fb6d014ba4bbaa7f7d22998cfda4ea5e9855)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tests/auto/quick/qquickframebufferobject/BLACKLIST | 8 | ||||
| -rw-r--r-- | tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/tests/auto/quick/qquickframebufferobject/BLACKLIST b/tests/auto/quick/qquickframebufferobject/BLACKLIST deleted file mode 100644 index de1bb7ad6d..0000000000 --- a/tests/auto/quick/qquickframebufferobject/BLACKLIST +++ /dev/null @@ -1,8 +0,0 @@ -[testInvalidate) -# QTBUG-65614 -b2qt -qnx - -[testThatStuffWorks] -b2qt -qnx diff --git a/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp b/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp index c1d6f483fc..2d19f29972 100644 --- a/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp +++ b/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp @@ -28,6 +28,7 @@ #include <qtest.h> +#include <QGuiApplication> #include <QtQuick/qquickitem.h> #include <QtQuick/qquickview.h> #include <qopenglcontext.h> @@ -209,6 +210,10 @@ void tst_QQuickFramebufferObject::testThatStuffWorks() view.requestActivate(); QVERIFY(QTest::qWaitForWindowExposed(&view)); + if (QGuiApplication::platformName() == "offscreen" && + view.rendererInterface()->graphicsApi() == QSGRendererInterface::Software) + QSKIP("offscreen software rendering doesn't work with FBOs"); + QImage result = view.grabWindow(); QCOMPARE(frameInfo.renderCount, 1); @@ -249,6 +254,10 @@ void tst_QQuickFramebufferObject::testInvalidate() view.requestActivate(); QVERIFY(QTest::qWaitForWindowExposed(&view)); + if (QGuiApplication::platformName() == "offscreen" && + view.rendererInterface()->graphicsApi() == QSGRendererInterface::Software) + QSKIP("offscreen software rendering doesn't work with FBOs"); + QCOMPARE(frameInfo.fboSize, QSize(200, 200)); frameInfo.createFBOCount = 0; |