1
=== modified file 'src/platforms/mirserver/miropenglcontext.cpp'
2
--- src/platforms/mirserver/miropenglcontext.cpp	2016-05-06 08:31:13 +0000
3
+++ src/platforms/mirserver/miropenglcontext.cpp	2016-05-25 13:52:29 +0000
4
@@ -25,6 +25,7 @@
5
25
#include <QOpenGLFramebufferObject>
25
#include <QOpenGLFramebufferObject>
6
26
#include <QSurfaceFormat>
26
#include <QSurfaceFormat>
7
27
#include <QtPlatformSupport/private/qeglconvenience_p.h>
27
#include <QtPlatformSupport/private/qeglconvenience_p.h>
8
28
#include <QtGui/private/qopenglcontext_p.h>
9
28
29
10
29
// Mir
30
// Mir
11
30
#include <mir/graphics/display.h>
31
#include <mir/graphics/display.h>
12
@@ -118,6 +119,23 @@
13
118
    }
119
    }
14
119
}
120
}
15
120
121
16
122
static bool needsFBOReadBackWorkaround()
17
123
{
18
124
    static bool set = false;
19
125
    static bool needsWorkaround = false;
20
126
21
127
    if (!set) {
22
128
        const char *rendererString = reinterpret_cast<const char *>(glGetString(GL_RENDERER));
23
129
        // Keep in sync with qtubuntu
24
130
        needsWorkaround = qstrncmp(rendererString, "Mali-400", 8) == 0
25
131
                          || qstrncmp(rendererString, "Mali-T7", 7) == 0
26
132
                          || qstrncmp(rendererString, "PowerVR Rogue G6200", 19) == 0;
27
133
        set = true;
28
134
    }
29
135
30
136
    return needsWorkaround;
31
137
}
32
138
33
121
bool MirOpenGLContext::makeCurrent(QPlatformSurface *surface)
139
bool MirOpenGLContext::makeCurrent(QPlatformSurface *surface)
34
122
{
140
{
35
123
    if (surface->surface()->surfaceClass() == QSurface::Offscreen) {
141
    if (surface->surface()->surfaceClass() == QSurface::Offscreen) {
36
@@ -142,6 +160,10 @@
37
142
        }
160
        }
38
143
#endif
161
#endif
39
144
162
40
163
        QOpenGLContextPrivate *ctx_d = QOpenGLContextPrivate::get(context());
41
164
        if (!ctx_d->workaround_brokenFBOReadBack && needsFBOReadBackWorkaround())
42
165
            ctx_d->workaround_brokenFBOReadBack = true;
43
166
44
145
        return true;
167
        return true;
45
146
    }
168
    }
46
147
169
Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2016-05-17	Approve on 2016-05-17
Unity8 CI Bot (community)	continuous-integration		Approve on 2016-05-17
Review via email: mp+294915@code.launchpad.net
1	=== modified file 'src/platforms/mirserver/miropenglcontext.cpp'
2	--- src/platforms/mirserver/miropenglcontext.cpp 2016-05-06 08:31:13 +0000
3	+++ src/platforms/mirserver/miropenglcontext.cpp 2016-05-25 13:52:29 +0000
4	@@ -25,6 +25,7 @@
5	25	#include <QOpenGLFramebufferObject>	25	#include <QOpenGLFramebufferObject>
6	26	#include <QSurfaceFormat>	26	#include <QSurfaceFormat>
7	27	#include <QtPlatformSupport/private/qeglconvenience_p.h>	27	#include <QtPlatformSupport/private/qeglconvenience_p.h>
8			28	#include <QtGui/private/qopenglcontext_p.h>
9	28		29
10	29	// Mir	30	// Mir
11	30	#include <mir/graphics/display.h>	31	#include <mir/graphics/display.h>
12	@@ -118,6 +119,23 @@
13	118	}	119	}
14	119	}	120	}
15	120		121
16			122	static bool needsFBOReadBackWorkaround()
17			123	{
18			124	static bool set = false;
19			125	static bool needsWorkaround = false;
20			126
21			127	if (!set) {
22			128	const char rendererString = reinterpret_cast<const char >(glGetString(GL_RENDERER));
23			129	// Keep in sync with qtubuntu
24			130	needsWorkaround = qstrncmp(rendererString, "Mali-400", 8) == 0
25			131	\|\| qstrncmp(rendererString, "Mali-T7", 7) == 0
26			132	\|\| qstrncmp(rendererString, "PowerVR Rogue G6200", 19) == 0;
27			133	set = true;
28			134	}
29			135
30			136	return needsWorkaround;
31			137	}
32			138
33	121	bool MirOpenGLContext::makeCurrent(QPlatformSurface *surface)	139	bool MirOpenGLContext::makeCurrent(QPlatformSurface *surface)
34	122	{	140	{
35	123	if (surface->surface()->surfaceClass() == QSurface::Offscreen) {	141	if (surface->surface()->surfaceClass() == QSurface::Offscreen) {
36	@@ -142,6 +160,10 @@
37	142	}	160	}
38	143	#endif	161	#endif
39	144		162
40			163	QOpenGLContextPrivate *ctx_d = QOpenGLContextPrivate::get(context());
41			164	if (!ctx_d->workaround_brokenFBOReadBack && needsFBOReadBackWorkaround())
42			165	ctx_d->workaround_brokenFBOReadBack = true;
43			166
44	145	return true;	167	return true;
45	146	}	168	}
46	147		169