Merge lp:~kdub/mir/split-nested into lp:mir

[Kevin DuBois]

prepare the nested platform for providing separate display and rendering hooks. Now the nested platform loads the appropriate /rendering/ platform instead of the 'guest' platform.

prepare the nested platform for providing separate display and rendering hooks. Now the nested platform loads the appropriate /rendering/ platform instead of the 'guest' platform.

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

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

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

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

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

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

review: Approve (continuous-integration)

=== added file 'src/include/platform/mir/graphics/platform_authentication_wrapper.h'
--- src/include/platform/mir/graphics/platform_authentication_wrapper.h	1970-01-01 00:00:00 +0000
+++ src/include/platform/mir/graphics/platform_authentication_wrapper.h	2017-04-04 13:57:35 +0000
@@ -0,0 +1,42 @@
+/*
+ * 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_PLATFORM_AUTHENTICATION_WRAPPER_H_
+#define MIR_GRAPHICS_PLATFORM_AUTHENTICATION_WRAPPER_H_
+#include "mir/graphics/platform_authentication.h"
+
+namespace mir
+{
+namespace graphics
+{
+class AuthenticationWrapper : public PlatformAuthentication
+{
+public:
+    AuthenticationWrapper(std::shared_ptr<PlatformAuthentication> const& auth);
+    mir::optional_value<std::shared_ptr<MesaAuthExtension>> auth_extension() override;
+    mir::optional_value<std::shared_ptr<SetGbmExtension>> set_gbm_extension() override;
+    PlatformOperationMessage platform_operation(
+        unsigned int op, PlatformOperationMessage const& msg) override;
+    mir::optional_value<Fd> drm_fd() override;
+private:
+    std::shared_ptr<PlatformAuthentication> const auth;
+};
+}
+}
+
+#endif /* MIR_GRAPHICS_PLATFORM_AUTHENTICATION_WRAPPER_H_ */

=== modified file 'src/platforms/android/server/symbols.map.in'
--- src/platforms/android/server/symbols.map.in	2016-01-29 08:18:22 +0000
+++ src/platforms/android/server/symbols.map.in	2017-04-04 13:57:35 +0000
@@ -5,6 +5,8 @@
     create_guest_platform;
     probe_graphics_platform;
     describe_graphics_module;
+    create_rendering_platform;
+    create_display_platform;
   local:
     *;
 };

=== modified file 'src/platforms/common/server/CMakeLists.txt'
--- src/platforms/common/server/CMakeLists.txt	2017-03-23 14:46:35 +0000
+++ src/platforms/common/server/CMakeLists.txt	2017-04-04 13:57:35 +0000
@@ -8,6 +8,7 @@
 )
 
 add_library(server_platform_common STATIC
+  platform_authentication_wrapper.cpp
   anonymous_shm_file.cpp
   shm_buffer.cpp
   shm_file.h

=== added file 'src/platforms/common/server/platform_authentication_wrapper.cpp'
--- src/platforms/common/server/platform_authentication_wrapper.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/common/server/platform_authentication_wrapper.cpp	2017-04-04 13:57:35 +0000
@@ -0,0 +1,48 @@
+/*
+ * 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 "mir/graphics/platform_authentication_wrapper.h"
+#include "mir/graphics/platform_operation_message.h"
+
+namespace mg = mir::graphics;
+
+mg::AuthenticationWrapper::AuthenticationWrapper(std::shared_ptr<PlatformAuthentication> const& auth)
+    : auth(auth)
+{
+}
+
+mir::optional_value<std::shared_ptr<mg::MesaAuthExtension>> mg::AuthenticationWrapper::auth_extension()
+{
+    return auth->auth_extension();
+}
+
+mir::optional_value<std::shared_ptr<mg::SetGbmExtension>> mg::AuthenticationWrapper::set_gbm_extension()
+{
+    return auth->set_gbm_extension();
+}
+
+mg::PlatformOperationMessage mg::AuthenticationWrapper::platform_operation(
+    unsigned int op, mg::PlatformOperationMessage const& msg)
+{
+    return auth->platform_operation(op, msg);
+}
+
+mir::optional_value<mir::Fd> mg::AuthenticationWrapper::drm_fd()
+{
+    return auth->drm_fd();
+}

=== modified file 'src/platforms/eglstream-kms/server/symbols.map.in'
--- src/platforms/eglstream-kms/server/symbols.map.in	2016-05-31 01:21:42 +0000
+++ src/platforms/eglstream-kms/server/symbols.map.in	2017-04-04 13:57:35 +0000
@@ -5,6 +5,8 @@
     create_guest_platform;
     probe_graphics_platform;
     describe_graphics_module;
+    create_rendering_platform;
+    create_display_platform;
   local:
     *;
 };

=== modified file 'src/platforms/mesa/server/kms/guest_platform.cpp'
--- src/platforms/mesa/server/kms/guest_platform.cpp	2017-04-04 13:57:34 +0000
+++ src/platforms/mesa/server/kms/guest_platform.cpp	2017-04-04 13:57:35 +0000
@@ -23,7 +23,7 @@
 #include "ipc_operations.h"
 #include "buffer_allocator.h"
 
-#include "mir/graphics/platform_authentication.h"
+#include "mir/graphics/platform_authentication_wrapper.h"
 #include "mir/graphics/platform_operation_message.h"
 #include "mir_toolkit/mesa/platform_operation.h"
 #include "mir_toolkit/extensions/set_gbm_device.h"
@@ -63,35 +63,7 @@
 mir::UniqueModulePtr<mg::PlatformAuthentication>
 mgm::GuestPlatform::NestedAuthFactory::create_platform_authentication()
 {
-    struct AuthenticationWrapper : mg::PlatformAuthentication
-    {
-        AuthenticationWrapper(std::shared_ptr<PlatformAuthentication> const& auth) :
-            auth(auth)
-        {
-        }
-
-        mir::optional_value<std::shared_ptr<mg::MesaAuthExtension>> auth_extension() override
-        {
-            return auth->auth_extension();
-        }
-
-        mir::optional_value<std::shared_ptr<mg::SetGbmExtension>> set_gbm_extension() override
-        {
-            return auth->set_gbm_extension();
-        }
-
-        mg::PlatformOperationMessage platform_operation(
-            unsigned int op, mg::PlatformOperationMessage const& msg) override
-        {
-            return auth->platform_operation(op, msg);
-        }
-        mir::optional_value<mir::Fd> drm_fd() override
-        {
-            return auth->drm_fd();
-        }
-        std::shared_ptr<mg::PlatformAuthentication> const auth;
-    };
-    return make_module_ptr<AuthenticationWrapper>(auth);
+    return make_module_ptr<mg::AuthenticationWrapper>(auth);
 }
 
 mgm::GuestPlatform::GuestPlatform(

=== modified file 'src/platforms/mesa/server/kms/symbols.map.in'
--- src/platforms/mesa/server/kms/symbols.map.in	2017-03-09 19:47:04 +0000
+++ src/platforms/mesa/server/kms/symbols.map.in	2017-04-04 13:57:35 +0000
@@ -5,6 +5,8 @@
     create_guest_platform;
     probe_graphics_platform;
     describe_graphics_module;
+    create_rendering_platform;
+    create_display_platform;
   local:
     *;
 };

=== modified file 'src/platforms/mesa/server/x11/symbols.map.in'
--- src/platforms/mesa/server/x11/symbols.map.in	2017-03-14 02:26:28 +0000
+++ src/platforms/mesa/server/x11/symbols.map.in	2017-04-04 13:57:35 +0000
@@ -5,6 +5,8 @@
    create_host_platform;
    create_guest_platform;
    describe_graphics_module;
+   create_rendering_platform;
+   create_display_platform;
   local: *;
 };
 

=== modified file 'src/server/graphics/default_configuration.cpp'
--- src/server/graphics/default_configuration.cpp	2017-03-29 08:30:37 +0000
+++ src/server/graphics/default_configuration.cpp	2017-04-04 13:57:35 +0000
@@ -87,11 +87,12 @@
                     auto const host_connection = the_host_connection();
 
                     platform_library = std::make_shared<mir::SharedLibrary>(host_connection->graphics_platform_library());
+                    auto buffer_platform = std::make_shared<mgn::NestedBufferPlatform>(
+                        platform_library, host_connection, the_display_report(), the_options());
                     return std::make_shared<mgn::Platform>(
-                        platform_library,
-                        host_connection,
-                        the_display_report(),
-                        *the_options());
+                        buffer_platform,
+                        std::make_unique<mgn::NestedDisplayPlatform>(
+                            buffer_platform, host_connection, the_display_report(), *the_options()));
                 }
 
                 // fallback to standalone if host socket is unset

=== modified file 'src/server/graphics/nested/display.cpp'
--- src/server/graphics/nested/display.cpp	2017-03-16 07:37:11 +0000
+++ src/server/graphics/nested/display.cpp	2017-04-04 13:57:35 +0000
@@ -215,7 +215,7 @@
 }
 
 mgn::Display::Display(
-    std::shared_ptr<mg::Platform> const& platform,
+    std::shared_ptr<mg::RenderingPlatform> const& platform,
     std::shared_ptr<HostConnection> const& connection,
     std::shared_ptr<mg::DisplayReport> const& display_report,
     std::shared_ptr<mg::DisplayConfigurationPolicy> const& initial_conf_policy,

=== modified file 'src/server/graphics/nested/display.h'
--- src/server/graphics/nested/display.h	2017-02-15 07:38:33 +0000
+++ src/server/graphics/nested/display.h	2017-04-04 13:57:35 +0000
@@ -46,7 +46,7 @@
 class DisplayBuffer;
 class DisplayConfigurationPolicy;
 class GLConfig;
-class Platform;
+class RenderingPlatform;
 
 namespace nested
 {
@@ -118,7 +118,7 @@
 {
 public:
     Display(
-        std::shared_ptr<graphics::Platform> const& platform,
+        std::shared_ptr<graphics::RenderingPlatform> const& platform,
         std::shared_ptr<HostConnection> const& connection,
         std::shared_ptr<DisplayReport> const& display_report,
         std::shared_ptr<DisplayConfigurationPolicy> const& conf_policy,
@@ -155,7 +155,7 @@
     Frame last_frame_on(unsigned output_id) const override;
 
 private:
-    std::shared_ptr<graphics::Platform> const platform;
+    std::shared_ptr<graphics::RenderingPlatform> const platform;
     std::shared_ptr<HostConnection> const connection;
     std::shared_ptr<DisplayReport> const display_report;
     detail::EGLDisplayHandle egl_display;

=== modified file 'src/server/graphics/nested/platform.cpp'
--- src/server/graphics/nested/platform.cpp	2017-03-23 17:18:29 +0000
+++ src/server/graphics/nested/platform.cpp	2017-04-04 13:57:35 +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/graphics/platform_authentication_wrapper.h"
 #include "mir/renderer/gl/egl_platform.h"
 
 namespace mg = mir::graphics;
@@ -47,17 +48,17 @@
 }
 }
 
-mgn::Platform::Platform(
+mgn::NestedBufferPlatform::NestedBufferPlatform(
     std::shared_ptr<mir::SharedLibrary> const& library, 
     std::shared_ptr<mgn::HostConnection> const& connection, 
     std::shared_ptr<mg::DisplayReport> const& display_report,
-    mo::Option const& options) :
+    std::shared_ptr<mo::Option> const& options) :
     library(library),
     connection(connection),
     display_report(display_report),
-    guest_platform(library->load_function<mg::CreateGuestPlatform>(
-        "create_guest_platform", MIR_SERVER_GRAPHICS_PLATFORM_VERSION)(display_report, connection)),
-    passthrough_option(passthrough_from_options(options))
+    rendering_platform(library->load_function<mg::CreateRenderingPlatform>(
+        "create_rendering_platform", MIR_SERVER_GRAPHICS_PLATFORM_VERSION)(options, connection)),
+    passthrough_option(passthrough_from_options(*options))
 {
 }
 
@@ -112,25 +113,54 @@
 };
 }
 
-mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgn::Platform::create_buffer_allocator()
+mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgn::NestedBufferPlatform::create_buffer_allocator()
 {
     if (connection->supports_passthrough(mg::BufferUsage::software) ||
         connection->supports_passthrough(mg::BufferUsage::hardware))
     {
-        return mir::make_module_ptr<BufferAllocator>(connection, guest_platform->create_buffer_allocator());
+        return mir::make_module_ptr<BufferAllocator>(connection, rendering_platform->create_buffer_allocator());
     }
     else
     {
-        return guest_platform->create_buffer_allocator();
+        return rendering_platform->create_buffer_allocator();
     }
 }
 
-mir::UniqueModulePtr<mg::Display> mgn::Platform::create_display(
+mir::UniqueModulePtr<mg::PlatformIpcOperations> mgn::NestedBufferPlatform::make_ipc_operations() const
+{
+    return mir::make_module_ptr<mgn::IpcOperations>(rendering_platform->make_ipc_operations());
+}
+
+EGLNativeDisplayType mgn::NestedBufferPlatform::egl_native_display() const
+{
+    if (auto a = dynamic_cast<mir::renderer::gl::EGLPlatform*>(rendering_platform->native_rendering_platform()))
+        return a->egl_native_display();
+    return EGL_NO_DISPLAY;
+}
+
+mg::NativeRenderingPlatform* mgn::NestedBufferPlatform::native_rendering_platform()
+{
+    return rendering_platform->native_rendering_platform();
+}
+
+mgn::NestedDisplayPlatform::NestedDisplayPlatform(
+    std::shared_ptr<graphics::RenderingPlatform> const& platform,
+    std::shared_ptr<mgn::HostConnection> const& connection, 
+    std::shared_ptr<mg::DisplayReport> const& display_report,
+    mo::Option const& options) :
+    platform(platform),
+    connection(connection),
+    display_report(display_report),
+    passthrough_option(passthrough_from_options(options))
+{
+}
+
+mir::UniqueModulePtr<mg::Display> mgn::NestedDisplayPlatform::create_display(
     std::shared_ptr<mg::DisplayConfigurationPolicy> const& policy,
     std::shared_ptr<mg::GLConfig> const& config)
 {
     return mir::make_module_ptr<mgn::Display>(
-        guest_platform,
+        platform,
         connection,
         display_report,
         policy,
@@ -138,24 +168,47 @@
         passthrough_option);
 }
 
+mg::NativeDisplayPlatform* mgn::NestedDisplayPlatform::native_display_platform()
+{
+    return this;
+}
+
+mir::UniqueModulePtr<mg::PlatformAuthentication> mgn::NestedDisplayPlatform::create_platform_authentication()
+{
+    return make_module_ptr<mg::AuthenticationWrapper>(connection);
+}
+
+mgn::Platform::Platform(
+    std::shared_ptr<mgn::NestedBufferPlatform> buffer_platform,
+    std::unique_ptr<mgn::NestedDisplayPlatform> display_platform) :
+    buffer_platform{std::move(buffer_platform)},
+    display_platform{std::move(display_platform)}
+{
+}
+
+mir::UniqueModulePtr<mg::Display> mgn::Platform::create_display(
+    std::shared_ptr<mg::DisplayConfigurationPolicy> const& initial_conf_policy,
+    std::shared_ptr<mg::GLConfig> const& gl_config)
+{
+    return display_platform->create_display(initial_conf_policy, gl_config);
+}
+ 
+mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgn::Platform::create_buffer_allocator()
+{
+    return buffer_platform->create_buffer_allocator();
+}
+
 mg::NativeDisplayPlatform* mgn::Platform::native_display_platform()
 {
-    return connection.get();
+    return display_platform->native_display_platform();
 }
 
 mir::UniqueModulePtr<mg::PlatformIpcOperations> mgn::Platform::make_ipc_operations() const
 {
-    return mir::make_module_ptr<mgn::IpcOperations>(guest_platform->make_ipc_operations());
-}
-
-EGLNativeDisplayType mgn::Platform::egl_native_display() const
-{
-    if (auto a = dynamic_cast<mir::renderer::gl::EGLPlatform*>(guest_platform->native_rendering_platform()))
-        return a->egl_native_display();
-    return EGL_NO_DISPLAY;
+    return buffer_platform->make_ipc_operations();
 }
 
 mg::NativeRenderingPlatform* mgn::Platform::native_rendering_platform()
 {
-    return this;
+    return buffer_platform->native_rendering_platform();
 }

=== modified file 'src/server/graphics/nested/platform.h'
--- src/server/graphics/nested/platform.h	2017-03-23 17:18:29 +0000
+++ src/server/graphics/nested/platform.h	2017-04-04 13:57:35 +0000
@@ -20,6 +20,7 @@
 #define MIR_GRAPHICS_NESTED_PLATFORM_H_
 
 #include "mir/graphics/platform.h"
+#include "mir/graphics/platform_authentication.h"
 #include "mir/renderer/gl/egl_platform.h"
 #include "passthrough_option.h"
 #include <memory>
@@ -36,22 +37,44 @@
 namespace nested
 {
 class HostConnection;
-class Platform : public graphics::Platform,
-                 public graphics::NativeRenderingPlatform,
-                 public mir::renderer::gl::EGLPlatform
-{
-public:
-    Platform(
+
+class NestedDisplayPlatform : public graphics::DisplayPlatform,
+                              public graphics::NativeDisplayPlatform,
+                              public graphics::PlatformAuthenticationFactory
+{
+public:
+    NestedDisplayPlatform(
+        std::shared_ptr<graphics::RenderingPlatform> const& platform,
+        std::shared_ptr<HostConnection> const& connection, 
+        std::shared_ptr<DisplayReport> const& display_report,
+        options::Option const& options);
+
+    UniqueModulePtr<graphics::Display> create_display(
+        std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
+        std::shared_ptr<GLConfig> const& gl_config) override;
+    NativeDisplayPlatform* native_display_platform() override;
+    UniqueModulePtr<PlatformAuthentication> create_platform_authentication() override;
+
+private:
+    std::shared_ptr<graphics::RenderingPlatform> const platform;
+    std::shared_ptr<HostConnection> const connection; 
+    std::shared_ptr<DisplayReport> const display_report;
+
+    PassthroughOption const passthrough_option;
+};
+
+class NestedBufferPlatform : public graphics::RenderingPlatform,
+                             public graphics::NativeRenderingPlatform,
+                             public mir::renderer::gl::EGLPlatform
+{
+public:
+    NestedBufferPlatform(
         std::shared_ptr<mir::SharedLibrary> const& library, 
         std::shared_ptr<HostConnection> const& connection, 
         std::shared_ptr<DisplayReport> const& display_report,
-        options::Option const& options);
+        std::shared_ptr<options::Option> const& options);
 
     UniqueModulePtr<GraphicBufferAllocator> create_buffer_allocator() override;
-    UniqueModulePtr<graphics::Display> create_display(
-        std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
-        std::shared_ptr<GLConfig> const& gl_config) override;
-    NativeDisplayPlatform* native_display_platform() override;
     UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
     NativeRenderingPlatform* native_rendering_platform() override;
     EGLNativeDisplayType egl_native_display() const override;
@@ -60,11 +83,29 @@
     std::shared_ptr<HostConnection> const connection; 
     std::shared_ptr<DisplayReport> const display_report;
 
-    //the concept of guest platform is strange, it only exists to deny creating a
-    //host display in a nested context. It should go away soon.
-    std::shared_ptr<graphics::Platform> const guest_platform;
+    std::shared_ptr<graphics::RenderingPlatform> const rendering_platform;
     PassthroughOption const passthrough_option;
 };
+
+class Platform : public graphics::Platform
+{
+public:
+    Platform(
+        std::shared_ptr<NestedBufferPlatform> buffer_platform,
+        std::unique_ptr<NestedDisplayPlatform> display_platform);
+    UniqueModulePtr<graphics::Display> create_display(
+        std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
+        std::shared_ptr<GLConfig> const& gl_config) override;
+    NativeDisplayPlatform* native_display_platform() override;
+
+    UniqueModulePtr<GraphicBufferAllocator> create_buffer_allocator() override;
+    UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
+    NativeRenderingPlatform* native_rendering_platform() override;
+private:
+    std::shared_ptr<NestedBufferPlatform> const buffer_platform;
+    std::unique_ptr<NestedDisplayPlatform> const display_platform;
+};
+
 }
 }
 }

=== modified file 'tests/mir_test_framework/stubbed_graphics_platform.cpp'
--- tests/mir_test_framework/stubbed_graphics_platform.cpp	2017-03-23 14:46:35 +0000
+++ tests/mir_test_framework/stubbed_graphics_platform.cpp	2017-04-04 13:57:35 +0000
@@ -372,6 +372,39 @@
     return mir::make_module_ptr<GuestPlatformAdapter>(context, graphics_platform);
 }
 
+mir::UniqueModulePtr<mg::DisplayPlatform> create_display_platform(
+    std::shared_ptr<mo::Option> const&,
+    std::shared_ptr<mir::EmergencyCleanupRegistry> const&,
+    std::shared_ptr<mg::DisplayReport> const&,
+    std::shared_ptr<mir::logging::Logger> const&)
+{
+    mir::assert_entry_point_signature<mg::CreateDisplayPlatform>(&create_display_platform);
+    std::shared_ptr<mg::Platform> result{};
+
+    if (auto const display_rects = std::move(chosen_display_rects))
+    {
+        result = create_stub_platform(*display_rects);
+    }
+    else
+    {
+        static std::vector<geom::Rectangle> const default_display_rects{geom::Rectangle{{0,0},{1600,1600}}};
+        result = create_stub_platform(default_display_rects);
+    }
+    the_graphics_platform = result;
+    return mir::make_module_ptr<GuestPlatformAdapter>(nullptr, result);
+}
+
+mir::UniqueModulePtr<mir::graphics::RenderingPlatform> create_rendering_platform(
+    std::shared_ptr<mir::options::Option> const&, 
+    std::shared_ptr<mir::graphics::PlatformAuthentication> const&) 
+{
+    mir::assert_entry_point_signature<mg::CreateRenderingPlatform>(&create_rendering_platform);
+
+    static std::vector<geom::Rectangle> const default_display_rects{geom::Rectangle{{0,0},{1600,1600}}};
+    auto result = create_stub_platform(default_display_rects);
+    return mir::make_module_ptr<GuestPlatformAdapter>(nullptr, result);
+}
+
 void add_graphics_platform_options(
     boost::program_options::options_description& /*config*/)
 {

=== modified file 'tests/mir_test_framework/symbols-server.map.in'
--- tests/mir_test_framework/symbols-server.map.in	2016-01-29 08:18:22 +0000
+++ tests/mir_test_framework/symbols-server.map.in	2017-04-04 13:57:35 +0000
@@ -3,6 +3,8 @@
     add_graphics_platform_options;
     create_host_platform;
     create_guest_platform;
+    create_display_platform;
+    create_rendering_platform;
     probe_graphics_platform;
     describe_graphics_module;
 };