1
=== modified file 'src/ubuntumirclient/glcontext.cpp'
2
--- src/ubuntumirclient/glcontext.cpp	2016-06-03 09:55:43 +0000
3
+++ src/ubuntumirclient/glcontext.cpp	2016-06-20 12:13:03 +0000
4
@@ -95,6 +95,16 @@
5
95
    }
95
    }
6
96
}
96
}
7
97
97
8
98
// WORKAROUND for bug 1594198 - avoid having Qt use GLESv3
9
99
QSurfaceFormat UbuntuOpenGLContext::format() const
10
100
{
11
101
    auto format = QEGLPlatformContext::format();
12
102
    if (format.renderableType() == QSurfaceFormat::OpenGLES && format.majorVersion() > 2) {
13
103
        format.setMajorVersion(2);
14
104
    }
15
105
    return format;
16
106
}
17
107
18
98
// Following method used internally in the base class QEGLPlatformContext to access
108
// Following method used internally in the base class QEGLPlatformContext to access
19
99
// the egl surface of a QPlatformSurface/UbuntuWindow
109
// the egl surface of a QPlatformSurface/UbuntuWindow
20
100
EGLSurface UbuntuOpenGLContext::eglSurfaceForPlatformSurface(QPlatformSurface *surface)
110
EGLSurface UbuntuOpenGLContext::eglSurfaceForPlatformSurface(QPlatformSurface *surface)
21
101
111
22
=== modified file 'src/ubuntumirclient/glcontext.h'
23
--- src/ubuntumirclient/glcontext.h	2016-05-19 16:26:30 +0000
24
+++ src/ubuntumirclient/glcontext.h	2016-06-20 12:13:03 +0000
25
@@ -32,6 +32,8 @@
26
32
    void swapBuffers(QPlatformSurface *surface) final;
32
    void swapBuffers(QPlatformSurface *surface) final;
27
33
    bool makeCurrent(QPlatformSurface *surface) final;
33
    bool makeCurrent(QPlatformSurface *surface) final;
28
34
34
29
35
    QSurfaceFormat format() const final;
30
36
31
35
protected:
37
protected:
32
36
    EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) final;
38
    EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) final;
33
37
};
39
};
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-06-20
Ubuntu Phablet Team		2016-06-20	Pending
Review via email: mp+297902@code.launchpad.net