1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "windows: Disable D3D9/11 with ANGLE in VMs"

Browse Source 
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 <simon.hausmann@theqtcompany.com>
This commit is contained in:
Laszlo Agocs 2015-06-22 18:54:16 +02:00 committed by Simon Hausmann
parent 9e139ce099
commit d40647922b
6 changed files with 5 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/opengl/qopengl.cpp
View File

@ -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;
}

6
src/gui/opengl/qopengl_p.h
View File

@ -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;
}

12
src/plugins/platforms/windows/openglblacklists/default.json
View File

@ -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"
]
}
]
}

2
src/plugins/platforms/windows/qwindowsopengltester.cpp
View File

@ -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())

11
tests/auto/gui/qopenglconfig/buglist.json
View File

@ -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",

9
tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp
View File

@ -244,20 +244,13 @@ void tst_QOpenGlConfig::testBugList()
expectedFeatures << "feature1";
QVersionNumber driverVersion(QVector<int>() << 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<QString> 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<QString>() << "feature2";
QVERIFY2(expectedFeatures == actualFeatures,
msgSetMismatch(expectedFeatures, actualFeatures));
gpu = QOpenGLConfig::Gpu::fromGLVendor(QByteArrayLiteral("Somebody Else"));
expectedFeatures.clear();
actualFeatures = QOpenGLConfig::gpuFeatures(gpu, QStringLiteral("linux"),