From d40647922b1b8542d36fd3a2496740d6e66343c7 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Mon, 22 Jun 2015 18:54:16 +0200 Subject: Revert "windows: Disable D3D9/11 with ANGLE in VMs" This reverts commit a6000e2b6679d91c9dab44e49b485de6816372bc. Temporarily remove this to unblock the qtdeclarative dev CI. While Windows 8 VMs are fixed by this patch, Windows 7 has different problems. Change-Id: I45ef064ed953cc4b7bbf19657300d4fc43d82452 Reviewed-by: Simon Hausmann --- src/gui/opengl/qopengl.cpp | 10 ---------- src/gui/opengl/qopengl_p.h | 6 ++---- src/plugins/platforms/windows/openglblacklists/default.json | 12 +----------- src/plugins/platforms/windows/qwindowsopengltester.cpp | 2 +- tests/auto/gui/qopenglconfig/buglist.json | 11 ----------- tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp | 9 +-------- 6 files changed, 5 insertions(+), 45 deletions(-) diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp index 5c16e79e6f..1c008ccb42 100644 --- a/src/gui/opengl/qopengl.cpp +++ b/src/gui/opengl/qopengl.cpp @@ -141,7 +141,6 @@ static inline QString vendorIdKey() { return QStringLiteral("vendor_id"); } static inline QString glVendorKey() { return QStringLiteral("gl_vendor"); } static inline QString deviceIdKey() { return QStringLiteral("device_id"); } static inline QString driverVersionKey() { return QStringLiteral("driver_version"); } -static inline QString driverDescriptionKey() { return QStringLiteral("driver_description"); } static inline QString featuresKey() { return QStringLiteral("features"); } static inline QString idKey() { return QStringLiteral("id"); } static inline QString descriptionKey() { return QStringLiteral("description"); } @@ -337,15 +336,6 @@ static bool matches(const QJsonObject &object, QLatin1String("Driver version must be of type object.")); } } - - if (!gpu.driverDescription.isEmpty()) { - const QJsonValue driverDescriptionV = object.value(driverDescriptionKey()); - if (driverDescriptionV.isString()) { - if (!gpu.driverDescription.contains(driverDescriptionV.toString().toUtf8())) - return false; - } - } - return true; } diff --git a/src/gui/opengl/qopengl_p.h b/src/gui/opengl/qopengl_p.h index 9d8b2040a1..980e02aea6 100644 --- a/src/gui/opengl/qopengl_p.h +++ b/src/gui/opengl/qopengl_p.h @@ -79,21 +79,19 @@ public: bool isValid() const { return deviceId || !glVendor.isEmpty(); } bool equals(const Gpu &other) const { return vendorId == other.vendorId && deviceId == other.deviceId && driverVersion == other.driverVersion - && driverDescription == other.driverDescription && glVendor == other.glVendor; + && glVendor == other.glVendor; } uint vendorId; uint deviceId; QVersionNumber driverVersion; - QByteArray driverDescription; QByteArray glVendor; - static Gpu fromDevice(uint vendorId, uint deviceId, QVersionNumber driverVersion, const QByteArray &driverDescription) { + static Gpu fromDevice(uint vendorId, uint deviceId, QVersionNumber driverVersion) { Gpu gpu; gpu.vendorId = vendorId; gpu.deviceId = deviceId; gpu.driverVersion = driverVersion; - gpu.driverDescription = driverDescription; return gpu; } diff --git a/src/plugins/platforms/windows/openglblacklists/default.json b/src/plugins/platforms/windows/openglblacklists/default.json index 096db2503f..23607523bd 100644 --- a/src/plugins/platforms/windows/openglblacklists/default.json +++ b/src/plugins/platforms/windows/openglblacklists/default.json @@ -1,6 +1,6 @@ { "name": "Qt built-in GPU driver blacklist", - "version": "5.6", + "version": "5.5", "entries": [ { "id": 1, @@ -17,16 +17,6 @@ "features": [ "disable_desktopgl" ] - }, - { - "id": 2, - "description": "Disable D3D9 and 11, and rely on software-only D3D in VMs", - "driver_description": "VMware SVGA 3D", - "features": [ - "disable_d3d9", - "disable_d3d11" - ] } - ] } diff --git a/src/plugins/platforms/windows/qwindowsopengltester.cpp b/src/plugins/platforms/windows/qwindowsopengltester.cpp index 244fc72332..dbee86a707 100644 --- a/src/plugins/platforms/windows/qwindowsopengltester.cpp +++ b/src/plugins/platforms/windows/qwindowsopengltester.cpp @@ -224,7 +224,7 @@ QWindowsOpenGLTester::Renderers QWindowsOpenGLTester::detectSupportedRenderers(c #elif defined(Q_OS_WINCE) return QWindowsOpenGLTester::Gles; #else - QOpenGLConfig::Gpu qgpu = QOpenGLConfig::Gpu::fromDevice(gpu.deviceId, gpu.vendorId, gpu.driverVersion, gpu.description); + QOpenGLConfig::Gpu qgpu = QOpenGLConfig::Gpu::fromDevice(gpu.deviceId, gpu.vendorId, gpu.driverVersion); SupportedRenderersCache *srCache = supportedRenderersCache(); SupportedRenderersCache::const_iterator it = srCache->find(qgpu); if (it != srCache->cend()) diff --git a/tests/auto/gui/qopenglconfig/buglist.json b/tests/auto/gui/qopenglconfig/buglist.json index 8a48180977..c7b8e61bc8 100644 --- a/tests/auto/gui/qopenglconfig/buglist.json +++ b/tests/auto/gui/qopenglconfig/buglist.json @@ -102,17 +102,6 @@ "feature1" ] }, - { - "id": 7, - "description": "driver description test", - "driver_description": "Test", - "os": { - "type": "win" - }, - "features": [ - "feature2" - ] - }, { "id": 128, "description": "check for matching GL_VENDOR", diff --git a/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp b/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp index fc3daee585..f88cbdc758 100644 --- a/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp +++ b/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp @@ -244,20 +244,13 @@ void tst_QOpenGlConfig::testBugList() expectedFeatures << "feature1"; QVersionNumber driverVersion(QVector() << 9 << 18 << 13 << 4460); - QOpenGLConfig::Gpu gpu = QOpenGLConfig::Gpu::fromDevice(0x10DE, 0x0DE9, driverVersion, QByteArrayLiteral("Unknown")); + QOpenGLConfig::Gpu gpu = QOpenGLConfig::Gpu::fromDevice(0x10DE, 0x0DE9, driverVersion); QSet actualFeatures = QOpenGLConfig::gpuFeatures(gpu, QStringLiteral("win"), QVersionNumber(6, 3), fileName); QVERIFY2(expectedFeatures == actualFeatures, msgSetMismatch(expectedFeatures, actualFeatures)); - gpu = QOpenGLConfig::Gpu::fromDevice(0xDEAD, 0xBEEF, driverVersion, QByteArrayLiteral("Test")); - actualFeatures = QOpenGLConfig::gpuFeatures(gpu, QStringLiteral("win"), - QVersionNumber(6, 3), fileName); - expectedFeatures = QSet() << "feature2"; - QVERIFY2(expectedFeatures == actualFeatures, - msgSetMismatch(expectedFeatures, actualFeatures)); - gpu = QOpenGLConfig::Gpu::fromGLVendor(QByteArrayLiteral("Somebody Else")); expectedFeatures.clear(); actualFeatures = QOpenGLConfig::gpuFeatures(gpu, QStringLiteral("linux"), -- cgit v1.2.3