From 85620bd788d351018e9fa0b0f567b19a773be52b Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Date: Mon, 9 Mar 2015 13:54:29 +0100
Subject: windows: Introduce a built-in GPU blacklist

Use a built-in JSON file in case the QT_OPENGL_BUGLIST environment
variable is not set. When QT_OPENGL_BUGLIST is set, the built-in list
is ignored.

To make the implementation simpler and more readable, some of the code
in QWindowsOpenGLTester is reshuffled a bit. It also caches the results
now, so it is safe and fast to call supportedRenderers() and friends
multiple times.

The blacklist currently contains the Intel card from QTBUG-43263 (Intel
GMA / HD3000 ?) and may also apply to QTBUG-42240.

[ChangeLog][QtGui] Qt now contains a built-in GPU driver blacklist for
Windows that disables the usage of desktop OpenGL with some older cards
that are known to be unstable with opengl32.dll.

Task-number: QTBUG-42240
Task-number: QTBUG-43263
Change-Id: I1ecd65b51fca77925317d52048e7ab01d9b8797c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
---
 .../platforms/windows/qwindowsopengltester.cpp     | 72 ++++++++++++----------
 1 file changed, 40 insertions(+), 32 deletions(-)

(limited to 'src/plugins/platforms/windows/qwindowsopengltester.cpp')

diff --git a/src/plugins/platforms/windows/qwindowsopengltester.cpp b/src/plugins/platforms/windows/qwindowsopengltester.cpp
index ba4c95544e..67548a0836 100644
--- a/src/plugins/platforms/windows/qwindowsopengltester.cpp
+++ b/src/plugins/platforms/windows/qwindowsopengltester.cpp
@@ -42,14 +42,16 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QLibraryInfo>
+#include <QtCore/QHash>
 
+#ifndef QT_NO_OPENGL
 #include <private/qopengl_p.h>
+#endif
 
 #ifndef Q_OS_WINCE
 #  include <QtCore/qt_windows.h>
 #  include <private/qsystemlibrary_p.h>
 #  include <d3d9.h>
-#  include <GL/gl.h>
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -206,56 +208,62 @@ static inline QString resolveBugListFile(const QString &fileName)
     return QStandardPaths::locate(QStandardPaths::ConfigLocation, fileName);
 }
 
-static void readDriverBugList(const GpuDescription &gpu,
-                              QWindowsOpenGLTester::Renderers *result)
+typedef QHash<QOpenGLConfig::Gpu, QWindowsOpenGLTester::Renderers> SupportedRenderersCache;
+Q_GLOBAL_STATIC(SupportedRenderersCache, supportedRenderersCache)
+
+#endif // !Q_OS_WINCE
+
+QWindowsOpenGLTester::Renderers QWindowsOpenGLTester::detectSupportedRenderers(const GpuDescription &gpu, bool glesOnly)
 {
-    const char bugListFileVar[] = "QT_OPENGL_BUGLIST";
-    if (!qEnvironmentVariableIsSet(bugListFileVar))
-        return;
-    const QString fileName = resolveBugListFile(QFile::decodeName(qgetenv(bugListFileVar)));
-    if (fileName.isEmpty())
-        return;
+    Q_UNUSED(gpu)
+#ifndef Q_OS_WINCE
     QOpenGLConfig::Gpu qgpu;
     qgpu.deviceId = gpu.deviceId;
     qgpu.vendorId = gpu.vendorId;
     qgpu.driverVersion = gpu.driverVersion;
-    const QSet<QString> features = QOpenGLConfig::gpuFeatures(qgpu, fileName);
+    SupportedRenderersCache *srCache = supportedRenderersCache();
+    SupportedRenderersCache::const_iterator it = srCache->find(qgpu);
+    if (it != srCache->cend())
+        return *it;
+
+    QWindowsOpenGLTester::Renderers result(QWindowsOpenGLTester::AngleRendererD3d11
+        | QWindowsOpenGLTester::AngleRendererD3d9
+        | QWindowsOpenGLTester::AngleRendererD3d11Warp
+        | QWindowsOpenGLTester::SoftwareRasterizer);
+
+    if (!glesOnly && testDesktopGL())
+        result |= QWindowsOpenGLTester::DesktopGl;
+
+    QSet<QString> features;
+    const char bugListFileVar[] = "QT_OPENGL_BUGLIST";
+    if (qEnvironmentVariableIsSet(bugListFileVar)) {
+        const QString fileName = resolveBugListFile(QFile::decodeName(qgetenv(bugListFileVar)));
+        if (!fileName.isEmpty())
+            features = QOpenGLConfig::gpuFeatures(qgpu, fileName);
+    } else {
+        features = QOpenGLConfig::gpuFeatures(qgpu, QStringLiteral(":/qt-project.org/windows/openglblacklists/default.json"));
+    }
+    qCDebug(lcQpaGl) << "GPU features:" << features;
+
     if (features.contains(QStringLiteral("disable_desktopgl"))) { // Qt-specific
         qCWarning(lcQpaGl) << "Disabling Desktop GL: " << gpu;
-        *result &= ~QWindowsOpenGLTester::DesktopGl;
+        result &= ~QWindowsOpenGLTester::DesktopGl;
     }
     if (features.contains(QStringLiteral("disable_angle"))) { // Qt-specific keyword
         qCWarning(lcQpaGl) << "Disabling ANGLE: " << gpu;
-        *result &= ~QWindowsOpenGLTester::GlesMask;
+        result &= ~QWindowsOpenGLTester::GlesMask;
     } else {
         if (features.contains(QStringLiteral("disable_d3d11"))) { // standard keyword
             qCWarning(lcQpaGl) << "Disabling D3D11: " << gpu;
-            *result &= ~QWindowsOpenGLTester::AngleRendererD3d11;
+            result &= ~QWindowsOpenGLTester::AngleRendererD3d11;
         }
         if (features.contains(QStringLiteral("disable_d3d9"))) { // Qt-specific
             qCWarning(lcQpaGl) << "Disabling D3D9: " << gpu;
-            *result &= ~QWindowsOpenGLTester::AngleRendererD3d9;
+            result &= ~QWindowsOpenGLTester::AngleRendererD3d9;
         }
     }
-}
-#endif // !Q_OS_WINCE
-
-static inline QWindowsOpenGLTester::Renderers
-    detectSupportedRenderers(const GpuDescription &gpu, bool glesOnly)
-{
-    Q_UNUSED(gpu)
-#ifndef Q_OS_WINCE
-    // Add checks for card types with known issues here.
-    QWindowsOpenGLTester::Renderers result(QWindowsOpenGLTester::AngleRendererD3d11
-        | QWindowsOpenGLTester::AngleRendererD3d9
-        | QWindowsOpenGLTester::AngleRendererD3d11Warp
-        | QWindowsOpenGLTester::SoftwareRasterizer);
-
-    if (!glesOnly && QWindowsOpenGLTester::testDesktopGL())
-        result |= QWindowsOpenGLTester::DesktopGl;
-
-    readDriverBugList(gpu, &result);
 
+    srCache->insert(qgpu, result);
     return result;
 #else // !Q_OS_WINCE
     return QWindowsOpenGLTester::Gles;
-- 
cgit v1.2.3