1
=== modified file 'src/platforms/mirserver/logging.cpp'
2
--- src/platforms/mirserver/logging.cpp	2017-02-07 20:59:34 +0000
3
+++ src/platforms/mirserver/logging.cpp	2017-03-29 12:27:06 +0000
4
@@ -24,5 +24,6 @@
5
24
Q_LOGGING_CATEGORY(QTMIR_MIR_KEYMAP, "qtmir.mir.keymap")
24
Q_LOGGING_CATEGORY(QTMIR_MIR_KEYMAP, "qtmir.mir.keymap")
6
25
Q_LOGGING_CATEGORY(QTMIR_CLIPBOARD, "qtmir.clipboard")
25
Q_LOGGING_CATEGORY(QTMIR_CLIPBOARD, "qtmir.clipboard")
7
26
Q_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES, "qtmir.sensor")
26
Q_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES, "qtmir.sensor")
8
27
Q_LOGGING_CATEGORY(QTMIR_GRAPHICS, "qtmir.graphics")
9
27
Q_LOGGING_CATEGORY(QTMIR_SCREENS, "qtmir.screens")
28
Q_LOGGING_CATEGORY(QTMIR_SCREENS, "qtmir.screens")
10
28
Q_LOGGING_CATEGORY(QTMIR_DBUS, "qtmir.dbus", QtWarningMsg)
29
Q_LOGGING_CATEGORY(QTMIR_DBUS, "qtmir.dbus", QtWarningMsg)
11
29
30
12
=== modified file 'src/platforms/mirserver/logging.h'
13
--- src/platforms/mirserver/logging.h	2016-09-29 15:46:59 +0000
14
+++ src/platforms/mirserver/logging.h	2017-03-29 12:27:06 +0000
15
@@ -26,6 +26,7 @@
16
26
Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_INPUT)
26
Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_INPUT)
17
27
Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_KEYMAP)
27
Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_KEYMAP)
18
28
Q_DECLARE_LOGGING_CATEGORY(QTMIR_CLIPBOARD)
28
Q_DECLARE_LOGGING_CATEGORY(QTMIR_CLIPBOARD)
19
29
Q_DECLARE_LOGGING_CATEGORY(QTMIR_GRAPHICS)
20
29
Q_DECLARE_LOGGING_CATEGORY(QTMIR_SCREENS)
30
Q_DECLARE_LOGGING_CATEGORY(QTMIR_SCREENS)
21
30
Q_DECLARE_LOGGING_CATEGORY(QTMIR_DBUS)
31
Q_DECLARE_LOGGING_CATEGORY(QTMIR_DBUS)
22
31
32
23
32
33
24
=== modified file 'src/platforms/mirserver/mirserverintegration.cpp'
25
--- src/platforms/mirserver/mirserverintegration.cpp	2017-02-21 18:53:48 +0000
26
+++ src/platforms/mirserver/mirserverintegration.cpp	2017-03-29 12:27:06 +0000
27
@@ -27,6 +27,7 @@
28
27
#include <qpa/qwindowsysteminterface.h>
27
#include <qpa/qwindowsysteminterface.h>
29
28
28
30
29
#include <QGuiApplication>
29
#include <QGuiApplication>
31
30
#include <QOffscreenSurface>
32
30
#include <QStringList>
31
#include <QStringList>
33
31
#include <QDebug>
32
#include <QDebug>
34
32
33
35
@@ -47,6 +48,66 @@
36
47
#include "ubuntutheme.h"
48
#include "ubuntutheme.h"
37
48
#include "logging.h"
49
#include "logging.h"
38
49
50
39
51
namespace {
40
52
41
53
static bool mGLContextQueried{false};
42
54
static bool mGLSupportsThreadedRendering{false};
43
55
44
56
void queryGLContext()
45
57
{
46
58
    // Based on similar logic in the XCB plugin. Am supporting the same debug env vars too.
47
59
    if (mGLContextQueried)
48
60
        return;
49
61
    mGLContextQueried = true;
50
62
51
63
    static bool skip = qEnvironmentVariableIsSet("QT_OPENGL_NO_SANITY_CHECK");
52
64
    if (skip)
53
65
        return;
54
66
55
67
    QOpenGLContext *oldContext = QOpenGLContext::currentContext();
56
68
    QSurface *oldSurface = nullptr;
57
69
    if (oldContext)
58
70
        oldSurface = oldContext->surface();
59
71
60
72
    QOffscreenSurface *surface = new QOffscreenSurface;
61
73
    surface->create();
62
74
63
75
    QOpenGLContext context;
64
76
    if (!context.create() || !context.makeCurrent(surface)) {
65
77
        qWarning("MirServerIntegration: Failed to create dummy context to query");
66
78
        mGLSupportsThreadedRendering = false;
67
79
        return;
68
80
    }
69
81
70
82
    mGLSupportsThreadedRendering = true;
71
83
72
84
    if (const char *vendor = (const char *) glGetString(GL_VENDOR)) {
73
85
        if (strstr(vendor, "nouveau") != 0) {
74
86
            qCInfo(QTMIR_GRAPHICS) << "Multithreaded OpenGL disabled: nouveau is blacklisted";
75
87
            mGLSupportsThreadedRendering = false;
76
88
        }
77
89
    }
78
90
79
91
    context.doneCurrent();
80
92
    if (oldContext && oldSurface)
81
93
        oldContext->makeCurrent(oldSurface);
82
94
83
95
    if (!mGLSupportsThreadedRendering) {
84
96
        qCInfo(QTMIR_GRAPHICS) << "Force-enable multithreaded OpenGL by setting "
85
97
                                  "environment variable QT_OPENGL_NO_SANITY_CHECK";
86
98
    }
87
99
}
88
100
89
101
bool supportsThreadedRendering()
90
102
{
91
103
    queryGLContext();
92
104
    return mGLSupportsThreadedRendering;
93
105
}
94
106
95
107
} // namespace
96
108
97
109
98
110
99
50
namespace mg = mir::graphics;
111
namespace mg = mir::graphics;
100
51
using qtmir::Clipboard;
112
using qtmir::Clipboard;
101
52
113
102
@@ -88,7 +149,7 @@
103
88
    switch (cap) {
149
    switch (cap) {
104
89
    case ThreadedPixmaps: return true;
150
    case ThreadedPixmaps: return true;
105
90
    case OpenGL: return true;
151
    case OpenGL: return true;
107
91
    case ThreadedOpenGL: return true;
152
    case ThreadedOpenGL: return supportsThreadedRendering();
108
92
    case BufferQueueingOpenGL: return true;
153
    case BufferQueueingOpenGL: return true;
109
93
    case MultipleWindows: return true; // multi-monitor support
154
    case MultipleWindows: return true; // multi-monitor support
110
94
    case WindowManagement: return false; // platform has no WM, as this implements the WM!
155
    case WindowManagement: return false; // platform has no WM, as this implements the WM!
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot (community)	continuous-integration		Approve on 2017-03-29
Mir development team		2017-03-29	Pending
Review via email: mp+321286@code.launchpad.net