Merge lp:~gerboland/qtmir/fix-GTK-rendering into lp:qtmir

[Gerry Boland]

Explicitly setting GL-mode breaks GTK app rendering. Removing the hack appears to just work

Explicitly setting GL-mode breaks GTK app rendering. Removing the hack appears to just work

To test, install gedit and run
gedit -- --desktop_file_hint=/usr/share/applications/gedit.desktop

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:301
http://jenkins.qa.ubuntu.com/job/qtmir-ci/191/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/42/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/191/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

Builds OK and Unity 8 runs OK on the desktop with this patch. I'm assuming there was a change in the underlying Qt EGL code that fixes the original problem.

review: Approve

[Michał Sawicz (saviq)]

Works fine.

review: Approve

=== modified file 'debian/rules'
--- debian/rules	2014-10-08 21:33:49 +0000
+++ debian/rules	2015-01-12 17:59:41 +0000
@@ -39,7 +39,7 @@
 # See comment in CMakeLists.txt
 	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DCMAKE_INSTALL_PREFIX=$(TMP2_DIR)/usr/ -DUSE_OPENGL_BUT_LINK_AGAINST_OPENGLES=1
 else
-	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) "-DCMAKE_CXX_FLAGS=-DQTMIR_USE_OPENGL" $(CURDIR) -DCMAKE_INSTALL_PREFIX=$(TMP2_DIR)/usr/
+	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DCMAKE_INSTALL_PREFIX=$(TMP2_DIR)/usr/ -DUSE_OPENGLES=1
 endif
 
 override_dh_auto_build:

=== modified file 'src/platforms/mirserver/miropenglcontext.cpp'
--- src/platforms/mirserver/miropenglcontext.cpp	2014-12-01 11:10:54 +0000
+++ src/platforms/mirserver/miropenglcontext.cpp	2015-01-12 17:59:41 +0000
@@ -74,11 +74,7 @@
     }
 
     QSurfaceFormat formatCopy = format;
-#ifdef QTMIR_USE_OPENGL
-    formatCopy.setRenderableType(QSurfaceFormat::OpenGL);
-#else
     formatCopy.setRenderableType(QSurfaceFormat::OpenGLES);
-#endif
 
     m_format = q_glFormatFromConfig(eglDisplay, eglConfig, formatCopy);
 
@@ -115,10 +111,6 @@
 
 void MirOpenGLContext::swapBuffers(QPlatformSurface *surface)
 {
-#ifdef QTMIR_USE_OPENGL
-    eglBindAPI(EGL_OPENGL_API);
-#endif
-
     // ultimately calls Mir's DisplayBuffer::post_update()
     DisplayWindow *displayBuffer = static_cast<DisplayWindow*>(surface);
     displayBuffer->swapBuffers(); //blocks for vsync
@@ -126,10 +118,6 @@
 
 bool MirOpenGLContext::makeCurrent(QPlatformSurface *surface)
 {
-#ifdef QTMIR_USE_OPENGL
-    eglBindAPI(EGL_OPENGL_API);
-#endif
-
     // ultimately calls Mir's DisplayBuffer::make_current()
     DisplayWindow *displayBuffer = static_cast<DisplayWindow*>(surface);
     if (displayBuffer) {
@@ -155,9 +143,5 @@
 
 QFunctionPointer MirOpenGLContext::getProcAddress(const QByteArray &procName)
 {
-#ifdef QTMIR_USE_OPENGL
-    eglBindAPI(EGL_OPENGL_API);
-#endif
-
     return eglGetProcAddress(procName.constData());
 }

=== modified file 'src/platforms/mirserver/mirserver.cpp'
--- src/platforms/mirserver/mirserver.cpp	2014-12-03 12:06:30 +0000
+++ src/platforms/mirserver/mirserver.cpp	2015-01-12 17:59:41 +0000
@@ -90,10 +90,6 @@
 
     override_the_gl_config([]
         {
-#ifdef QTMIR_USE_OPENGL
-            // Should desktop-GL be desired, need to bind that API before a context is created
-            eglBindAPI(EGL_OPENGL_API);
-#endif
             return std::make_shared<MirGLConfig>();
         });