Merge lp:~kdub/mir/egl-connection-for-offscreen into lp:mir

[Kevin DuBois]

Adding back offscreen needed to add back a function in mg::Platform by which the EGLNativeDisplayType was returned from the server platform to make a surfaceless EGLContext. The code from the revert needed an update to use the more modern 'gl-agnostic' approach for providing access to egl.

Adding back offscreen needed to add back a function in mg::Platform by which the EGLNativeDisplayType was returned from the server platform to make a surfaceless EGLContext. The code from the revert needed an update to use the more modern 'gl-agnostic' approach for providing access to egl.

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

PASSED: Continuous integration, rev:4091
https://mir-jenkins.ubuntu.com/job/mir-ci/3137/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4211
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4298
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4288
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4288
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4288
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4238
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4238/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/4238
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4238/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4238
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4238/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4238
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4238/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/4238
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4238/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/4238
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4238/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

I think the name NativeRenderAccess used to access native platform functionality is too tied to our current use case. If we need to add non-rendering native functionality to platform, accessing it through NativeRenderAccess would be unintuitive, so I would vote for a more generic name (e.g., NativePlatform) like we have done for Display and Buffer.

Looks good otherwise.

Needs discussion.

review: Needs Information

[Kevin DuBois (kdub)]

I'm alright with NativePlatform, will change

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

PASSED: Continuous integration, rev:4092
https://mir-jenkins.ubuntu.com/job/mir-ci/3139/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4213
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4300
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4290
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4290
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4290
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4240
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4240/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/4240
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4240/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4240
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4240/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4240
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4240/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/4240
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4240/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/4240
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4240/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

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/1191/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4239/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1257/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4326
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4266
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4266/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/4266
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4266/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4266/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4266
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4266/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/4266
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4266/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/4266
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4266/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Ok lgtm.

review: Approve

[Daniel van Vugt (vanvugt)]

17:07:37 ../../../../../../../src/platforms/mesa/server/x11/graphics/guest_platform.h:49:26: error: ���egl_native_display��� violates the C++ One Definition Rule [-Werror=odr]
17:07:37 ../../../../../../../src/platforms/mesa/server/x11/graphics/guest_platform.cpp:67:22: note: ���egl_native_display��� was previously declared here
17:07:37 lto1: all warnings being treated as errors

[Daniel van Vugt (vanvugt)]

(1) Build failure per above.

(2) "EGLAccess" feels like a poor choice of words. Looking at where it is used (https://www.khronos.org/registry/EGL/sdk/docs/man/html/eglGetDisplay.xhtml), I would say the object from which you get egl_native_display() is an EGL platform, so suggest "EGLPlatform" instead of "EGLAccess".

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

(3) Why is it necessary to change the current architecture here? AFAIK you're aiming to solve bug 1118903 which should be just one new graphics driver...?

[Kevin DuBois (kdub)]

renamed.
the goal in this MP is more to clean up the way the offscreen platform creates a SurfacelessEGLContext. Fixing 118903 is the software rendering line of work, this is more in the offscreen rendering line of work. (we've been asked for both)

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

FAILED: Continuous integration, rev:4095
https://mir-jenkins.ubuntu.com/job/mir-ci/3170/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

The fix for the ODR violation was abit more involved. EGL was included in display_helpers.h, shared by kms/ and x11/. Because display_helpers.h also had gbm helpers in there, __GBM__ was set, which would set the eglplatform.h to be the gbm platform wherever display_helpers.h was included. The correct fix is to move mgmh::EGLHelper into kms/ so that x11 can set its own platform types, while still using display_helpers.h

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

PASSED: Continuous integration, rev:4096
https://mir-jenkins.ubuntu.com/job/mir-ci/3171/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4256
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4343
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4333
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4333
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4333
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4283
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4283/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/4283
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4283/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4283
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4283/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4283
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4283/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/4283
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4283/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/4283
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4283/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

native_platform() sounds like maybe a const method, but worry about that later.

review: Approve

=== modified file 'include/platform/mir/graphics/platform.h'
--- include/platform/mir/graphics/platform.h	2017-03-09 12:52:48 +0000
+++ include/platform/mir/graphics/platform.h	2017-03-15 13:54:31 +0000
@@ -21,7 +21,6 @@
 #define MIR_GRAPHICS_PLATFORM_H_
 
 #include <boost/program_options/options_description.hpp>
-#include <EGL/egl.h>
 
 #include "mir/module_properties.h"
 #include "mir/module_deleter.h"
@@ -54,6 +53,14 @@
 class GLConfig;
 class PlatformIpcOperations;
 class NestedContext;
+class NativePlatform
+{
+protected:
+    NativePlatform() = default;
+    virtual ~NativePlatform() = default;
+    NativePlatform(NativePlatform const&) = delete;
+    NativePlatform& operator=(NativePlatform const&) = delete;
+};
 
 /**
  * \defgroup platform_enablement Mir platform enablement
@@ -92,7 +99,11 @@
      */
     virtual UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const = 0;
 
-    virtual EGLNativeDisplayType egl_native_display() const = 0;
+    /**
+     * Access the native resource[s] used to connect to the rendering backend
+     * for this platform
+     */
+    virtual NativePlatform* native_platform() = 0;
 };
 
 /**

=== added file 'include/renderers/gl/mir/renderer/gl/egl_platform.h'
--- include/renderers/gl/mir/renderer/gl/egl_platform.h	1970-01-01 00:00:00 +0000
+++ include/renderers/gl/mir/renderer/gl/egl_platform.h	2017-03-15 13:54:31 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 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 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: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_RENDERER_GL_EGL_PLATFORM_H_
+#define MIR_RENDERER_GL_EGL_PLATFORM_H_
+
+#include <EGL/egl.h>
+
+namespace mir
+{
+namespace renderer
+{
+namespace gl
+{
+
+class EGLPlatform
+{
+public:
+    virtual ~EGLPlatform() = default;
+    virtual EGLNativeDisplayType egl_native_display() const = 0;
+
+protected:
+    EGLPlatform() = default;
+    EGLPlatform(EGLPlatform const&) = delete;
+    EGLPlatform& operator=(EGLPlatform const&) = delete;
+};
+
+}
+}
+}
+
+#endif /* MIR_RENDERER_GL_EGL_PLATFORM_H_ */

=== modified file 'include/test/mir/test/doubles/null_platform.h'
--- include/test/mir/test/doubles/null_platform.h	2017-03-09 12:52:48 +0000
+++ include/test/mir/test/doubles/null_platform.h	2017-03-15 13:54:31 +0000
@@ -51,9 +51,9 @@
         return mir::make_module_ptr<NullPlatformIpcOperations>();
     }
 
-    EGLNativeDisplayType egl_native_display() const override
+    graphics::NativePlatform* native_platform() override
     {
-        return EGLNativeDisplayType();
+        return nullptr;
     }
 };
 }

=== modified file 'src/platforms/android/server/platform.cpp'
--- src/platforms/android/server/platform.cpp	2017-03-14 05:30:56 +0000
+++ src/platforms/android/server/platform.cpp	2017-03-15 13:54:31 +0000
@@ -162,6 +162,11 @@
     return mir::make_module_ptr<mga::IpcOperations>();
 }
 
+mg::NativePlatform* mga::Platform::native_platform()
+{
+    return this;
+}
+
 EGLNativeDisplayType mga::Platform::egl_native_display() const
 {
     return EGL_DEFAULT_DISPLAY;

=== modified file 'src/platforms/android/server/platform.h'
--- src/platforms/android/server/platform.h	2017-03-09 12:52:48 +0000
+++ src/platforms/android/server/platform.h	2017-03-15 13:54:31 +0000
@@ -22,6 +22,8 @@
 #include "mir/graphics/platform.h"
 #include "device_quirks.h"
 #include "overlay_optimization.h"
+#include "mir/graphics/display.h"
+#include "mir/renderer/gl/egl_platform.h"
 
 namespace mir
 {
@@ -36,7 +38,9 @@
 class CommandStreamSyncFactory;
 class NativeWindowReport;
 
-class Platform : public graphics::Platform
+class Platform : public graphics::Platform,
+                 public graphics::NativePlatform,
+                 public mir::renderer::gl::EGLPlatform
 {
 public:
     Platform(
@@ -53,6 +57,7 @@
         std::shared_ptr<graphics::DisplayConfigurationPolicy> const&,
         std::shared_ptr<graphics::GLConfig> const& /*gl_config*/) override;
     UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
+    NativePlatform* native_platform() override;
     EGLNativeDisplayType egl_native_display() const override;
 
 private:

=== modified file 'src/platforms/eglstream-kms/server/platform.cpp'
--- src/platforms/eglstream-kms/server/platform.cpp	2017-03-09 12:52:48 +0000
+++ src/platforms/eglstream-kms/server/platform.cpp	2017-03-15 13:54:31 +0000
@@ -161,6 +161,11 @@
     return mir::make_module_ptr<NoIPCOperations>();
 }
 
+mg::NativePlatform* mge::Platform::native_platform()
+{
+    return this;
+}
+
 EGLNativeDisplayType mge::Platform::egl_native_display() const
 {
     return display;

=== modified file 'src/platforms/eglstream-kms/server/platform.h'
--- src/platforms/eglstream-kms/server/platform.h	2017-03-09 12:52:48 +0000
+++ src/platforms/eglstream-kms/server/platform.h	2017-03-15 13:54:31 +0000
@@ -25,6 +25,7 @@
 #include "mir/graphics/display.h"
 #include "mir/graphics/platform_ipc_operations.h"
 #include "mir/fd.h"
+#include "mir/renderer/gl/egl_platform.h"
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -35,7 +36,9 @@
 {
 namespace eglstream
 {
-class Platform : public mir::graphics::Platform
+class Platform : public graphics::Platform,
+                 public graphics::NativePlatform,
+                 public mir::renderer::gl::EGLPlatform
 {
 public:
     Platform(
@@ -52,6 +55,7 @@
 
     UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
 
+    NativePlatform* native_platform() override;
     EGLNativeDisplayType egl_native_display() const override;
 
 private:

=== modified file 'src/platforms/mesa/server/display_helpers.cpp'
--- src/platforms/mesa/server/display_helpers.cpp	2017-03-13 08:12:52 +0000
+++ src/platforms/mesa/server/display_helpers.cpp	2017-03-15 13:54:31 +0000
@@ -21,8 +21,6 @@
 
 #include "kms-utils/drm_mode_resources.h"
 
-#include "mir/graphics/gl_config.h"
-#include "mir/graphics/egl_error.h"
 #include "mir/udev/wrapper.h"
 
 #include <boost/exception/errinfo_errno.hpp>
@@ -307,189 +305,3 @@
     if (device)
         gbm_device_destroy(device);
 }
-
-/*************
- * EGLHelper *
- *************/
-
-mgmh::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}
-{
-}
-
-mgmh::EGLHelper::EGLHelper(
-    GLConfig const& gl_config,
-    GBMHelper const& gbm,
-    gbm_surface* surface,
-    EGLContext shared_context)
-    : EGLHelper(gl_config)
-{
-    setup(gbm, surface, shared_context);
-}
-
-mgmh::EGLHelper::EGLHelper(EGLHelper&& from)
-    : depth_buffer_bits{from.depth_buffer_bits},
-      stencil_buffer_bits{from.stencil_buffer_bits},
-      egl_display{from.egl_display},
-      egl_config{from.egl_config},
-      egl_context{from.egl_context},
-      egl_surface{from.egl_surface},
-      should_terminate_egl{from.should_terminate_egl}
-{
-    from.should_terminate_egl = false;
-    from.egl_display = EGL_NO_DISPLAY;
-    from.egl_context = EGL_NO_CONTEXT;
-    from.egl_surface = EGL_NO_SURFACE;
-}
-
-void mgmh::EGLHelper::setup(GBMHelper const& gbm)
-{
-    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(gbm, 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 mgmh::EGLHelper::setup(GBMHelper const& gbm, 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(gbm, 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 mgmh::EGLHelper::setup(GBMHelper const& gbm, gbm_surface* surface_gbm,
-                            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(gbm, false);
-
-    egl_surface = eglCreateWindowSurface(egl_display, egl_config, surface_gbm, 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"));
-}
-
-mgmh::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 mgmh::EGLHelper::swap_buffers()
-{
-    auto ret = eglSwapBuffers(egl_display, egl_surface);
-    return (ret == EGL_TRUE);
-}
-
-bool mgmh::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 mgmh::EGLHelper::release_current() const
-{
-    auto ret = eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-    return (ret == EGL_TRUE);
-}
-
-void mgmh::EGLHelper::setup_internal(GBMHelper const& gbm, bool initialize)
-{
-    EGLint const config_attr[] = {
-        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-        EGL_RED_SIZE, 5,
-        EGL_GREEN_SIZE, 5,
-        EGL_BLUE_SIZE, 5,
-        EGL_ALPHA_SIZE, 0,
-        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>(gbm.device));
-    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) ||
-            (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 mgmh::EGLHelper::report_egl_configuration(std::function<void(EGLDisplay, EGLConfig)> f)
-{
-    f(egl_display, egl_config);
-}

=== modified file 'src/platforms/mesa/server/display_helpers.h'
--- src/platforms/mesa/server/display_helpers.h	2017-03-13 08:12:52 +0000
+++ src/platforms/mesa/server/display_helpers.h	2017-03-15 13:54:31 +0000
@@ -30,15 +30,12 @@
 #include <gbm.h>
 #pragma GCC diagnostic pop
 
-#include <EGL/egl.h>
 #include <xf86drmMode.h>
 
 namespace mir
 {
 namespace graphics
 {
-class GLConfig;
-
 namespace mesa
 {
 
@@ -98,45 +95,6 @@
     gbm_device* device;
 };
 
-class EGLHelper
-{
-public:
-    EGLHelper(GLConfig const& gl_config);
-    EGLHelper(
-        GLConfig const& gl_config,
-        GBMHelper const& gbm,
-        gbm_surface* surface,
-        EGLContext shared_context);
-    ~EGLHelper() noexcept;
-    EGLHelper(EGLHelper&& from);
-
-    EGLHelper(const EGLHelper&) = delete;
-    EGLHelper& operator=(const EGLHelper&) = delete;
-
-    void setup(GBMHelper const& gbm);
-    void setup(GBMHelper const& gbm, EGLContext shared_context);
-    void setup(GBMHelper const& gbm, gbm_surface* surface_gbm,
-               EGLContext shared_context);
-
-    bool swap_buffers();
-    bool make_current() const;
-    bool release_current() const;
-
-    EGLContext context() { return egl_context; }
-
-    void report_egl_configuration(std::function<void(EGLDisplay, EGLConfig)>);
-private:
-    void setup_internal(GBMHelper const& gbm, 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;
-};
-
 }
 }
 }

=== modified file 'src/platforms/mesa/server/kms/CMakeLists.txt'
--- src/platforms/mesa/server/kms/CMakeLists.txt	2017-03-13 08:12:52 +0000
+++ src/platforms/mesa/server/kms/CMakeLists.txt	2017-03-15 13:54:31 +0000
@@ -41,6 +41,8 @@
   real_kms_output.cpp
   kms_output_container.h
   real_kms_output_container.cpp
+  egl_helper.h
+  egl_helper.cpp
 )
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/symbols.map.in

=== modified file 'src/platforms/mesa/server/kms/display.h'
--- src/platforms/mesa/server/kms/display.h	2017-02-15 07:38:33 +0000
+++ src/platforms/mesa/server/kms/display.h	2017-03-15 13:54:31 +0000
@@ -24,6 +24,7 @@
 #include "real_kms_output_container.h"
 #include "real_kms_display_configuration.h"
 #include "display_helpers.h"
+#include "egl_helper.h"
 #include "platform_common.h"
 
 #include <atomic>

=== modified file 'src/platforms/mesa/server/kms/display_buffer.h'
--- src/platforms/mesa/server/kms/display_buffer.h	2017-03-13 08:12:52 +0000
+++ src/platforms/mesa/server/kms/display_buffer.h	2017-03-15 13:54:31 +0000
@@ -23,6 +23,7 @@
 #include "mir/graphics/display.h"
 #include "mir/renderer/gl/render_target.h"
 #include "display_helpers.h"
+#include "egl_helper.h"
 #include "platform_common.h"
 
 #include <vector>

=== added file 'src/platforms/mesa/server/kms/egl_helper.cpp'
--- src/platforms/mesa/server/kms/egl_helper.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/kms/egl_helper.cpp	2017-03-15 13:54:31 +0000
@@ -0,0 +1,209 @@
+/*
+ * Copyright © 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 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: Kevin DuBois <[e-mail]>
+ */
+
+#include "egl_helper.h"
+#include "mir/graphics/gl_config.h"
+#include "mir/graphics/egl_error.h"
+#include <boost/exception/errinfo_errno.hpp>
+#include <boost/throw_exception.hpp>
+
+namespace mg = mir::graphics;
+namespace mgm = mir::graphics::mesa;
+namespace mgmh = mir::graphics::mesa::helpers;
+
+mgmh::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}
+{
+}
+
+mgmh::EGLHelper::EGLHelper(
+    GLConfig const& gl_config,
+    GBMHelper const& gbm,
+    gbm_surface* surface,
+    EGLContext shared_context)
+    : EGLHelper(gl_config)
+{
+    setup(gbm, surface, shared_context);
+}
+
+mgmh::EGLHelper::EGLHelper(EGLHelper&& from)
+    : depth_buffer_bits{from.depth_buffer_bits},
+      stencil_buffer_bits{from.stencil_buffer_bits},
+      egl_display{from.egl_display},
+      egl_config{from.egl_config},
+      egl_context{from.egl_context},
+      egl_surface{from.egl_surface},
+      should_terminate_egl{from.should_terminate_egl}
+{
+    from.should_terminate_egl = false;
+    from.egl_display = EGL_NO_DISPLAY;
+    from.egl_context = EGL_NO_CONTEXT;
+    from.egl_surface = EGL_NO_SURFACE;
+}
+
+void mgmh::EGLHelper::setup(GBMHelper const& gbm)
+{
+    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(gbm, 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 mgmh::EGLHelper::setup(GBMHelper const& gbm, 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(gbm, 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 mgmh::EGLHelper::setup(GBMHelper const& gbm, gbm_surface* surface_gbm,
+                            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(gbm, false);
+
+    egl_surface = eglCreateWindowSurface(egl_display, egl_config, surface_gbm, 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"));
+}
+
+mgmh::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 mgmh::EGLHelper::swap_buffers()
+{
+    auto ret = eglSwapBuffers(egl_display, egl_surface);
+    return (ret == EGL_TRUE);
+}
+
+bool mgmh::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 mgmh::EGLHelper::release_current() const
+{
+    auto ret = eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    return (ret == EGL_TRUE);
+}
+
+void mgmh::EGLHelper::setup_internal(GBMHelper const& gbm, bool initialize)
+{
+    EGLint const config_attr[] = {
+        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+        EGL_RED_SIZE, 5,
+        EGL_GREEN_SIZE, 5,
+        EGL_BLUE_SIZE, 5,
+        EGL_ALPHA_SIZE, 0,
+        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>(gbm.device));
+    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) ||
+            (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 mgmh::EGLHelper::report_egl_configuration(std::function<void(EGLDisplay, EGLConfig)> f)
+{
+    f(egl_display, egl_config);
+}

=== added file 'src/platforms/mesa/server/kms/egl_helper.h'
--- src/platforms/mesa/server/kms/egl_helper.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/server/kms/egl_helper.h	2017-03-15 13:54:31 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 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 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: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_MESA_EGL_HELPER_H_
+#define MIR_GRAPHICS_MESA_EGL_HELPER_H_
+
+#include "display_helpers.h"
+#include <EGL/egl.h>
+
+namespace mir
+{
+namespace graphics
+{
+class GLConfig;
+namespace mesa
+{
+namespace helpers
+{
+class EGLHelper
+{
+public:
+    EGLHelper(GLConfig const& gl_config);
+    EGLHelper(
+        GLConfig const& gl_config,
+        GBMHelper const& gbm,
+        gbm_surface* surface,
+        EGLContext shared_context);
+    ~EGLHelper() noexcept;
+    EGLHelper(EGLHelper&& from);
+
+    EGLHelper(const EGLHelper&) = delete;
+    EGLHelper& operator=(const EGLHelper&) = delete;
+
+    void setup(GBMHelper const& gbm);
+    void setup(GBMHelper const& gbm, EGLContext shared_context);
+    void setup(GBMHelper const& gbm, gbm_surface* surface_gbm,
+               EGLContext shared_context);
+
+    bool swap_buffers();
+    bool make_current() const;
+    bool release_current() const;
+
+    EGLContext context() { return egl_context; }
+
+    void report_egl_configuration(std::function<void(EGLDisplay, EGLConfig)>);
+private:
+    void setup_internal(GBMHelper const& gbm, 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_MESA_EGL_HELPER_H_ */

=== modified file 'src/platforms/mesa/server/kms/guest_platform.cpp'
--- src/platforms/mesa/server/kms/guest_platform.cpp	2017-03-09 12:52:48 +0000
+++ src/platforms/mesa/server/kms/guest_platform.cpp	2017-03-15 13:54:31 +0000
@@ -83,6 +83,11 @@
     BOOST_THROW_EXCEPTION(std::runtime_error("mgm::GuestPlatform cannot create display\n"));
 }
 
+mg::NativePlatform* mgm::GuestPlatform::native_platform()
+{
+    return this;
+}
+
 EGLNativeDisplayType mgm::GuestPlatform::egl_native_display() const
 {
     return gbm.device;

=== modified file 'src/platforms/mesa/server/kms/guest_platform.h'
--- src/platforms/mesa/server/kms/guest_platform.h	2017-03-09 12:52:48 +0000
+++ src/platforms/mesa/server/kms/guest_platform.h	2017-03-15 13:54:31 +0000
@@ -23,6 +23,7 @@
 
 #include "mir/graphics/platform.h"
 #include "mir/graphics/platform_ipc_package.h"
+#include "mir/renderer/gl/egl_platform.h"
 #include "display_helpers.h"
 
 namespace mir
@@ -33,7 +34,9 @@
 {
 class InternalNativeDisplay; 
 
-class GuestPlatform : public graphics::Platform
+class GuestPlatform : public graphics::Platform,
+                      public graphics::NativePlatform,
+                      public mir::renderer::gl::EGLPlatform
 {
 public:
     GuestPlatform(std::shared_ptr<NestedContext> const& nested_context_arg);
@@ -44,6 +47,8 @@
     UniqueModulePtr<Display> create_display(
         std::shared_ptr<graphics::DisplayConfigurationPolicy> const&,
         std::shared_ptr<graphics::GLConfig> const& /*gl_config*/) override;
+
+    NativePlatform* native_platform() override;
     EGLNativeDisplayType egl_native_display() const override;
 
 private:

=== modified file 'src/platforms/mesa/server/kms/platform.cpp'
--- src/platforms/mesa/server/kms/platform.cpp	2017-03-09 12:52:48 +0000
+++ src/platforms/mesa/server/kms/platform.cpp	2017-03-15 13:54:31 +0000
@@ -79,6 +79,11 @@
     return make_module_ptr<mgm::IpcOperations>(drm);
 }
 
+mg::NativePlatform* mgm::Platform::native_platform()
+{
+    return this;
+}
+
 EGLNativeDisplayType mgm::Platform::egl_native_display() const
 {
     return gbm->device;

=== modified file 'src/platforms/mesa/server/kms/platform.h'
--- src/platforms/mesa/server/kms/platform.h	2017-03-09 12:52:48 +0000
+++ src/platforms/mesa/server/kms/platform.h	2017-03-15 13:54:31 +0000
@@ -20,6 +20,7 @@
 #define MIR_GRAPHICS_MESA_PLATFORM_H_
 
 #include "mir/graphics/platform.h"
+#include "mir/renderer/gl/egl_platform.h"
 #include "platform_common.h"
 #include "display_helpers.h"
 
@@ -33,7 +34,9 @@
 
 class VirtualTerminal;
 class InternalNativeDisplay;
-class Platform : public graphics::Platform
+class Platform : public graphics::Platform,
+                 public graphics::NativePlatform,
+                 public mir::renderer::gl::EGLPlatform
 {
 public:
     explicit Platform(std::shared_ptr<DisplayReport> const& reporter,
@@ -49,6 +52,7 @@
 
     UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
 
+    NativePlatform* native_platform() override;
     EGLNativeDisplayType egl_native_display() const override;
 
     std::shared_ptr<mir::udev::Context> udev;

=== modified file 'src/platforms/mesa/server/x11/graphics/guest_platform.cpp'
--- src/platforms/mesa/server/x11/graphics/guest_platform.cpp	2017-03-09 12:52:48 +0000
+++ src/platforms/mesa/server/x11/graphics/guest_platform.cpp	2017-03-15 13:54:31 +0000
@@ -59,6 +59,11 @@
     BOOST_THROW_EXCEPTION(std::runtime_error("Guest platform cannot create display\n"));
 }
 
+mg::NativePlatform* mgx::GuestPlatform::native_platform()
+{
+    return this;
+}
+
 EGLNativeDisplayType mgx::GuestPlatform::egl_native_display() const
 {
     return gbm.device;

=== modified file 'src/platforms/mesa/server/x11/graphics/guest_platform.h'
--- src/platforms/mesa/server/x11/graphics/guest_platform.h	2017-03-09 12:52:48 +0000
+++ src/platforms/mesa/server/x11/graphics/guest_platform.h	2017-03-15 13:54:31 +0000
@@ -22,6 +22,8 @@
 
 #include "mir/graphics/platform.h"
 #include "display_helpers.h"
+#undef __GBM__ //display_helpers.h sets __GBM__ platform, here need X11 egl platform defs, and gbm utilities
+#include "mir/renderer/gl/egl_platform.h"
 
 namespace mir
 {
@@ -30,7 +32,9 @@
 namespace X
 {
 
-class GuestPlatform : public graphics::Platform
+class GuestPlatform : public graphics::Platform,
+                      public graphics::NativePlatform,
+                      public mir::renderer::gl::EGLPlatform
 {
 public:
     GuestPlatform(std::shared_ptr<NestedContext> const& /*nested_context*/);
@@ -41,6 +45,8 @@
     UniqueModulePtr<Display> create_display(
         std::shared_ptr<graphics::DisplayConfigurationPolicy> const&,
         std::shared_ptr<graphics::GLConfig> const&) override;
+
+    NativePlatform* native_platform() override;
     EGLNativeDisplayType egl_native_display() const override;
 
 private:

=== modified file 'src/platforms/mesa/server/x11/graphics/platform.cpp'
--- src/platforms/mesa/server/x11/graphics/platform.cpp	2017-03-09 12:52:48 +0000
+++ src/platforms/mesa/server/x11/graphics/platform.cpp	2017-03-15 13:54:31 +0000
@@ -60,6 +60,11 @@
     return make_module_ptr<mg::mesa::IpcOperations>(drm);
 }
 
+mg::NativePlatform* mgx::Platform::native_platform()
+{
+    return this;
+}
+
 EGLNativeDisplayType mgx::Platform::egl_native_display() const
 {
     return eglGetDisplay(x11_connection.get());

=== modified file 'src/platforms/mesa/server/x11/graphics/platform.h'
--- src/platforms/mesa/server/x11/graphics/platform.h	2017-03-09 12:52:48 +0000
+++ src/platforms/mesa/server/x11/graphics/platform.h	2017-03-15 13:54:31 +0000
@@ -23,6 +23,7 @@
 #include "mir/graphics/platform.h"
 #include "display_helpers.h"
 #include "mir/geometry/size.h"
+#include "mir/renderer/gl/egl_platform.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -34,7 +35,9 @@
 namespace X
 {
 
-class Platform : public graphics::Platform
+class Platform : public graphics::Platform,
+                 public graphics::NativePlatform,
+                 public mir::renderer::gl::EGLPlatform
 {
 public:
     explicit Platform(std::shared_ptr<::Display> const& conn,
@@ -51,6 +54,7 @@
 
     UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
 
+    NativePlatform* native_platform() override;
     EGLNativeDisplayType egl_native_display() const override;
 private:
     std::shared_ptr<::Display> const x11_connection;

=== modified file 'src/server/graphics/default_configuration.cpp'
--- src/server/graphics/default_configuration.cpp	2017-03-09 13:00:13 +0000
+++ src/server/graphics/default_configuration.cpp	2017-03-15 13:54:31 +0000
@@ -153,10 +153,20 @@
         {
             if (the_options()->is_set(options::offscreen_opt))
             {
-                return std::make_shared<mg::offscreen::Display>(
-                    the_graphics_platform()->egl_native_display(),
-                    the_display_configuration_policy(),
-                    the_display_report());
+                if (auto egl_access = dynamic_cast<mir::renderer::gl::EGLPlatform*>(
+                    the_graphics_platform()->native_platform()))
+                {
+                    return std::make_shared<mg::offscreen::Display>(
+                        egl_access->egl_native_display(),
+                        the_display_configuration_policy(),
+                        the_display_report());
+                }
+                else
+                {
+                    BOOST_THROW_EXCEPTION(std::runtime_error(
+                        "underlying rendering platform does not support EGL access."\
+                        " Could not create offscreen display"));
+                }
             }
 
             return the_graphics_platform()->create_display(

=== modified file 'src/server/graphics/nested/platform.cpp'
--- src/server/graphics/nested/platform.cpp	2017-03-14 05:30:56 +0000
+++ src/server/graphics/nested/platform.cpp	2017-03-15 13:54:31 +0000
@@ -31,6 +31,7 @@
 #include "mir/graphics/buffer_ipc_message.h"
 #include "mir/graphics/platform_ipc_operations.h"
 #include "mir/graphics/platform_operation_message.h"
+#include "mir/renderer/gl/egl_platform.h"
 
 namespace mg = mir::graphics;
 namespace mgn = mir::graphics::nested;
@@ -144,5 +145,12 @@
 
 EGLNativeDisplayType mgn::Platform::egl_native_display() const
 {
-    return guest_platform->egl_native_display();
+    if (auto a = dynamic_cast<mir::renderer::gl::EGLPlatform*>(guest_platform->native_platform()))
+        return a->egl_native_display();
+    return EGL_NO_DISPLAY;
+}
+
+mg::NativePlatform* mgn::Platform::native_platform()
+{
+    return this;
 }

=== modified file 'src/server/graphics/nested/platform.h'
--- src/server/graphics/nested/platform.h	2017-03-09 13:00:13 +0000
+++ src/server/graphics/nested/platform.h	2017-03-15 13:54:31 +0000
@@ -20,6 +20,7 @@
 #define MIR_GRAPHICS_NESTED_PLATFORM_H_
 
 #include "mir/graphics/platform.h"
+#include "mir/renderer/gl/egl_platform.h"
 #include "passthrough_option.h"
 #include <memory>
 
@@ -35,7 +36,9 @@
 namespace nested
 {
 class HostConnection;
-class Platform : public graphics::Platform
+class Platform : public graphics::Platform,
+                 public graphics::NativePlatform,
+                 public mir::renderer::gl::EGLPlatform
 {
 public:
     Platform(
@@ -49,6 +52,7 @@
         std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
         std::shared_ptr<GLConfig> const& gl_config) override;
     UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
+    NativePlatform* native_platform() override;
     EGLNativeDisplayType egl_native_display() const override;
 private:
     std::shared_ptr<mir::SharedLibrary> const library; 

=== modified file 'tests/integration-tests/graphics/mesa/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/mesa/test_buffer_integration.cpp	2017-03-09 12:52:48 +0000
+++ tests/integration-tests/graphics/mesa/test_buffer_integration.cpp	2017-03-15 13:54:31 +0000
@@ -33,6 +33,7 @@
 
 #include "mir_test_framework/testing_server_configuration.h"
 
+#include <EGL/egl.h>
 #include <thread>
 #include <gtest/gtest.h>
 #include <stdexcept>

=== modified file 'tests/integration-tests/test_submit_buffer.cpp'
--- tests/integration-tests/test_submit_buffer.cpp	2017-03-14 05:30:56 +0000
+++ tests/integration-tests/test_submit_buffer.cpp	2017-03-15 13:54:31 +0000
@@ -233,7 +233,7 @@
         return underlying_platform->create_display(policy, config);
     }
 
-    EGLNativeDisplayType egl_native_display() const override { return EGL_DEFAULT_DISPLAY; }
+    mg::NativePlatform* native_platform() override { return nullptr; }
 
     std::shared_ptr<mir::Fd> const last_fd;
     std::shared_ptr<mg::Platform> const underlying_platform;

=== modified file 'tests/mir_test_framework/platform_graphics_throw.cpp'
--- tests/mir_test_framework/platform_graphics_throw.cpp	2017-03-09 12:52:48 +0000
+++ tests/mir_test_framework/platform_graphics_throw.cpp	2017-03-15 13:54:31 +0000
@@ -84,12 +84,12 @@
         return stub_platform->make_ipc_operations();
     }
 
-    EGLNativeDisplayType egl_native_display() const override
+    mg::NativePlatform* native_platform() override
     {
         if (should_throw.at(ExceptionLocation::at_egl_native_display))
             BOOST_THROW_EXCEPTION(std::runtime_error("Exception during egl_native_display"));
 
-        return stub_platform->egl_native_display();
+        return stub_platform->native_platform();
     }
 
 private:

=== modified file 'tests/mir_test_framework/stubbed_graphics_platform.cpp'
--- tests/mir_test_framework/stubbed_graphics_platform.cpp	2017-03-14 05:30:56 +0000
+++ tests/mir_test_framework/stubbed_graphics_platform.cpp	2017-03-15 13:54:31 +0000
@@ -304,9 +304,9 @@
         return adaptee->create_display(initial_conf_policy, gl_config);
     }
 
-    EGLNativeDisplayType egl_native_display() const override
+    mg::NativePlatform* native_platform() override
     {
-        return adaptee->egl_native_display();
+        return adaptee->native_platform();
     }
 
     std::shared_ptr<mg::NestedContext> const context;