Merge lp:~gerboland/qtmir/nouveau-workaround into lp:qtmir

[Gerry Boland]

Disable threaded rendering for nouveau

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:626
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/643/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4764
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4792
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4615
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4615/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4615
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4615/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4615
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4615/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4615
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4615/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4615
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4615/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4615
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4615/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/643/rebuild

review: Approve (continuous-integration)

Unmerged revisions

626. By Gerry Boland on 2017-03-29

Disable threaded rendering for nouveau

=== modified file 'src/platforms/mirserver/logging.cpp'
--- src/platforms/mirserver/logging.cpp	2017-02-07 20:59:34 +0000
+++ src/platforms/mirserver/logging.cpp	2017-03-29 12:27:06 +0000
@@ -24,5 +24,6 @@
 Q_LOGGING_CATEGORY(QTMIR_MIR_KEYMAP, "qtmir.mir.keymap")
 Q_LOGGING_CATEGORY(QTMIR_CLIPBOARD, "qtmir.clipboard")
 Q_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES, "qtmir.sensor")
+Q_LOGGING_CATEGORY(QTMIR_GRAPHICS, "qtmir.graphics")
 Q_LOGGING_CATEGORY(QTMIR_SCREENS, "qtmir.screens")
 Q_LOGGING_CATEGORY(QTMIR_DBUS, "qtmir.dbus", QtWarningMsg)

=== modified file 'src/platforms/mirserver/logging.h'
--- src/platforms/mirserver/logging.h	2016-09-29 15:46:59 +0000
+++ src/platforms/mirserver/logging.h	2017-03-29 12:27:06 +0000
@@ -26,6 +26,7 @@
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_INPUT)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_KEYMAP)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_CLIPBOARD)
+Q_DECLARE_LOGGING_CATEGORY(QTMIR_GRAPHICS)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_SCREENS)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_DBUS)
 

=== modified file 'src/platforms/mirserver/mirserverintegration.cpp'
--- src/platforms/mirserver/mirserverintegration.cpp	2017-02-21 18:53:48 +0000
+++ src/platforms/mirserver/mirserverintegration.cpp	2017-03-29 12:27:06 +0000
@@ -27,6 +27,7 @@
 #include <qpa/qwindowsysteminterface.h>
 
 #include <QGuiApplication>
+#include <QOffscreenSurface>
 #include <QStringList>
 #include <QDebug>
 
@@ -47,6 +48,66 @@
 #include "ubuntutheme.h"
 #include "logging.h"
 
+namespace {
+
+static bool mGLContextQueried{false};
+static bool mGLSupportsThreadedRendering{false};
+
+void queryGLContext()
+{
+    // Based on similar logic in the XCB plugin. Am supporting the same debug env vars too.
+    if (mGLContextQueried)
+        return;
+    mGLContextQueried = true;
+
+    static bool skip = qEnvironmentVariableIsSet("QT_OPENGL_NO_SANITY_CHECK");
+    if (skip)
+        return;
+
+    QOpenGLContext *oldContext = QOpenGLContext::currentContext();
+    QSurface *oldSurface = nullptr;
+    if (oldContext)
+        oldSurface = oldContext->surface();
+
+    QOffscreenSurface *surface = new QOffscreenSurface;
+    surface->create();
+
+    QOpenGLContext context;
+    if (!context.create() || !context.makeCurrent(surface)) {
+        qWarning("MirServerIntegration: Failed to create dummy context to query");
+        mGLSupportsThreadedRendering = false;
+        return;
+    }
+
+    mGLSupportsThreadedRendering = true;
+
+    if (const char *vendor = (const char *) glGetString(GL_VENDOR)) {
+        if (strstr(vendor, "nouveau") != 0) {
+            qCInfo(QTMIR_GRAPHICS) << "Multithreaded OpenGL disabled: nouveau is blacklisted";
+            mGLSupportsThreadedRendering = false;
+        }
+    }
+
+    context.doneCurrent();
+    if (oldContext && oldSurface)
+        oldContext->makeCurrent(oldSurface);
+
+    if (!mGLSupportsThreadedRendering) {
+        qCInfo(QTMIR_GRAPHICS) << "Force-enable multithreaded OpenGL by setting "
+                                  "environment variable QT_OPENGL_NO_SANITY_CHECK";
+    }
+}
+
+bool supportsThreadedRendering()
+{
+    queryGLContext();
+    return mGLSupportsThreadedRendering;
+}
+
+} // namespace
+
+
+
 namespace mg = mir::graphics;
 using qtmir::Clipboard;
 
@@ -88,7 +149,7 @@
     switch (cap) {
     case ThreadedPixmaps: return true;
     case OpenGL: return true;
-    case ThreadedOpenGL: return true;
+    case ThreadedOpenGL: return supportsThreadedRendering();
     case BufferQueueingOpenGL: return true;
     case MultipleWindows: return true; // multi-monitor support
     case WindowManagement: return false; // platform has no WM, as this implements the WM!