Merge lp:~gerboland/qtmir/refactor-opengl into lp:qtmir

[Gerry Boland]

Refactor GL context management

- isolate EGL state (Config & Display) into separate class
- isolate GLConfiguration into a separate class
- share the EGL state with MirOpenGLContext to allow it to create its Surface itself.
Then can remove the OpenGLContextFactory and remove mir dependencies in QMirServerPrivate and some QPA internals from QMirServer.

The EGL and GLConfiguration classes will be handy to expose in a later C++ api.

[lp:~gerboland/qtmir/refactor-opengl]

643. By Gerry Boland on 2017-04-05

It works, comment removed

644. By Gerry Boland on 2017-04-05

Fix GL/EGL debugging

645. By Gerry Boland on 2017-04-05

Fix header file ifndefs

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

PASSED: Continuous integration, rev:643
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/670/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4908
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4936
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4744
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4744/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4744
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4744/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4744
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4744/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4744
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4744/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4744
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4744/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4744
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4744/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:645
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/671/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4912
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4940
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4748
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4748/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4748
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4748/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4748
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4748/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4748
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4748/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4748
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4748/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4748
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4748/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

class GLConfiguration ...

I'm not sure of the design intent here.

The only reason for virtual functions appears to be supplying two ints. Inlining virtual functions is an unlikely design. And the implementations just supply constants. Note that copying (with slicing) is allowed.

How about a handle class:

class GLConfiguration
{
public:
    GLConfiguration(int depth_buffer_bits = 24, int stencil_buffer_bits = 8);
    ~GLConfiguration();

    int depth_buffer_bits() const;
    int stencil_buffer_bits() const;

    void operator()(mir::Server& server) const;

private:
    struct Self;
    std::shared_ptr<Self> self;
};

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

+class EGL
+{
+public:
+ virtual EGLConfig config() const = 0;
+ virtual EGLDisplay display() const = 0;
+};

It is a good idea to disable CopyAssign in an interface.

[Alan Griffiths (alan-griffiths)]

Other than the above nits, this looks like good progress.

Unmerged revisions

645. By Gerry Boland on 2017-04-05

Fix header file ifndefs

644. By Gerry Boland on 2017-04-05

Fix GL/EGL debugging

643. By Gerry Boland on 2017-04-05

It works, comment removed

642. By Gerry Boland on 2017-04-05

Refactor GL context management
- isolate EGL state (Config & Display) into separate class
- isolate GLConfiguration into a separate class
- share the EGL state with MirOpenGLContext to allow it to create its Surface itself.
Then can remove the OpenGLContextFactory and remove mir dependencies in QMirServerPrivate and some QPA internals from QMirServer.

The EGL and GLConfiguration classes will be handy to expose in a later C++ api.

641. By Alan Griffiths on 2017-04-05

Apply Gerry's patch to CMakeLists.txt

640. By Alan Griffiths on 2017-04-03

windowmanagementpolicy.cpp doesn't use libmirserver

639. By Alan Griffiths on 2017-03-31

cleanup the mirserver platform compile flags

638. By Alan Griffiths on 2017-03-31

Avoid dependency on libmirserver-dev in qtcompositor.h

637. By Alan Griffiths on 2017-03-31

Avoid dependency on libmirserver-dev in inputdeviceobserver.h

636. By Alan Griffiths on 2017-03-31

Avoid dependency on libmirserver-dev in screensmodel.h

=== modified file 'src/platforms/mirserver/CMakeLists.txt'
--- src/platforms/mirserver/CMakeLists.txt	2017-04-05 16:31:55 +0000
+++ src/platforms/mirserver/CMakeLists.txt	2017-04-05 16:31:55 +0000
@@ -52,17 +52,16 @@
 
 # Files the depend on mirserver-dev
 set(MIRSERVER_DEPENDANTS
+    eglimpl.cpp
     eventbuilder.cpp
     eventdispatch.cpp
+    glconfiguration.cpp
     inputdeviceobserver.cpp
     mircursorimages.cpp
     mirdisplayconfigurationpolicy.cpp
     miropenglcontext.cpp
     mirserverhooks.cpp
-    mirserverintegration.cpp
-    openglcontextfactory.cpp
     promptsessionmanager.cpp
-    qmirserver.cpp
     qmirserver_p.cpp
     qteventfeeder.cpp
     screen.cpp
@@ -79,11 +78,13 @@
     initialsurfacesizes.cpp
     inputdeviceobserver.cpp
     logging.cpp
+    mirserverintegration.cpp
     mirsingleton.cpp
     nativeinterface.cpp
     offscreensurface.cpp
     plugin.cpp
     promptsessionlistener.cpp
+    qmirserver.cpp
     qtcompositor.cpp
     services.cpp
     sessionauthorizer.cpp

=== added file 'src/platforms/mirserver/egl.h'
--- src/platforms/mirserver/egl.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mirserver/egl.h	2017-04-05 16:31:55 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef QTMIR_EGL_H
+#define QTMIR_EGL_H
+
+#define MESA_EGL_NO_X11_HEADERS
+#include <EGL/egl.h>
+
+namespace qtmir {
+
+class EGL
+{
+public:
+    virtual EGLConfig config() const = 0;
+    virtual EGLDisplay display() const = 0;
+};
+
+} // namespace qtmir
+
+#endif // QTMIR_EGL_H

=== added file 'src/platforms/mirserver/eglimpl.cpp'
--- src/platforms/mirserver/eglimpl.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mirserver/eglimpl.cpp	2017-04-05 16:31:55 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "eglimpl.h"
+
+// Mir
+#include <mir/graphics/display.h>
+#include <mir/renderer/gl/context.h>
+#include <mir/renderer/gl/context_source.h>
+
+// Qt
+#include <QDebug>
+#include <QtGui/private/qopenglcontext_p.h>
+#include <QtPlatformSupport/private/qeglconvenience_p.h>
+
+using namespace qtmir;
+namespace mrg = mir::renderer::gl;
+
+EGLImpl::EGLImpl(mir::graphics::Display &display)
+    : m_eglConfig(0)
+    , m_eglDisplay(0)
+{
+    // create a temporary GL context to fetch the EGL display and config, so Qt can determine the surface format
+    std::unique_ptr<mrg::Context> mirContext = dynamic_cast<mrg::ContextSource*>(
+                                                   display.native_display())->create_gl_context();
+    mirContext->make_current();
+
+    m_eglDisplay = eglGetCurrentDisplay();
+    if (m_eglDisplay == EGL_NO_DISPLAY) {
+        qFatal("Unable to determine current EGL Display");
+    }
+
+    EGLContext eglContext = eglGetCurrentContext();
+    if (eglContext == EGL_NO_CONTEXT) {
+        qFatal("Unable to determine current EGL Context");
+    }
+    EGLint eglConfigId = -1;
+    EGLBoolean result;
+    result = eglQueryContext(m_eglDisplay, eglContext, EGL_CONFIG_ID, &eglConfigId);
+    if (result != EGL_TRUE || eglConfigId < 0) {
+        qFatal("Unable to determine current EGL Config ID");
+    }
+
+    EGLint matchingEglConfigCount;
+    EGLint const attribList[] = {
+        EGL_CONFIG_ID, eglConfigId,
+        EGL_NONE
+    };
+    result = eglChooseConfig(m_eglDisplay, attribList, &m_eglConfig, 1, &matchingEglConfigCount);
+    if (result != EGL_TRUE || m_eglConfig == nullptr || matchingEglConfigCount < 1) {
+        qFatal("Unable to select EGL Config with the supposed current config ID");
+    }
+
+#ifdef QGL_DEBUG
+    const char* string = (const char*) glGetString(GL_VENDOR);
+    qDebug() << "OpenGL ES vendor: " << qPrintable(string);
+    string = (const char*) glGetString(GL_RENDERER);
+    qDebug() << "OpenGL ES renderer"  << qPrintable(string);
+    string = (const char*) glGetString(GL_VERSION);
+    qDebug() << "OpenGL ES version" << qPrintable(string);
+    string = (const char*) glGetString(GL_SHADING_LANGUAGE_VERSION);
+    qDebug() << "OpenGL ES Shading Language version:" << qPrintable(string);
+    string = (const char*) glGetString(GL_EXTENSIONS);
+    qDebug() << "OpenGL ES extensions:" << qPrintable(string);
+    q_printEglConfig(m_eglDisplay, m_eglConfig);
+#endif
+
+    mirContext->release_current(); // Need to release as it doesn't happen when GLContext goes out of scope
+}
+
+EGLConfig EGLImpl::config() const
+{
+    return m_eglConfig;
+}
+
+EGLDisplay EGLImpl::display() const
+{
+    return m_eglDisplay;
+}

=== added file 'src/platforms/mirserver/eglimpl.h'
--- src/platforms/mirserver/eglimpl.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mirserver/eglimpl.h	2017-04-05 16:31:55 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef QTMIR_EGLIMPL_H
+#define QTMIR_EGLIMPL_H
+
+#include "egl.h"
+
+namespace mir { namespace graphics { class Display; }}
+
+namespace qtmir {
+
+class EGLImpl : public EGL
+{
+public:
+    explicit EGLImpl(mir::graphics::Display &display);
+
+    EGLConfig config() const override;
+    EGLDisplay display() const override;
+
+private:
+    EGLConfig m_eglConfig;
+    EGLDisplay m_eglDisplay;
+};
+
+} //namespace qtmir
+
+#endif // QTMIR_EGLIMPL_H

=== added file 'src/platforms/mirserver/glconfiguration.cpp'
--- src/platforms/mirserver/glconfiguration.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mirserver/glconfiguration.cpp	2017-04-05 16:31:55 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "glconfiguration.h"
+
+#include <mir/server.h>
+
+#include <mir/graphics/gl_config.h>
+
+#include <QSurfaceFormat>
+
+using namespace qtmir;
+namespace mg = mir::graphics;
+
+namespace {
+
+class GLConfigImpl : public mg::GLConfig
+{
+public:
+    GLConfigImpl(int depth, int stencil) : depthBufferBits(depth), stencilBufferBits(stencil) {}
+
+    int depth_buffer_bits() const override { return depthBufferBits; }
+    int stencil_buffer_bits() const override { return stencilBufferBits; }
+private:
+    int depthBufferBits;
+    int stencilBufferBits;
+};
+
+} // namespace
+
+
+GLConfiguration::GLConfiguration()
+{
+    auto defaultFormat = QSurfaceFormat::defaultFormat();
+    defaultFormat.setDepthBufferSize(depth_buffer_bits());
+    defaultFormat.setStencilBufferSize(stencil_buffer_bits());
+    QSurfaceFormat::setDefaultFormat(defaultFormat);
+}
+
+GLConfiguration::~GLConfiguration() = default;
+
+void GLConfiguration::operator()(mir::Server& server) const
+{
+    server.override_the_gl_config([&]
+        {
+            return std::make_shared<::GLConfigImpl>(depth_buffer_bits(), stencil_buffer_bits());
+        });
+}

=== added file 'src/platforms/mirserver/glconfiguration.h'
--- src/platforms/mirserver/glconfiguration.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mirserver/glconfiguration.h	2017-04-05 16:31:55 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef QTMIR_GLCONFIGURATION_H
+#define QTMIR_GLCONFIGURATION_H
+
+#include <memory>
+
+namespace mir { class Server; }
+
+namespace qtmir
+{
+
+class GLConfiguration
+{
+public:
+    GLConfiguration();
+    virtual ~GLConfiguration();
+
+    virtual int depth_buffer_bits() const { return 24; }
+    virtual int stencil_buffer_bits() const { return 8; }
+
+    void operator()(mir::Server& server) const;
+};
+
+
+/*
+    Set the GLConfiguration to allow the server specify aspects of
+    the preferred GL configuration (used by Mir when doing eglChooseConfig)
+
+    usage:
+    class MyGLConfiguration : public qtmir::GLConfiguration
+    {
+        int depth_buffer_bits() const override { return 0; }
+        int stencil_buffer_bits() const override { return 8; }
+    }
+
+    MyGLConfiguration glConfig;
+
+    qtmir::GuiServerApplication app(argc, argv, { glConfig });
+ */
+
+} // namespace qtmir
+
+
+#endif // QTMIR_GLCONFIGURATION_H

=== modified file 'src/platforms/mirserver/miropenglcontext.cpp'
--- src/platforms/mirserver/miropenglcontext.cpp	2016-12-14 16:59:01 +0000
+++ src/platforms/mirserver/miropenglcontext.cpp	2017-04-05 16:31:55 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 Canonical, Ltd.
+ * Copyright (C) 2013-2017 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -14,97 +14,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QDebug>
+
 #include "miropenglcontext.h"
 
 #include "offscreensurface.h"
 #include "mirglconfig.h"
 #include "screenwindow.h"
 
-#include <QDebug>
-
 #include <QOpenGLFramebufferObject>
 #include <QSurfaceFormat>
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
 #include <QtGui/private/qopenglcontext_p.h>
 
-// Mir
-#include <mir/graphics/display.h>
-#include <mir/renderer/gl/context.h>
-#include <mir/renderer/gl/context_source.h>
-
 // Qt supports one GL context per screen, but also shared contexts.
 // The Mir "Display" generates a shared GL context for all DisplayBuffers
 // (i.e. individual display output buffers) to use as a common base context.
 
-MirOpenGLContext::MirOpenGLContext(
-    mir::graphics::Display &display,
-    mir::graphics::GLConfig &gl_config,
-    const QSurfaceFormat &format)
+MirOpenGLContext::MirOpenGLContext(const QSharedPointer<qtmir::EGL> egl, const QSurfaceFormat &format)
     : m_currentWindow(nullptr)
-#ifdef QGL_DEBUG
-      , m_logger(new QOpenGLDebugLogger(this))
-#endif
 {
-    // create a temporary GL context to fetch the EGL display and config, so Qt can determine the surface format
-    std::unique_ptr<mir::renderer::gl::Context> mirContext = dynamic_cast<mir::renderer::gl::ContextSource*>(
-                                                                display.native_display())->create_gl_context();
-    mirContext->make_current();
-
-    EGLDisplay eglDisplay = eglGetCurrentDisplay();
-    if (eglDisplay == EGL_NO_DISPLAY) {
-        qFatal("Unable to determine current EGL Display");
-    }
-    EGLContext eglContext = eglGetCurrentContext();
-    if (eglContext == EGL_NO_CONTEXT) {
-        qFatal("Unable to determine current EGL Context");
-    }
-    EGLint eglConfigId = -1;
-    EGLBoolean result;
-    result = eglQueryContext(eglDisplay, eglContext, EGL_CONFIG_ID, &eglConfigId);
-    if (result != EGL_TRUE || eglConfigId < 0) {
-        qFatal("Unable to determine current EGL Config ID");
-    }
-
-    EGLConfig eglConfig;
-    EGLint matchingEglConfigCount;
-    EGLint const attribList[] = {
-        EGL_CONFIG_ID, eglConfigId,
-        EGL_NONE
-    };
-    result = eglChooseConfig(eglDisplay, attribList, &eglConfig, 1, &matchingEglConfigCount);
-    if (result != EGL_TRUE || eglConfig == nullptr || matchingEglConfigCount < 1) {
-        qFatal("Unable to select EGL Config with the supposed current config ID");
-    }
-
     QSurfaceFormat formatCopy = format;
     formatCopy.setRenderableType(QSurfaceFormat::OpenGLES);
 
-    m_format = q_glFormatFromConfig(eglDisplay, eglConfig, formatCopy);
-    mirContext->release_current(); // Need to release as it doesn't happen when GLContext goes out of scope
-
-    // FIXME: the temporary gl context created by Mir does not have the attributes we specified
-    // in the GLConfig, so need to set explicitly for now
-    m_format.setDepthBufferSize(gl_config.depth_buffer_bits());
-    m_format.setStencilBufferSize(gl_config.stencil_buffer_bits());
-    m_format.setSamples(-1);
+    m_format = q_glFormatFromConfig(egl->display(), egl->config(), formatCopy);
 
 #ifdef QGL_DEBUG
-    const char* string = (const char*) glGetString(GL_VENDOR);
-    qDebug() << "OpenGL ES vendor: " << qPrintable(string);
-    string = (const char*) glGetString(GL_RENDERER);
-    qDebug() << "OpenGL ES renderer"  << qPrintable(string);
-    string = (const char*) glGetString(GL_VERSION);
-    qDebug() << "OpenGL ES version" << qPrintable(string);
-    string = (const char*) glGetString(GL_SHADING_LANGUAGE_VERSION);
-    qDebug() << "OpenGL ES Shading Language version:" << qPrintable(string);
-    string = (const char*) glGetString(GL_EXTENSIONS);
-    qDebug() << "OpenGL ES extensions:" << qPrintable(string);
-    q_printEglConfig(eglDisplay, eglConfig);
-
     QObject::connect(m_logger, &QOpenGLDebugLogger::messageLogged,
                      this, &MirOpenGLContext::onGlDebugMessageLogged, Qt::DirectConnection);
 #endif // debug
-    mirContext->release_current(); // Need to release as it doesn't happen when GLContext goes out of scope
 }
 
 QSurfaceFormat MirOpenGLContext::format() const

=== modified file 'src/platforms/mirserver/miropenglcontext.h'
--- src/platforms/mirserver/miropenglcontext.h	2016-11-18 12:14:14 +0000
+++ src/platforms/mirserver/miropenglcontext.h	2017-04-05 16:31:55 +0000
@@ -19,21 +19,19 @@
 
 #include <qpa/qplatformopenglcontext.h>
 
+#include "egl.h"
+
 #ifdef QGL_DEBUG
 #include <QOpenGLDebugLogger>
 #endif
 
 class ScreenWindow;
-namespace mir { namespace graphics { class Display; class GLConfig; }}
 
 class MirOpenGLContext : public QObject, public QPlatformOpenGLContext
 {
     Q_OBJECT
 public:
-    MirOpenGLContext(
-        mir::graphics::Display &display,
-        mir::graphics::GLConfig &gl_config
-        , const QSurfaceFormat &);
+    explicit MirOpenGLContext(const QSharedPointer<qtmir::EGL> egl, const QSurfaceFormat &);
     ~MirOpenGLContext() = default;
 
     QSurfaceFormat format() const override;
@@ -50,14 +48,11 @@
     QFunctionPointer getProcAddress(const char *procName) override;
 #endif
 
-#ifdef QGL_DEBUG
-    Q_SLOT void onGlDebugMessageLogged(QOpenGLDebugMessage m) { qDebug() << m; }
-#endif
-
 private:
     QSurfaceFormat m_format;
     ScreenWindow *m_currentWindow;
 #ifdef QGL_DEBUG
+    Q_SLOT void onGlDebugMessageLogged(QOpenGLDebugMessage m) { qDebug() << m; }
     QOpenGLDebugLogger *m_logger;
 #endif
 };

=== modified file 'src/platforms/mirserver/mirserverintegration.cpp'
--- src/platforms/mirserver/mirserverintegration.cpp	2017-02-21 18:53:48 +0000
+++ src/platforms/mirserver/mirserverintegration.cpp	2017-04-05 16:31:55 +0000
@@ -30,10 +30,6 @@
 #include <QStringList>
 #include <QDebug>
 
-// Mir
-#include <mir/graphics/display.h>
-#include <mir/graphics/display_configuration.h>
-
 // local
 #include "clipboard.h"
 #include "miropenglcontext.h"
@@ -125,7 +121,7 @@
 
 QPlatformOpenGLContext *MirServerIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const
 {
-    return m_mirServer->createPlatformOpenGLContext(context);
+    return new MirOpenGLContext(m_mirServer->eglConfig(), context->format());
 }
 
 QAbstractEventDispatcher *MirServerIntegration::createEventDispatcher() const

=== removed file 'src/platforms/mirserver/openglcontextfactory.cpp'
--- src/platforms/mirserver/openglcontextfactory.cpp	2016-11-03 20:17:46 +0000
+++ src/platforms/mirserver/openglcontextfactory.cpp	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright © 2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alan Griffiths <[e-mail]>
- */
-
-#include "openglcontextfactory.h"
-
-// local
-#include "mirglconfig.h"
-#include "miropenglcontext.h"
-
-// mir
-#include <mir/server.h>
-
-struct qtmir::OpenGLContextFactory::Self
-{
-    std::shared_ptr<MirGLConfig> m_glConfig;
-};
-
-qtmir::OpenGLContextFactory::OpenGLContextFactory() :
-    self{std::make_shared<Self>()}
-{
-}
-
-void qtmir::OpenGLContextFactory::operator()(mir::Server& server)
-{
-    server.override_the_gl_config([this]
-        { return self->m_glConfig = std::make_shared<MirGLConfig>(); });
-}
-
-QPlatformOpenGLContext *qtmir::OpenGLContextFactory::createPlatformOpenGLContext(
-    QSurfaceFormat format, mir::graphics::Display &mirDisplay) const
-{
-    if (!self->m_glConfig)
-        throw std::logic_error("No gl config available. Server not running?");
-
-    return new MirOpenGLContext(mirDisplay, *self->m_glConfig, format);
-}

=== removed file 'src/platforms/mirserver/openglcontextfactory.h'
--- src/platforms/mirserver/openglcontextfactory.h	2016-11-03 20:17:46 +0000
+++ src/platforms/mirserver/openglcontextfactory.h	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alan Griffiths <[e-mail]>
- */
-
-#ifndef MIRAL_OPENGLCONTEXTFACTORY_H
-#define MIRAL_OPENGLCONTEXTFACTORY_H
-
-#include <memory>
-
-namespace mir { namespace graphics { class Display; }}
-namespace mir { class Server; }
-
-class QPlatformOpenGLContext;
-class QSurfaceFormat;
-
-namespace qtmir
-{
-class OpenGLContextFactory
-{
-public:
-    OpenGLContextFactory();
-
-    void operator()(mir::Server& server);
-
-    QPlatformOpenGLContext *createPlatformOpenGLContext(QSurfaceFormat format, mir::graphics::Display &mirDisplay) const;
-
-private:
-    struct Self;
-    std::shared_ptr<Self> self;
-};
-}
-
-#endif //MIRAL_OPENGLCONTEXTFACTORY_H

=== modified file 'src/platforms/mirserver/qmirserver.cpp'
--- src/platforms/mirserver/qmirserver.cpp	2017-03-14 13:49:38 +0000
+++ src/platforms/mirserver/qmirserver.cpp	2017-04-05 16:31:55 +0000
@@ -82,10 +82,10 @@
     return d->screensModel;
 }
 
-QPlatformOpenGLContext *QMirServer::createPlatformOpenGLContext(QOpenGLContext *context) const
+QSharedPointer<qtmir::EGL> QMirServer::eglConfig() const
 {
     Q_D(const QMirServer);
-    return d->createPlatformOpenGLContext(context);
+    return d->eglConfig;
 }
 
 void *QMirServer::nativeResourceForIntegration(const QByteArray &resource) const

=== modified file 'src/platforms/mirserver/qmirserver.h'
--- src/platforms/mirserver/qmirserver.h	2017-02-21 18:53:48 +0000
+++ src/platforms/mirserver/qmirserver.h	2017-04-05 16:31:55 +0000
@@ -24,13 +24,13 @@
 #include <memory>
 
 // qtmir
-namespace qtmir { class PromptSessionManager; }
+namespace qtmir {
+    class EGL;
+    class PromptSessionManager;
+}
 
 class QMirServerPrivate;
-class ScreensController;
 class ScreensModel;
-class QPlatformOpenGLContext;
-class QOpenGLContext;
 
 class QMirServer: public QObject
 {
@@ -45,7 +45,7 @@
     bool isRunning() const;
 
     QSharedPointer<ScreensModel> screensModel() const;
-    QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
+    QSharedPointer<qtmir::EGL> eglConfig() const;
     void *nativeResourceForIntegration(const QByteArray &resource) const;
     std::shared_ptr<qtmir::PromptSessionManager> thePromptSessionManager() const;
 

=== modified file 'src/platforms/mirserver/qmirserver_p.cpp'
--- src/platforms/mirserver/qmirserver_p.cpp	2017-03-28 17:13:24 +0000
+++ src/platforms/mirserver/qmirserver_p.cpp	2017-04-05 16:31:55 +0000
@@ -22,6 +22,7 @@
 #include "windowmanagementpolicy.h"
 #include "promptsessionmanager.h"
 #include "setqtcompositor.h"
+#include "eglimpl.h"
 
 // prototyping for later incorporation in miral
 #include <miral/persist_display_config.h>
@@ -68,11 +69,6 @@
     return mir_running;
 }
 
-QPlatformOpenGLContext *QMirServerPrivate::createPlatformOpenGLContext(QOpenGLContext *context) const
-{
-    return m_openGLContextFactory.createPlatformOpenGLContext(context->format(), *m_mirServerHooks.theMirDisplay());
-}
-
 std::shared_ptr<qtmir::PromptSessionManager> QMirServerPrivate::promptSessionManager() const
 {
     return std::make_shared<qtmir::PromptSessionManager>(m_mirServerHooks.thePromptSessionManager());
@@ -115,6 +111,7 @@
 
     runner.add_start_callback([&]
     {
+        eglConfig.reset(new qtmir::EGLImpl(*m_mirServerHooks.theMirDisplay()));
         screensModel->update();
         screensController = m_mirServerHooks.createScreensController(screensModel);
         m_mirServerHooks.createInputDeviceObserver();
@@ -130,8 +127,8 @@
 
     runner.run_with(
         {
+            m_glConfig,
             m_sessionAuthorizer,
-            m_openGLContextFactory,
             m_mirServerHooks,
             miral::set_window_management_policy<WindowManagementPolicy>(m_windowModelNotifier, m_windowController,
                     m_appNotifier, screensModel),

=== modified file 'src/platforms/mirserver/qmirserver_p.h'
--- src/platforms/mirserver/qmirserver_p.h	2017-02-21 18:53:48 +0000
+++ src/platforms/mirserver/qmirserver_p.h	2017-04-05 16:31:55 +0000
@@ -27,12 +27,12 @@
 
 // local
 #include "appnotifier.h"
-#include "openglcontextfactory.h"
+#include "glconfiguration.h"
+#include "mirserverhooks.h"
 #include "screensmodel.h"
+#include "sessionauthorizer.h"
 #include "windowcontroller.h"
 #include "windowmodelnotifier.h"
-#include "sessionauthorizer.h"
-#include "mirserverhooks.h"
 
 //miral
 #include <miral/application_authorizer.h>
@@ -44,6 +44,7 @@
 namespace qtmir
 {
 using SetSessionAuthorizer = miral::SetApplicationAuthorizer<SessionAuthorizer>;
+class EGL;
 class PromptSessionManager;
 }
 
@@ -54,8 +55,7 @@
     const QSharedPointer<ScreensModel> screensModel{new ScreensModel()};
     QSharedPointer<ScreensController> screensController;
     MirServerThread *serverThread;
-
-    QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
+    QSharedPointer<qtmir::EGL> eglConfig;
 
     void run(const std::function<void()> &startCallback);
     void stop();
@@ -76,8 +76,8 @@
         { return &m_windowController; }
 
 private:
+    qtmir::GLConfiguration      m_glConfig;
     qtmir::SetSessionAuthorizer m_sessionAuthorizer;
-    qtmir::OpenGLContextFactory m_openGLContextFactory;
     qtmir::MirServerHooks       m_mirServerHooks;
 
     miral::MirRunner runner;