Merge lp:~gerboland/qtubuntu/disable-gles3-for-now into lp:qtubuntu

[Michał Sawicz]

Disable GLESv3 for now

LP#1490956
LP#1594198

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

PASSED: Continuous integration, rev:327
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/83/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2075
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2103
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2014
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2014
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2014
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2005
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2005/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2005
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2005/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2005
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2005/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2005
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2005/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2005
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2005/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2005
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2005/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2005
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2005/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2005
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2005/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2005
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2005/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

https://github.com/libhybris/libhybris/pull/316 is a better solution

=== modified file 'src/ubuntumirclient/glcontext.cpp'
--- src/ubuntumirclient/glcontext.cpp	2016-06-03 09:55:43 +0000
+++ src/ubuntumirclient/glcontext.cpp	2016-06-20 12:13:03 +0000
@@ -95,6 +95,16 @@
     }
 }
 
+// WORKAROUND for bug 1594198 - avoid having Qt use GLESv3
+QSurfaceFormat UbuntuOpenGLContext::format() const
+{
+    auto format = QEGLPlatformContext::format();
+    if (format.renderableType() == QSurfaceFormat::OpenGLES && format.majorVersion() > 2) {
+        format.setMajorVersion(2);
+    }
+    return format;
+}
+
 // Following method used internally in the base class QEGLPlatformContext to access
 // the egl surface of a QPlatformSurface/UbuntuWindow
 EGLSurface UbuntuOpenGLContext::eglSurfaceForPlatformSurface(QPlatformSurface *surface)

=== modified file 'src/ubuntumirclient/glcontext.h'
--- src/ubuntumirclient/glcontext.h	2016-05-19 16:26:30 +0000
+++ src/ubuntumirclient/glcontext.h	2016-06-20 12:13:03 +0000
@@ -32,6 +32,8 @@
     void swapBuffers(QPlatformSurface *surface) final;
     bool makeCurrent(QPlatformSurface *surface) final;
 
+    QSurfaceFormat format() const final;
+
 protected:
     EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) final;
 };