Merge lp:~cemil-azizoglu/mir/x11-better-display-handling into lp:mir

[Cemil Azizoglu]

Overhauled mgx::Display and mgx::DisplayBuffer implementations to bring it more inline with mesa-kms.

Overhauled mgx::Display and mgx::DisplayBuffer implementations.

 - Previously, mgx::Display created a window *and* set up the egl window surface. With this branch it only creates the window as that's the "display", but leaves the egl window creation/management to mgx::DisplayBuffer much like its kms counterpart.

 - Created an EGL helper, much like the mgmh::EGLHelper, though too bad it can't reuse the same code as mesa-kms uses gbm while mesa-x11 uses x11 objects in the headers.

 - Fixed the bug where mir_demo_standalone_render_surfaces didn't work. The mir_demo_standalone_render_to_fb still seems to crash inside the gl driver. I investigated further but haven't been able to uncover the root cause of the crash. I verified the EGL/GL call sequences of kms and x11 backends are the same. I can only imagine that this is a driver bug in the shared context handling code (though I haven't tried it on another GPU - I only have Intel i965).

 - Similar to mesa-kms, made mgx::DisplayBuffer inherit from DisplaySyncGroup, which simplifies the code.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3715
https://mir-jenkins.ubuntu.com/job/mir-ci/1809/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2260/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2323
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2314
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2314
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2314
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2288/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2288
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2288/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2288
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2288/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2288
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2288/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2288
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2288/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1809/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3716
https://mir-jenkins.ubuntu.com/job/mir-ci/1811/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2262
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2325
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2290
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2290/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2290
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2290/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2290
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2290/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2290
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2290/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2290
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2290/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1811/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Please have a look at this before we have major conflicts:
https://code.launchpad.net/~vanvugt/mir/physical-frame/+merge/306199

review: Needs Information

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

> Please have a look at this before we have major conflicts:
> https://code.launchpad.net/~vanvugt/mir/physical-frame/+merge/306199

We will definitely conflict. It'd be good if you could rebase to this MP as the Display/DisplayBuffer handling is much better now. It should be easy to rebase as the branch is limited to mir-on-x.

[Daniel van Vugt (vanvugt)]

Well I've had that code written in some form for months. It would be nice if I didn't have to rewrite parts due to this branch.

[Daniel van Vugt (vanvugt)]

review: Abstain

[Cemil Azizoglu (cemil-azizoglu)]

> Well I've had that code written in some form for months. It would be nice if I
> didn't have to rewrite parts due to this branch.

Understood. I guess this is part of the game. No worries. If this one lands before yours I can help you rebase it.

[Daniel van Vugt (vanvugt)]

Also, please check this list in case you're fixing more bugs than you know(!)

https://bugs.launchpad.net/mir/+bugs?field.tag=mesa-x11

[Alan Griffiths (alan-griffiths)]

Well, the code looks no worse than before ;)

And it does seem to fix Mir-on-X11 mode for mir_demo_standalone_render_surfaces.

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/646/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2365/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/687/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2428
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2420
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2420
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2420
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2394/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2394
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2394/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2394/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2394/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2394/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2394
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2394/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2394
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2394/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

^^^
Archive sync problems are new today. Also bug 1628828 is happening.

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/649/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2369/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/690/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2432
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2424
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2424
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2424
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2398
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2398/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2398
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2398/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2398
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2398/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2398/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2398/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2398
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2398/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2398
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2398/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

=== modified file 'src/platforms/mesa/server/kms/display_buffer.cpp'
--- src/platforms/mesa/server/kms/display_buffer.cpp	2016-09-19 06:09:48 +0000
+++ src/platforms/mesa/server/kms/display_buffer.cpp	2016-09-26 01:54:42 +0000
@@ -152,7 +152,7 @@
 
     set_crtc(scheduled_composite_frame);
 
-    egl.release_current();
+    release_current();
 
     listener->report_successful_drm_mode_set_crtc_on_construction();
     listener->report_successful_display_construction();

=== modified file 'src/platforms/mesa/server/x11/graphics/CMakeLists.txt'
--- src/platforms/mesa/server/x11/graphics/CMakeLists.txt	2016-07-28 03:39:52 +0000
+++ src/platforms/mesa/server/x11/graphics/CMakeLists.txt	2016-09-26 01:54:42 +0000
@@ -19,9 +19,8 @@
   guest_platform.cpp
   display.cpp
   display_configuration.cpp
-  gl_context.cpp
-  display_group.cpp
   display_buffer.cpp
+  egl_helper.cpp
 )
 
 add_library(

=== modified file 'src/platforms/mesa/server/x11/graphics/display.cpp'
--- src/platforms/mesa/server/x11/graphics/display.cpp	2016-09-15 00:57:28 +0000
+++ src/platforms/mesa/server/x11/graphics/display.cpp	2016-09-26 01:54:42 +0000
@@ -18,24 +18,25 @@
 
 #include "mir/graphics/platform.h"
 #include "mir/graphics/display_report.h"
-#include "mir/graphics/egl_resources.h"
 #include "mir/graphics/egl_error.h"
 #include "mir/graphics/virtual_output.h"
+#include "mir/renderer/gl/context.h"
 #include "mir/graphics/gl_config.h"
 #include "display_configuration.h"
 #include "display.h"
 #include "display_buffer.h"
-#include "gl_context.h"
 
 #include <boost/throw_exception.hpp>
-#include <fcntl.h>
-#include <mutex>
 
 #include <X11/Xatom.h>
 
 #define MIR_LOG_COMPONENT "x11-display"
 #include "mir/log.h"
 
+namespace mg=mir::graphics;
+namespace mgx=mg::X;
+namespace geom=mir::geometry;
+
 namespace
 {
 auto get_pixel_width(Display *dpy)
@@ -50,66 +51,45 @@
 
     return float(screen->mheight) / screen->height;
 }
-}
-
-namespace mg=mir::graphics;
-namespace mgx=mg::X;
-namespace geom=mir::geometry;
-
-mgx::X11EGLDisplay::X11EGLDisplay(::Display* x_dpy)
-    : egl_dpy{eglGetDisplay(x_dpy)}
-{
-    if (!egl_dpy)
-        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot get an egl display"));
-
-    EGLint egl_major, egl_minor;
-    if (!eglInitialize(egl_dpy, &egl_major, &egl_minor))
-        BOOST_THROW_EXCEPTION(mg::egl_error("eglInitialize failed"));
-
-    mir::log_info("EGL Version %d.%d", egl_major, egl_minor);
-}
-
-mgx::X11EGLDisplay::~X11EGLDisplay()
-{
-    eglTerminate(egl_dpy);
-}
-
-mgx::X11EGLDisplay::operator EGLDisplay() const
-{
-    return egl_dpy;
+
+class XGLContext : public mir::renderer::gl::Context
+{
+public:
+    XGLContext(::Display* const x_dpy,
+               std::shared_ptr<mg::GLConfig> const& gl_config,
+               EGLContext const shared_ctx)
+        : egl{*gl_config}
+    {
+        egl.setup(x_dpy, shared_ctx);
+    }
+
+    ~XGLContext() = default;
+
+    void make_current() const override
+    {
+        egl.make_current();
+    }
+
+    void release_current() const override
+    {
+        egl.release_current();
+    }
+
+private:
+    mgx::helpers::EGLHelper egl;
+};
 }
 
 mgx::X11Window::X11Window(::Display* x_dpy,
                           EGLDisplay egl_dpy,
                           geom::Size const size,
-                          GLConfig const& gl_config)
+                          EGLConfig const egl_cfg)
     : x_dpy{x_dpy}
 {
-    EGLint const att[] = {
-        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-        EGL_RED_SIZE, 8,
-        EGL_GREEN_SIZE, 8,
-        EGL_BLUE_SIZE, 8,
-        EGL_ALPHA_SIZE, 8,
-        EGL_DEPTH_SIZE, gl_config.depth_buffer_bits(),
-        EGL_STENCIL_SIZE, gl_config.stencil_buffer_bits(),
-        EGL_RENDERABLE_TYPE, MIR_SERVER_EGL_OPENGL_BIT,
-        EGL_NONE
-    };
-
     auto root = XDefaultRootWindow(x_dpy);
 
-    EGLint num_configs;
-    if (!eglChooseConfig(egl_dpy, att, &config, 1, &num_configs))
-        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot get an EGL config"));
-
-    mir::log_info("%d config(s) found", num_configs);
-
-    if (num_configs <= 0)
-        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot get an EGL config"));
-
     EGLint vid;
-    if (!eglGetConfigAttrib(egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid))
+    if (!eglGetConfigAttrib(egl_dpy, egl_cfg, EGL_NATIVE_VISUAL_ID, &vid))
         BOOST_THROW_EXCEPTION(mg::egl_error("Cannot get config attrib"));
 
     XVisualInfo visTemplate;
@@ -214,103 +194,56 @@
     return win;
 }
 
-EGLConfig mgx::X11Window::egl_config() const
-{
-    return config;
-}
-
 unsigned long mgx::X11Window::red_mask() const
 {
     return r_mask;
 }
 
-mgx::X11EGLContext::X11EGLContext(EGLDisplay egl_dpy, EGLConfig config)
-    : egl_dpy{egl_dpy}
-{
-    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
-
-    static const EGLint ctx_attribs[] = {
-#if MIR_SERVER_EGL_OPENGL_BIT == EGL_OPENGL_ES2_BIT
-        EGL_CONTEXT_CLIENT_VERSION, 2,
-#endif
-        EGL_NONE };
-
-    egl_ctx = eglCreateContext(egl_dpy, config, EGL_NO_CONTEXT, ctx_attribs);
-    if (!egl_ctx)
-        BOOST_THROW_EXCEPTION(mg::egl_error("eglCreateContext failed"));
-}
-
-mgx::X11EGLContext::~X11EGLContext()
-{
-    eglDestroyContext(egl_dpy, egl_ctx);
-}
-
-mgx::X11EGLContext::operator EGLContext() const
-{
-    return egl_ctx;
-}
-
-mgx::X11EGLSurface::X11EGLSurface(EGLDisplay egl_dpy, EGLConfig config, Window win)
-    : egl_dpy{egl_dpy}, egl_surf{eglCreateWindowSurface(egl_dpy, config, win, NULL)}
-{
-    if (!egl_surf)
-        BOOST_THROW_EXCEPTION(mg::egl_error("eglCreateWindowSurface failed"));
-}
-
-mgx::X11EGLSurface::~X11EGLSurface()
-{
-    eglDestroySurface(egl_dpy, egl_surf);
-}
-
-mgx::X11EGLSurface::operator EGLSurface() const
-{
-    return egl_surf;
-}
-
 mgx::Display::Display(::Display* x_dpy,
                       geom::Size const size,
-                      GLConfig const& gl_config,
+                      std::shared_ptr<GLConfig> const& gl_config,
                       std::shared_ptr<DisplayReport> const& report)
-    : egl_display{X11EGLDisplay(x_dpy)},
+    : shared_egl{*gl_config},
+      x_dpy{x_dpy},
       size{size},
+      gl_config{gl_config},
       pixel_width{get_pixel_width(x_dpy)},
       pixel_height{get_pixel_height(x_dpy)},
-      win{X11Window(x_dpy,
-                    egl_display,
-                    size,
-                    gl_config)},
-      egl_context{X11EGLContext(egl_display,
-                                win.egl_config())},
-      egl_surface{X11EGLSurface(egl_display,
-                                win.egl_config(),
-                                win)},
       report{report},
       orientation{mir_orientation_normal}
 {
-    auto red_mask = win.red_mask();
+    shared_egl.setup(x_dpy);
+
+    win = std::make_unique<X11Window>(x_dpy,
+                                      shared_egl.display(),
+                                      size,
+                                      shared_egl.config());
+
+    auto red_mask = win->red_mask();
     pf = (red_mask == 0xFF0000 ? mir_pixel_format_argb_8888
                                : mir_pixel_format_abgr_8888);
 
-    display_group = std::make_unique<mgx::DisplayGroup>(
-        std::make_unique<mgx::DisplayBuffer>(size,
-                                             egl_display,
-                                             egl_surface,
-                                             egl_context,
-                                             report,
-                                             orientation));
-
-    report->report_egl_configuration(egl_display, win.egl_config());
+    display_buffer = std::make_unique<mgx::DisplayBuffer>(
+                         x_dpy,
+                         *win,
+                         size,
+                         shared_egl.context(),
+                         report,
+                         orientation,
+                         *gl_config);
+
+    shared_egl.make_current();
+
     report->report_successful_display_construction();
 }
 
 mgx::Display::~Display() noexcept
 {
-    eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
 }
 
 void mgx::Display::for_each_display_sync_group(std::function<void(mg::DisplaySyncGroup&)> const& f)
 {
-    f(*display_group);
+    f(*display_buffer);
 }
 
 std::unique_ptr<mg::DisplayConfiguration> mgx::Display::configuration() const
@@ -335,7 +268,7 @@
     });
 
     orientation = o;
-    display_group->set_orientation(orientation);
+    display_buffer->set_orientation(orientation);
 }
 
 void mgx::Display::register_configuration_change_handler(
@@ -378,7 +311,7 @@
 
 std::unique_ptr<mir::renderer::gl::Context> mgx::Display::create_gl_context()
 {
-    return std::make_unique<mgx::XGLContext>(egl_display, egl_surface, egl_context);
+    return std::make_unique<XGLContext>(x_dpy, gl_config, shared_egl.context());
 }
 
 bool mgx::Display::apply_if_configuration_preserves_display_buffers(

=== modified file 'src/platforms/mesa/server/x11/graphics/display.h'
--- src/platforms/mesa/server/x11/graphics/display.h	2016-09-15 00:57:28 +0000
+++ src/platforms/mesa/server/x11/graphics/display.h	2016-09-26 01:54:42 +0000
@@ -20,10 +20,10 @@
 #define MIR_GRAPHICS_X_DISPLAY_H_
 
 #include "mir/graphics/display.h"
+#include "mir/geometry/size.h"
 #include "mir/renderer/gl/context_source.h"
 #include "mir_toolkit/common.h"
-#include "display_group.h"
-#include "mir/geometry/size.h"
+#include "egl_helper.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -35,21 +35,12 @@
 {
 
 class GLConfig;
+class DisplayReport;
 
 namespace X
 {
 
-class X11EGLDisplay
-{
-public:
-    X11EGLDisplay(::Display* x_dpy);
-    ~X11EGLDisplay();
-
-    operator EGLDisplay() const;
-
-private:
-    EGLDisplay const egl_dpy;
-};
+class DisplayBuffer;
 
 class X11Window
 {
@@ -57,46 +48,18 @@
     X11Window(::Display* const x_dpy,
               EGLDisplay egl_dpy,
               geometry::Size const size,
-              GLConfig const& gl_config);
+              EGLConfig const egl_cfg);
     ~X11Window();
 
     operator Window() const;
-    EGLConfig egl_config() const;
     unsigned long red_mask() const;
 
 private:
     ::Display* const x_dpy;
     Window win;
-    EGLConfig config;
     unsigned long r_mask;
 };
 
-class X11EGLContext
-{
-public:
-    X11EGLContext(EGLDisplay egl_dpy, EGLConfig config);
-    ~X11EGLContext();
-
-    operator EGLContext() const;
-
-private:
-    EGLContext egl_ctx;
-    EGLDisplay const egl_dpy;
-};
-
-class X11EGLSurface
-{
-public:
-    X11EGLSurface(EGLDisplay egl_dpy, EGLConfig config, Window win);
-    ~X11EGLSurface();
-
-    operator EGLSurface() const;
-
-private:
-    EGLDisplay const egl_dpy;
-    EGLSurface const egl_surf;
-};
-
 class Display : public graphics::Display,
                 public graphics::NativeDisplay,
                 public renderer::gl::ContextSource
@@ -104,7 +67,7 @@
 public:
     explicit Display(::Display* x_dpy,
                      geometry::Size const size,
-                     GLConfig const& gl_config,
+                     std::shared_ptr<GLConfig> const& gl_config,
                      std::shared_ptr<DisplayReport> const& report);
     ~Display() noexcept;
 
@@ -136,17 +99,17 @@
     std::unique_ptr<renderer::gl::Context> create_gl_context() override;
 
 private:
-    X11EGLDisplay const egl_display;
+    helpers::EGLHelper shared_egl;
+    ::Display* const x_dpy;
     mir::geometry::Size const size;
+    std::shared_ptr<GLConfig> const gl_config;
     float pixel_width;
     float pixel_height;
-    X11Window const win;
-    X11EGLContext egl_context;
-    X11EGLSurface egl_surface;
+    std::unique_ptr<X11Window> win;
     MirPixelFormat pf;
-    std::unique_ptr<DisplayGroup> display_group;
     std::shared_ptr<DisplayReport> const report;
     MirOrientation orientation; //TODO: keep entire current display configuration
+    std::unique_ptr<DisplayBuffer> display_buffer;
 };
 
 }

=== modified file 'src/platforms/mesa/server/x11/graphics/display_buffer.cpp'
--- src/platforms/mesa/server/x11/graphics/display_buffer.cpp	2016-09-19 06:09:48 +0000
+++ src/platforms/mesa/server/x11/graphics/display_buffer.cpp	2016-09-26 01:54:42 +0000
@@ -17,29 +17,33 @@
  *
  */
 
-#include "mir/graphics/egl_error.h"
+#include "mir/fatal.h"
 #include "display_buffer.h"
 #include "display_configuration.h"
-
-#include <boost/throw_exception.hpp>
+#include "mir/graphics/display_report.h"
 
 namespace mg=mir::graphics;
 namespace mgx=mg::X;
 namespace geom=mir::geometry;
 
-mgx::DisplayBuffer::DisplayBuffer(geom::Size const sz,
-                                  EGLDisplay const d,
-                                  EGLSurface const s,
-                                  EGLContext const c,
+mgx::DisplayBuffer::DisplayBuffer(::Display* const x_dpy,
+                                  Window const win,
+                                  geom::Size const sz,
+                                  EGLContext const shared_context,
                                   std::shared_ptr<DisplayReport> const& r,
-                                  MirOrientation const o)
+                                  MirOrientation const o,
+                                  GLConfig const& gl_config)
                                   : size{sz},
-                                    egl_dpy{d},
-                                    egl_surf{s},
-                                    egl_ctx{c},
                                     report{r},
-                                    orientation_{o}
+                                    orientation_{o},
+                                    egl{gl_config}
 {
+    egl.setup(x_dpy, win, shared_context);
+    egl.report_egl_configuration(
+        [&r] (EGLDisplay disp, EGLConfig cfg)
+        {
+            r->report_egl_configuration(disp, cfg);
+        });
 }
 
 geom::Rectangle mgx::DisplayBuffer::view_area() const
@@ -56,14 +60,13 @@
 
 void mgx::DisplayBuffer::make_current()
 {
-    if (!eglMakeCurrent(egl_dpy, egl_surf, egl_surf, egl_ctx))
-        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot make current"));
+    if (!egl.make_current())
+        fatal_error("Failed to make EGL surface current");
 }
 
 void mgx::DisplayBuffer::release_current()
 {
-    if (!eglMakeCurrent(egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT))
-        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot make uncurrent"));
+    egl.release_current();
 }
 
 bool mgx::DisplayBuffer::overlay(RenderableList const& /*renderlist*/)
@@ -73,8 +76,8 @@
 
 void mgx::DisplayBuffer::swap_buffers()
 {
-    if (!eglSwapBuffers(egl_dpy, egl_surf))
-        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot swap"));
+    if (!egl.swap_buffers())
+        fatal_error("Failed to perform buffer swap");
 
     /*
      * Admittedly we are not a real display and will miss some real vsyncs
@@ -107,3 +110,18 @@
 {
     return this;
 }
+
+void mgx::DisplayBuffer::for_each_display_buffer(
+    std::function<void(graphics::DisplayBuffer&)> const& f)
+{
+    f(*this);
+}
+
+void mgx::DisplayBuffer::post()
+{
+}
+
+std::chrono::milliseconds mgx::DisplayBuffer::recommended_sleep() const
+{
+    return std::chrono::milliseconds::zero();
+}

=== modified file 'src/platforms/mesa/server/x11/graphics/display_buffer.h'
--- src/platforms/mesa/server/x11/graphics/display_buffer.h	2016-09-19 06:09:48 +0000
+++ src/platforms/mesa/server/x11/graphics/display_buffer.h	2016-09-26 01:54:42 +0000
@@ -20,10 +20,10 @@
 #ifndef MIR_GRAPHICS_X_DISPLAY_BUFFER_H_
 #define MIR_GRAPHICS_X_DISPLAY_BUFFER_H_
 
-#include "mir/graphics/display_report.h"
 #include "mir/graphics/display_buffer.h"
+#include "mir/graphics/display.h"
 #include "mir/renderer/gl/render_target.h"
-#include "gl_context.h"
+#include "egl_helper.h"
 
 #include <EGL/egl.h>
 #include <memory>
@@ -32,21 +32,27 @@
 {
 namespace graphics
 {
+
+class GLConfig;
+class DisplayReport;
+
 namespace X
 {
 
 class DisplayBuffer : public graphics::DisplayBuffer,
+                      public graphics::DisplaySyncGroup,
                       public graphics::NativeDisplayBuffer,
                       public renderer::gl::RenderTarget
 {
 public:
     DisplayBuffer(
+            ::Display* const x_dpy,
+            Window const win,
             geometry::Size const sz,
-            EGLDisplay const d,
-            EGLSurface const s,
-            EGLContext const c,
+            EGLContext const shared_context,
             std::shared_ptr<DisplayReport> const& r,
-            MirOrientation const o);
+            MirOrientation const o,
+            GLConfig const& gl_config);
 
     geometry::Rectangle view_area() const override;
     void make_current() override;
@@ -56,17 +62,20 @@
     bool overlay(RenderableList const& renderlist) override;
     void set_orientation(MirOrientation const new_orientation);
 
+    void for_each_display_buffer(
+        std::function<void(graphics::DisplayBuffer&)> const& f) override;
+    void post() override;
+    std::chrono::milliseconds recommended_sleep() const override;
+
     MirOrientation orientation() const override;
     MirMirrorMode mirror_mode() const override;
     NativeDisplayBuffer* native_display_buffer() override;
 
 private:
     geometry::Size const size;
-    EGLDisplay const egl_dpy;
-    EGLSurface const egl_surf;
-    EGLContext const egl_ctx;
     std::shared_ptr<DisplayReport> const report;
     MirOrientation orientation_;
+    helpers::EGLHelper egl;
 };
 
 }

=== removed file 'src/platforms/mesa/server/x11/graphics/display_group.cpp'
--- src/platforms/mesa/server/x11/graphics/display_group.cpp	2016-01-29 08:18:22 +0000
+++ src/platforms/mesa/server/x11/graphics/display_group.cpp	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2015 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 warranty of
- * MERCHANTABILITY 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/>.
- *
- * Authored by: Cemil Azizoglu <[e-mail]>
- *
- */
-
-#include "display_group.h"
-
-namespace mg = mir::graphics;
-namespace mgx = mg::X;
-
-mgx::DisplayGroup::DisplayGroup(std::unique_ptr<mgx::DisplayBuffer> primary_buffer)
-{
-    display_buffer = std::move(primary_buffer);
-}
-
-void mgx::DisplayGroup::for_each_display_buffer(std::function<void(mg::DisplayBuffer&)> const& f)
-{
-    f(*display_buffer);
-}
-
-void mgx::DisplayGroup::post()
-{
-}
-
-std::chrono::milliseconds mgx::DisplayGroup::recommended_sleep() const
-{
-    return std::chrono::milliseconds::zero();
-}
-
-void mgx::DisplayGroup::set_orientation(MirOrientation orientation)
-{
-    display_buffer->set_orientation(orientation);
-}

=== removed file 'src/platforms/mesa/server/x11/graphics/display_group.h'
--- src/platforms/mesa/server/x11/graphics/display_group.h	2016-01-29 08:18:22 +0000
+++ src/platforms/mesa/server/x11/graphics/display_group.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright © 2015 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 warranty of
- * MERCHANTABILITY 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/>.
- *
- * Authored by: Cemil Azizoglu <[e-mail]>
- *
- */
-
-#ifndef MIR_GRAPHICS_X_DISPLAY_GROUP_H_
-#define MIR_GRAPHICS_X_DISPLAY_GROUP_H_
-
-#include "mir_toolkit/common.h"
-#include "mir/graphics/display.h"
-#include "display_buffer.h"
-
-namespace mir
-{
-namespace graphics
-{
-namespace X
-{
-
-class DisplayGroup : public graphics::DisplaySyncGroup
-{
-public:
-    DisplayGroup(std::unique_ptr<DisplayBuffer> primary_buffer);
-
-    void for_each_display_buffer(std::function<void(graphics::DisplayBuffer&)> const& f) override;
-    void post() override;
-    std::chrono::milliseconds recommended_sleep() const override;
-    void set_orientation(MirOrientation orientation);
-
-private:
-    std::unique_ptr<DisplayBuffer> display_buffer;
-};
-
-}
-}
-}
-
-#endif /* MIR_GRAPHICS_X_DISPLAY_GROUP_H_ */

=== added file 'src/platforms/mesa/server/x11/graphics/egl_helper.cpp'
--- src/platforms/mesa/server/x11/graphics/egl_helper.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/graphics/egl_helper.cpp	2016-09-26 01:54:42 +0000
@@ -0,0 +1,184 @@
+/*
+ * Copyright © 2016 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 warranty of
+ * MERCHANTABILITY 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/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+
+#include "egl_helper.h"
+
+#include "mir/graphics/gl_config.h"
+#include "mir/graphics/egl_error.h"
+
+#include <boost/throw_exception.hpp>
+
+namespace mg = mir::graphics;
+namespace mgx = mg::X;
+namespace mgxh = mgx::helpers;
+
+mgxh::EGLHelper::EGLHelper(GLConfig const& gl_config)
+    : depth_buffer_bits{gl_config.depth_buffer_bits()},
+      stencil_buffer_bits{gl_config.stencil_buffer_bits()},
+      egl_display{EGL_NO_DISPLAY}, egl_config{0},
+      egl_context{EGL_NO_CONTEXT}, egl_surface{EGL_NO_SURFACE},
+      should_terminate_egl{false}
+{
+}
+
+void mgxh::EGLHelper::setup(::Display* const x_dpy)
+{
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
+
+    static const EGLint context_attr[] = {
+#if MIR_SERVER_EGL_OPENGL_BIT == EGL_OPENGL_ES2_BIT
+        EGL_CONTEXT_CLIENT_VERSION, 2,
+#endif
+        EGL_NONE
+    };
+
+    setup_internal(x_dpy, true);
+
+    egl_context = eglCreateContext(egl_display, egl_config, EGL_NO_CONTEXT, context_attr);
+    if (egl_context == EGL_NO_CONTEXT)
+        BOOST_THROW_EXCEPTION(mg::egl_error("Failed to create EGL context"));
+}
+
+void mgxh::EGLHelper::setup(::Display* const x_dpy, EGLContext shared_context)
+{
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
+
+    static const EGLint context_attr[] = {
+#if MIR_SERVER_EGL_OPENGL_BIT == EGL_OPENGL_ES2_BIT
+        EGL_CONTEXT_CLIENT_VERSION, 2,
+#endif
+        EGL_NONE
+    };
+
+    setup_internal(x_dpy, false);
+
+    egl_context = eglCreateContext(egl_display, egl_config, shared_context, context_attr);
+    if (egl_context == EGL_NO_CONTEXT)
+        BOOST_THROW_EXCEPTION(mg::egl_error("Failed to create EGL context"));
+}
+
+void mgxh::EGLHelper::setup(::Display* const x_dpy, Window win,
+                            EGLContext shared_context)
+{
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
+
+    static const EGLint context_attr[] = {
+#if MIR_SERVER_EGL_OPENGL_BIT == EGL_OPENGL_ES2_BIT
+        EGL_CONTEXT_CLIENT_VERSION, 2,
+#endif
+        EGL_NONE
+    };
+
+    setup_internal(x_dpy, false);
+
+    egl_surface = eglCreateWindowSurface(egl_display, egl_config, win, nullptr);
+    if(egl_surface == EGL_NO_SURFACE)
+        BOOST_THROW_EXCEPTION(mg::egl_error("Failed to create EGL window surface"));
+
+    egl_context = eglCreateContext(egl_display, egl_config, shared_context, context_attr);
+    if (egl_context == EGL_NO_CONTEXT)
+        BOOST_THROW_EXCEPTION(mg::egl_error("Failed to create EGL context"));
+}
+
+mgxh::EGLHelper::~EGLHelper() noexcept
+{
+    if (egl_display != EGL_NO_DISPLAY) {
+        if (egl_context != EGL_NO_CONTEXT)
+        {
+            eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
+            if (eglGetCurrentContext() == egl_context)
+                eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+            eglDestroyContext(egl_display, egl_context);
+        }
+        if (egl_surface != EGL_NO_SURFACE)
+            eglDestroySurface(egl_display, egl_surface);
+        if (should_terminate_egl)
+            eglTerminate(egl_display);
+    }
+}
+
+bool mgxh::EGLHelper::swap_buffers()
+{
+    auto ret = eglSwapBuffers(egl_display, egl_surface);
+    return (ret == EGL_TRUE);
+}
+
+bool mgxh::EGLHelper::make_current() const
+{
+    auto ret = eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
+    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
+    return (ret == EGL_TRUE);
+}
+
+bool mgxh::EGLHelper::release_current() const
+{
+    auto ret = eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    return (ret == EGL_TRUE);
+}
+
+void mgxh::EGLHelper::setup_internal(::Display* const x_dpy, bool initialize)
+{
+    EGLint const config_attr[] = {
+        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+        EGL_RED_SIZE, 8,
+        EGL_GREEN_SIZE, 8,
+        EGL_BLUE_SIZE, 8,
+        EGL_ALPHA_SIZE, 8,
+        EGL_DEPTH_SIZE, depth_buffer_bits,
+        EGL_STENCIL_SIZE, stencil_buffer_bits,
+        EGL_RENDERABLE_TYPE, MIR_SERVER_EGL_OPENGL_BIT,
+        EGL_NONE
+    };
+
+    static const EGLint required_egl_version_major = 1;
+    static const EGLint required_egl_version_minor = 4;
+
+    EGLint num_egl_configs;
+
+    egl_display = eglGetDisplay(static_cast<EGLNativeDisplayType>(x_dpy));
+    if (egl_display == EGL_NO_DISPLAY)
+        BOOST_THROW_EXCEPTION(mg::egl_error("Failed to get EGL display"));
+
+    if (initialize)
+    {
+        EGLint major, minor;
+
+        if (eglInitialize(egl_display, &major, &minor) == EGL_FALSE)
+            BOOST_THROW_EXCEPTION(mg::egl_error("Failed to initialize EGL display"));
+
+        if ((major != required_egl_version_major) || (minor != required_egl_version_minor))
+        {
+            BOOST_THROW_EXCEPTION(
+                boost::enable_error_info(std::runtime_error("Incompatible EGL version")));
+            // TODO: Insert egl version major and minor into exception
+        }
+
+        should_terminate_egl = true;
+    }
+
+    if (eglChooseConfig(egl_display, config_attr, &egl_config, 1, &num_egl_configs) == EGL_FALSE ||
+        num_egl_configs != 1)
+    {
+        BOOST_THROW_EXCEPTION(mg::egl_error("Failed to choose ARGB EGL config"));
+    }
+}
+
+void mgxh::EGLHelper::report_egl_configuration(std::function<void(EGLDisplay, EGLConfig)> f)
+{
+    f(egl_display, egl_config);
+}

=== added file 'src/platforms/mesa/server/x11/graphics/egl_helper.h'
--- src/platforms/mesa/server/x11/graphics/egl_helper.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/x11/graphics/egl_helper.h	2016-09-26 01:54:42 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2016 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 warranty of
+ * MERCHANTABILITY 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/>.
+ *
+ * Authored by: Cemil Azizoglu <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_X11_EGL_HELPER_H_
+#define MIR_GRAPHICS_X11_EGL_HELPER_H_
+
+#include <memory>
+
+#include <X11/Xlib.h>
+#include <EGL/egl.h>
+
+namespace mir
+{
+namespace graphics
+{
+class GLConfig;
+
+namespace X
+{
+
+namespace helpers
+{
+
+class EGLHelper
+{
+public:
+    EGLHelper(GLConfig const& gl_config);
+    ~EGLHelper() noexcept;
+
+    EGLHelper(const EGLHelper&) = delete;
+    EGLHelper& operator=(const EGLHelper&) = delete;
+
+    void setup(::Display* const x_dpy);
+    void setup(::Display* const x_dpy, EGLContext shared_context);
+    void setup(::Display* const x_dpy, Window win,
+               EGLContext shared_context);
+
+    bool swap_buffers();
+    bool make_current() const;
+    bool release_current() const;
+
+    EGLContext context() { return egl_context; }
+    EGLDisplay display() { return egl_display; }
+    EGLConfig config() { return egl_config; }
+
+    void report_egl_configuration(std::function<void(EGLDisplay, EGLConfig)>);
+private:
+    void setup_internal(::Display* const x_dpy, bool initialize);
+
+    EGLint const depth_buffer_bits;
+    EGLint const stencil_buffer_bits;
+    EGLDisplay egl_display;
+    EGLConfig egl_config;
+    EGLContext egl_context;
+    EGLSurface egl_surface;
+    bool should_terminate_egl;
+};
+
+}
+}
+}
+}
+#endif /* MIR_GRAPHICS_X11_EGL_HELPER_H_ */

=== removed file 'src/platforms/mesa/server/x11/graphics/gl_context.cpp'
--- src/platforms/mesa/server/x11/graphics/gl_context.cpp	2016-01-29 08:18:22 +0000
+++ src/platforms/mesa/server/x11/graphics/gl_context.cpp	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright © 2015 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 warranty of
- * MERCHANTABILITY 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/>.
- *
- * Authored by: Cemil Azizoglu <[e-mail]>
- *
- */
-
-#include "mir/graphics/egl_error.h"
-#include "gl_context.h"
-#include <boost/throw_exception.hpp>
-#include <stdexcept>
-
-namespace mg=mir::graphics;
-namespace mgx=mg::X;
-
-mgx::XGLContext::XGLContext(EGLDisplay const d, EGLSurface const s, EGLContext const c)
-    : egl_dpy{d},
-      egl_surf{s},
-      egl_ctx{c}
-{
-}
-
-void mgx::XGLContext::make_current() const
-{
-    if (!eglMakeCurrent(egl_dpy, egl_surf, egl_surf, egl_ctx))
-        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot make current"));
-}
-
-void mgx::XGLContext::release_current() const
-{
-    if (!eglMakeCurrent(egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT))
-        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot make uncurrent"));
-}

=== removed file 'src/platforms/mesa/server/x11/graphics/gl_context.h'
--- src/platforms/mesa/server/x11/graphics/gl_context.h	2016-07-28 09:10:43 +0000
+++ src/platforms/mesa/server/x11/graphics/gl_context.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright © 2015 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 warranty of
- * MERCHANTABILITY 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/>.
- *
- * Authored by: Cemil Azizoglu <[e-mail]>
- *
- */
-
-#ifndef MIR_GRAPHICS_X_GL_CONTEXT_H_
-#define MIR_GRAPHICS_X_GL_CONTEXT_H_
-
-#include "mir/renderer/gl/context.h"
-
-#include <EGL/egl.h>
-
-namespace mir
-{
-namespace graphics
-{
-namespace X
-{
-
-class XGLContext : public renderer::gl::Context
-{
-public:
-    XGLContext(EGLDisplay const d, EGLSurface const s, EGLContext const c);
-    ~XGLContext() = default;
-    void make_current() const override;
-    void release_current() const override;
-
-private:
-    EGLDisplay const egl_dpy;
-    EGLSurface const egl_surf;
-    EGLContext const egl_ctx;
-};
-
-}
-}
-}
-
-#endif /* MIR_GRAPHICS_X_GL_CONTEXT_H_ */

=== modified file 'src/platforms/mesa/server/x11/graphics/platform.cpp'
--- src/platforms/mesa/server/x11/graphics/platform.cpp	2016-09-07 03:37:03 +0000
+++ src/platforms/mesa/server/x11/graphics/platform.cpp	2016-09-26 01:54:42 +0000
@@ -51,7 +51,7 @@
     std::shared_ptr<DisplayConfigurationPolicy> const& /*initial_conf_policy*/,
     std::shared_ptr<GLConfig> const& gl_config)
 {
-    return make_module_ptr<mgx::Display>(x11_connection.get(), size, *gl_config,
+    return make_module_ptr<mgx::Display>(x11_connection.get(), size, gl_config,
                                          report);
 }
 

=== modified file 'tests/unit-tests/graphics/test_platform_prober.cpp'
--- tests/unit-tests/graphics/test_platform_prober.cpp	2016-06-23 17:53:10 +0000
+++ tests/unit-tests/graphics/test_platform_prober.cpp	2016-09-26 01:54:42 +0000
@@ -25,8 +25,10 @@
 #include "mir/raii.h"
 
 #include "mir/test/doubles/mock_egl.h"
-#ifdef MIR_BUILD_PLATFORM_MESA_KMS
+#if defined(MIR_BUILD_PLATFORM_MESA_KMS) || defined(MIR_BUILD_PLATFORM_MESA_X11)
 #include "mir/test/doubles/mock_drm.h"
+#endif
+#ifdef MIR_BUILD_PLATFORM_MESA_KMS
 #include "mir/test/doubles/mock_gbm.h"
 #endif
 

=== modified file 'tests/unit-tests/platforms/mesa/x11/test_display.cpp'
--- tests/unit-tests/platforms/mesa/x11/test_display.cpp	2016-09-07 04:45:58 +0000
+++ tests/unit-tests/platforms/mesa/x11/test_display.cpp	2016-09-26 01:54:42 +0000
@@ -27,11 +27,13 @@
 #include "mir/test/doubles/mock_egl.h"
 #include "mir/test/doubles/mock_x11.h"
 #include "mir/test/doubles/mock_gl_config.h"
+#include "mir/test/fake_shared.h"
 
 
 namespace mg=mir::graphics;
 namespace mgx=mg::X;
-namespace mtd=mir::test::doubles;
+namespace mt=mir::test;
+namespace mtd=mt::doubles;
 namespace geom=mir::geometry;
 using namespace testing;
 
@@ -97,7 +99,7 @@
         return std::make_shared<mgx::Display>(
                    mock_x11.fake_x11.display,
                    size,
-                   mock_gl_config,
+                   mt::fake_shared(mock_gl_config),
                    std::make_shared<mir::report::null::DisplayReport>());
     }
 
@@ -112,18 +114,9 @@
 {
     using namespace testing;
 
-    EXPECT_CALL(mock_egl, eglGetDisplay(mock_x11.fake_x11.display))
-        .Times(Exactly(1));
-
     EXPECT_CALL(mock_x11, XCreateWindow_wrapper(mock_x11.fake_x11.display,_, size.width.as_int(), size.height.as_int(),_,_,_,_,_,_))
         .Times(Exactly(1));
 
-    EXPECT_CALL(mock_egl, eglCreateContext(mock_egl.fake_egl_display,_, EGL_NO_CONTEXT,_))
-        .Times(Exactly(1));
-
-    EXPECT_CALL(mock_egl, eglCreateWindowSurface(mock_egl.fake_egl_display,_, reinterpret_cast<mtd::MockEGL::AnyNativeType>(mock_x11.fake_x11.window), nullptr))
-        .Times(Exactly(1));
-
     EXPECT_CALL(mock_x11, XNextEvent(mock_x11.fake_x11.display,_))
         .Times(AtLeast(1));