1
=== modified file 'src/ubuntumirclient/qmirclientintegration.cpp'
2
--- src/ubuntumirclient/qmirclientintegration.cpp	2017-02-07 15:37:20 +0000
3
+++ src/ubuntumirclient/qmirclientintegration.cpp	2017-03-29 12:28:27 +0000
4
@@ -71,6 +71,64 @@
5
71
#include <ubuntu/application/id.h>
71
#include <ubuntu/application/id.h>
6
72
#include <ubuntu/application/options.h>
72
#include <ubuntu/application/options.h>
7
73
73
8
74
namespace {
9
75
10
76
static bool mGLContextQueried{false};
11
77
static bool mGLSupportsThreadedRendering{false};
12
78
13
79
void queryGLContext()
14
80
{
15
81
    // Based on similar logic in the XCB plugin. Am supporting the same debug env vars too.
16
82
    if (mGLContextQueried)
17
83
        return;
18
84
    mGLContextQueried = true;
19
85
20
86
    static bool skip = qEnvironmentVariableIsSet("QT_OPENGL_NO_SANITY_CHECK");
21
87
    if (skip)
22
88
        return;
23
89
24
90
    QOpenGLContext *oldContext = QOpenGLContext::currentContext();
25
91
    QSurface *oldSurface = nullptr;
26
92
    if (oldContext)
27
93
        oldSurface = oldContext->surface();
28
94
29
95
    QOffscreenSurface *surface = new QOffscreenSurface;
30
96
    surface->create();
31
97
32
98
    QOpenGLContext context;
33
99
    if (!context.create() || !context.makeCurrent(surface)) {
34
100
        qWarning("QMirClientClientIntegration: Failed to create dummy context to query");
35
101
        mGLSupportsThreadedRendering = false;
36
102
        return;
37
103
    }
38
104
39
105
    mGLSupportsThreadedRendering = true;
40
106
41
107
    if (const char *vendor = (const char *) glGetString(GL_VENDOR)) {
42
108
        if (strstr(vendor, "nouveau") != 0) {
43
109
            qCInfo(mirclientGraphics) << "Multithreaded OpenGL disabled: nouveau is blacklisted";
44
110
            mGLSupportsThreadedRendering = false;
45
111
        }
46
112
    }
47
113
48
114
    context.doneCurrent();
49
115
    if (oldContext && oldSurface)
50
116
        oldContext->makeCurrent(oldSurface);
51
117
52
118
    if (!mGLSupportsThreadedRendering) {
53
119
        qCInfo(mirclientGraphics) << "Force-enable multithreaded OpenGL by setting "
54
120
                                     "environment variable QT_OPENGL_NO_SANITY_CHECK";
55
121
    }
56
122
}
57
123
58
124
bool supportsThreadedRendering()
59
125
{
60
126
    queryGLContext();
61
127
    return mGLSupportsThreadedRendering;
62
128
}
63
129
64
130
} // namespace
65
131
66
74
132
67
75
class UbuntuIconTheme : public QGenericUnixTheme
133
class UbuntuIconTheme : public QGenericUnixTheme
68
76
{
134
{
69
@@ -286,16 +344,12 @@
70
286
bool QMirClientClientIntegration::hasCapability(QPlatformIntegration::Capability cap) const
344
bool QMirClientClientIntegration::hasCapability(QPlatformIntegration::Capability cap) const
71
287
{
345
{
72
288
    switch (cap) {
346
    switch (cap) {
81
289
    case ThreadedOpenGL:
347
    case ThreadedOpenGL: {
82
290
        if (qEnvironmentVariableIsEmpty("QTUBUNTU_NO_THREADED_OPENGL")) {
348
        return supportsThreadedRendering();
83
291
            return true;
349
    }
76
292
        } else {
77
293
            qCDebug(mirclient, "disabled threaded OpenGL");
78
294
            return false;
79
295
        }
80
296
84
297
    case ThreadedPixmaps:
350
    case ThreadedPixmaps:
85
298
    case OpenGL:
351
    case OpenGL:
86
352
    case BufferQueueingOpenGL:
87
299
    case ApplicationState:
353
    case ApplicationState:
88
300
    case MultipleWindows:
354
    case MultipleWindows:
89
301
    case NonFullScreenWindows:
355
    case NonFullScreenWindows:
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-03-29
Ubuntu Phablet Team		2017-03-29	Pending
Review via email: mp+321283@code.launchpad.net