diff options
Diffstat (limited to 'tests/auto/gui/qopenglconfig')
| -rw-r--r-- | tests/auto/gui/qopenglconfig/buglist.json | 106 | ||||
| -rw-r--r-- | tests/auto/gui/qopenglconfig/qopenglconfig.pro | 1 | ||||
| -rw-r--r-- | tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp | 51 |
3 files changed, 151 insertions, 7 deletions
diff --git a/tests/auto/gui/qopenglconfig/buglist.json b/tests/auto/gui/qopenglconfig/buglist.json new file mode 100644 index 0000000000..d2d06645aa --- /dev/null +++ b/tests/auto/gui/qopenglconfig/buglist.json @@ -0,0 +1,106 @@ +{ + "name": "gpu driver bug list example", + "version": "0.9", + "entries": [ + { + "id": 1, + "description": "non-applicable feature: different OS", + "vendor_id": "0x10de", + "device_id": [ "0x0DE9" ], + "os": { + "type": "android" + }, + "features": [ + "wrong_feature1" + ] + }, + { + "id": 2, + "description": "non-applicable feature: ancient OS", + "vendor_id": "0x10de", + "device_id": [ "0x0DE9" ], + "os": { + "type": "win", + "version": { + "op": "<", + "value": "4.0" + } + }, + "features": [ + "wrong_feature2" + ] + }, + { + "id": 3, + "description": "non-applicable feature: excluded OS", + "vendor_id": "0x10de", + "device_id": [ "0x0DE9" ], + "exceptions": [ + { + "os": { + "type": "win" + } + } + ], + "features": [ + "wrong_feature3" + ] + }, + { + "id": 4, + "description": "non-applicable feature: wrong vendor", + "vendor_id": "0x10df", + "device_id": [ "0x0DE9" ], + "os": { + "type": "win" + }, + "features": [ + "wrong_feature4" + ] + }, + { + "id": 4, + "description": "non-applicable feature: wrong device", + "vendor_id": "0x10de", + "device_id": [ "0x0DEA" ], + "os": { + "type": "win" + }, + "features": [ + "wrong_feature5" + ] + }, + { + "id": 5, + "description": "feature 1", + "vendor_id": "0x10de", + "device_id": [ "0x0DE9" ], + "os": { + "type": "win" + }, + "driver_version": { + "op": ">", + "value": "9.18.0.0" + }, + "features": [ + "feature1" + ] + }, + { + "id": 6, + "description": "non-applicable feature: too new driver", + "vendor_id": "0x10de", + "device_id": [ "0x0DE9" ], + "os": { + "type": "win" + }, + "driver_version": { + "op": "<=", + "value": "9.17.13.4344" + }, + "features": [ + "feature1" + ] + } + ] +} diff --git a/tests/auto/gui/qopenglconfig/qopenglconfig.pro b/tests/auto/gui/qopenglconfig/qopenglconfig.pro index ebeb509d0b..bcf7215eea 100644 --- a/tests/auto/gui/qopenglconfig/qopenglconfig.pro +++ b/tests/auto/gui/qopenglconfig/qopenglconfig.pro @@ -8,3 +8,4 @@ TARGET = tst_qopenglconfig QT += gui-private core-private testlib SOURCES += tst_qopenglconfig.cpp +OTHER_FILES = buglist.json diff --git a/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp b/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp index 75cc0e06f7..bfb2623508 100644 --- a/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp +++ b/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -37,6 +37,7 @@ #include <private/qguiapplication_p.h> #include <qpa/qplatformintegration.h> #include <qpa/qplatformnativeinterface.h> +#include <private/qopengl_p.h> #include <QtTest/QtTest> @@ -105,6 +106,7 @@ class tst_QOpenGlConfig : public QObject private slots: void testConfiguration(); void testGlConfiguration(); + void testBugList(); }; static void dumpConfiguration(QTextStream &str) @@ -217,6 +219,41 @@ void tst_QOpenGlConfig::testGlConfiguration() qDebug().noquote() << '\n' << result; } +static inline QByteArray msgSetMismatch(const QSet<QString> &expected, + const QSet<QString> &actual) +{ + const QString result = QStringList(expected.toList()).join(QLatin1Char(',')) + + QLatin1String(" != ") + + QStringList(actual.toList()).join(QLatin1Char(',')); + return result.toLatin1(); +} + +void tst_QOpenGlConfig::testBugList() +{ + // Check bug list parsing for some arbitrary NVidia card + // faking Windows OS. + const QString fileName = QFINDTESTDATA("buglist.json"); + QVERIFY(!fileName.isEmpty()); + + QSet<QString> expectedFeatures; + expectedFeatures << "feature1"; + + QOpenGLConfig::Gpu gpu; + gpu.vendorId = 0x10DE; + gpu.deviceId = 0x0DE9; + +#ifdef Q_COMPILER_INITIALIZER_LISTS + gpu.driverVersion = QVersionNumber({9, 18, 13, 4460}); +#else + gpu.driverVersion = QVersionNumber(QVector<int>() << 9 << 18 << 13 << 4460); +#endif + const QSet<QString> actualFeatures = + QOpenGLConfig::gpuFeatures(gpu, QStringLiteral("win"), + QVersionNumber(6, 3), fileName); + QVERIFY2(expectedFeatures == actualFeatures, + msgSetMismatch(expectedFeatures, actualFeatures)); +} + QTEST_MAIN(tst_QOpenGlConfig) #include "tst_qopenglconfig.moc" |