Merge lp:~hikiko/mir/mir.nested-gbm into lp:~mir-team/mir/trunk

[Eleni Maria Stea]

This branch implements a first version of a nested gbm display. It's not 100% ready yet, it might need fixes and it certainly needs some polishing. Nevertheless, I did the MP because I'd like to get some feedback while I write a first version of a nested android display. Any comments/suggestions are welcome! Thanks!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:771
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~hikiko/mir/mir.nested-gbm/+merge/173284/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ci/926/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1190/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1074/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/164/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/926/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

+#ifdef NESTED_GBM
we're pretty much ifdef-free, we should work on getting nested mir servers to work without ifdefs

there are a few c-style casts
l219 : (long unsigned int)

src/server/graphics/nested_gbm/nested_gbm_display.cpp
has a lot of classes in it, we try to keep it to 1 class per cpp/h as best as makes sense

lastly, a 'platform' should just be the class of drivers that mir is running on (mesa-based or android based at the moment). A non-native display shouldn't constitute a new platform, rather an option that we can turn on for either platform. Both android and gbm should be able to use the same code for the nested mir display classes

review: Needs Fixing

[Kevin DuBois (kdub)]

if i could suggest a landing strategy :)

Right now the structure of the project (in terms of file directories and build options) is not very well suited for sharing code between android and gbm platforms. We should resurrect lp:~raof/mir/separate-graphics-buffer-and-display and get the files and build system in shape for accomodating a mir driver platform using the same code to get a nested-mir-based display.

[Eleni Maria Stea (hikiko)]

@Kevin, thanks for the feedback! :)
The suggestion for the separation of display/buffers is something that we certainly have to do at some point.. but I am not sure if I have to do it now or when I finish the nested android display... So, I'll start with the cleanup the mested_gbm_display.cpp and the ifdef for the moment!

[Alexandros Frantzis (afrantzis)]

My understanding is that this is a spike for the nested mir effort, and not the final design (as described in https://lists.ubuntu.com/archives/mir-devel/2013-June/000166.html), so I will not focus on the general design in this review.

> src/server/graphics/nested_gbm/nested_gbm_display.cpp
> has a lot of classes in it, we try to keep it to 1 class per cpp/h as best as makes sense

These are internal utility classes, and should be placed in an anonymous namespace.

663 + if(!platform->nm_connection) {
664 + BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Connection to host-mir not found!\n"));
665 + }
...and at other places

The opening brace should be placed on its own line (or the braces can be omitted for single lines), see http://unity.ubuntu.com/mir/cppguide/index.html#Conditionals .

677 + mir_surface_get_graphics_region(nm_surface, &nm_graphics_region);

This is called before nm_surface is created, plus you probably don't want to get the "graphics_region" (which maps the buffer to system memory) anyway. This confusion indicates a naming problem with the API, mir_surface_map() would probably be clearer.

778 +void mgng::NestedGBMDisplay::clear()

The clear() method has been removed from the Display class.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

The #ifdef approach is fine for a "proof of concept" spike, but *not* something we want to land on trunk.

The difference between the host and nested Mir processes should be a matter of configuration, not a separate build. (The two "platforms" Mir supports are android and gbm - nested/mir-on-mir isn't a separately compiled platform.)

Having said that, having the "nested" configuration load a different graphicsplatform library is a possible approach (if we really need that much separate code).

~~~~

1 === added directory '3rd_party/cucumber-cpp'

Not needed.

~~~

46 - "graphics backend to build (options are 'gbm' or 'android')"
47 + "graphics backend to build (options are 'gbm' or 'android' or 'nested_gbm')"
...
192 +if( MIR_PLATFORM STREQUAL "nested_gbm")
...
324 +elseif (MIR_PLATFORM STREQUAL "nested_gbm")
325 + include_directories(${DRM_INCLUDE_DIRS})
326 + list(APPEND FRONTEND_SOURCES session_mediator_gbm.cpp)
...
338 +if (MIR_PLATFORM STREQUAL "nested_gbm")
339 + add_subdirectory(nested_gbm/)
340 +endif()

See above discussion. "nested_gbm" is not a target platform, nested is a runtime option (implicitly gbm or android depending on the build).

~~~~

79 +# add_subdirectory(tests/)

We don't want to disable tests.

~~~~

138 +/* MirConnection* nm_connection;
139 + if(!(nm_connection = mir_connect_sync("/tmp/mir_socket", "nested_mir"))) {
140 + BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Platform: Failed to connect!\n"));
141 + }
142 + if(!mir_connection_is_valid(nm_connection)) {
143 + BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Platform: Invalid connection!\n"));
144 + }
145 + if(!(strcmp(mir_connection_get_error_message(nm_connection),"") == 0))
146 + {
147 + BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Platform: Errors occured!\n"));
148 + }
149 + */

Comments should not be used to store old code - that's what version control is for.

~~~~

162 +#ifdef NESTED_GBM
163 +const char default_server_socket[] = "/tmp/mir_socket_nested";
164 +#else
165 const char default_server_socket[] = "/tmp/mir_socket";
166 +#endif
...
361 +#ifdef NESTED_GBM
362 +mgg::GBMBufferAllocator::GBMBufferAllocator(
363 + const std::shared_ptr<mgng::NestedGBMPlatform>& platform,
364 + const std::shared_ptr<BufferInitializer>& buffer_initializer)
365 + : platform(platform),
366 + buffer_initializer(buffer_initializer),
367 + egl_extensions(std::make_shared<mg::EGLExtensions>())
368 +{
369 + assert(buffer_initializer.get() != 0);
370 +}
371 +#else
...
404 +#ifdef NESTED_GBM
405 + GBMBufferAllocator(const std::shared_ptr<mgng::NestedGBMPlatform>& platform,
406 + const std::shared_ptr<BufferInitializer>& buffer_initializer);
407 +#else

See above discussion - these should be controlled by configuration parameters at runtime, not selected at compile time.

~~~~

418 +#ifdef NESTED_GBM
419 + std::shared_ptr<mgng::NestedGBMPlatform> platform;
420 +#else
421 std::shared_ptr<GBMPlatform> platform;
422 +#endif

Either a common interface is needed or there needs to be two versions.

~~~~

434 +#include "internal_client.h"

Not needed - only a declaration is used in the header, not an definition.

~~~~

498 + ../../frontend/session_mediator_gbm.cpp
...

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:772
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~hikiko/mir/mir.nested-gbm/+merge/173284/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ci/950/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1226/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1110/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/188/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/591

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/950/rebuild

review: Needs Fixing (continuous-integration)

[Eleni Maria Stea (hikiko)]

Thank you all for your comments/suggestions! I changed the status to "work in progress" so that each push doesn't cause a Jenkins rebuild while I fix/polish/refactor the branch. :)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-08 03:12:22 +0000
+++ CMakeLists.txt	2013-07-09 13:08:27 +0000
@@ -92,7 +92,7 @@
   gbm
   CACHE
   STRING
-  "graphics backend to build (options are 'gbm' or 'android')"
+  "graphics backend to build (options are 'gbm' or 'android' or 'nested_gbm')"
 )
 
 find_package(EGL REQUIRED)
@@ -130,8 +130,14 @@
   pkg_check_modules( DRM REQUIRED libdrm )
   pkg_check_modules( UDEV REQUIRED libudev )
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__GBM__")
+elseif (MIR_PLATFORM STREQUAL "nested_gbm")
+  find_package( PkgConfig )
+  pkg_check_modules( GBM REQUIRED gbm>=9.0.0)
+  pkg_check_modules( DRM REQUIRED libdrm )
+  pkg_check_modules( MIRCLIENT REQUIRED mirclient )
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNESTED_GBM")
 else ()
-  message (FATAL_ERROR "MIR_BACKEND must be either 'android' or 'gbm'")
+  message (FATAL_ERROR "MIR_BACKEND must be either 'android' or 'gbm' or 'nested_gbm'")
 endif()
 
 set(MIR_ANDROID_INCLUDE_DIRECTORIES) # to be filled by android-input
@@ -183,10 +189,16 @@
 # Restore -Werror for non-3rd-party code
 set (CMAKE_CXX_FLAGS ${OLD_CMAKE_CXX_FLAGS})
 
+<<<<<<< TREE
 option(MIR_ENABLE_TESTS "Build tests" ON)
 
 if (MIR_ENABLE_TESTS)
   add_subdirectory(tests/)
+=======
+add_subdirectory(benchmarks/)
+if (MIR_TESTS_AVAILABLE)
+#  add_subdirectory(tests/)
+>>>>>>> MERGE-SOURCE
 endif ()
 add_subdirectory(benchmarks/)
 add_subdirectory(tools/)

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2013-07-08 22:22:00 +0000
+++ examples/CMakeLists.txt	2013-07-09 13:08:27 +0000
@@ -135,6 +135,7 @@
 
 target_link_libraries(mir_demo_server
   mirserver
+  mirclient
   ${Boost_LIBRARIES}
 )
 

=== modified file 'examples/demo_client_accelerated.cpp'
--- examples/demo_client_accelerated.cpp	2013-07-08 22:22:00 +0000
+++ examples/demo_client_accelerated.cpp	2013-07-09 13:08:27 +0000
@@ -58,9 +58,9 @@
     puts("Starting");
 
     connection = mir_connect_sync(socket_file, __PRETTY_FUNCTION__);
-    assert(connection != NULL);
+    assert(connection);
     assert(mir_connection_is_valid(connection));
-    assert(strcmp(mir_connection_get_error_message(connection), "") == 0);
+ //   assert(strcmp(mir_connection_get_error_message(connection), "") == 0);
     puts("Connected");
 
     MirDisplayInfo display_info;
@@ -73,7 +73,7 @@
         {__PRETTY_FUNCTION__, 640, 480, pixel_format, mir_buffer_usage_hardware};
 
     surface = mir_connection_create_surface_sync(connection, &request_params);
-    assert(surface != NULL);
+    assert(surface);
     assert(mir_surface_is_valid(surface));
     assert(strcmp(mir_surface_get_error_message(surface), "") == 0);
     puts("Surface created");
@@ -96,7 +96,7 @@
 
     EGLNativeDisplayType native_display = (EGLNativeDisplayType) mir_connection_get_egl_native_display(connection);
     EGLNativeWindowType native_window = (EGLNativeWindowType) mir_surface_get_egl_native_window(surface);
-    assert(native_window != NULL);
+    assert(native_window);
 
     disp = eglGetDisplay(native_display);
     assert(disp != EGL_NO_DISPLAY);

=== modified file 'examples/demo_server.cpp'
--- examples/demo_server.cpp	2013-05-01 00:58:45 +0000
+++ examples/demo_server.cpp	2013-07-09 13:08:27 +0000
@@ -25,6 +25,19 @@
 int main(int argc, char const* argv[])
 try
 {
+/*    MirConnection* nm_connection;
+    if(!(nm_connection = mir_connect_sync("/tmp/mir_socket", "nested_mir"))) {
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Platform: Failed to connect!\n"));
+    }
+    if(!mir_connection_is_valid(nm_connection)) {
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Platform: Invalid connection!\n"));
+    }
+    if(!(strcmp(mir_connection_get_error_message(nm_connection),"") == 0))
+    {
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Platform: Errors occured!\n"));
+    }
+    */
+
     mir::DefaultServerConfiguration config(argc, argv);
 
     run_mir(config, [](mir::DisplayServer&) {/* empty init */});

=== modified file 'include/shared/mir/default_configuration.h'
--- include/shared/mir/default_configuration.h	2013-04-22 08:20:31 +0000
+++ include/shared/mir/default_configuration.h	2013-07-09 13:08:27 +0000
@@ -23,7 +23,11 @@
 
 namespace mir
 {
+#ifdef NESTED_GBM
+const char default_server_socket[] = "/tmp/mir_socket_nested";
+#else
 const char default_server_socket[] = "/tmp/mir_socket";
+#endif
 }
 
 #endif

=== modified file 'include/shared/mir_toolkit/client_types.h'
--- include/shared/mir_toolkit/client_types.h	2013-06-20 09:43:30 +0000
+++ include/shared/mir_toolkit/client_types.h	2013-07-09 13:08:27 +0000
@@ -126,7 +126,8 @@
 typedef enum MirPlatformType
 {
     mir_platform_type_gbm,
-    mir_platform_type_android    
+    mir_platform_type_android,
+    mir_platform_type_nested_gbm
 } MirPlatformType;
 
 typedef struct MirPlatformPackage

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2013-07-02 19:38:24 +0000
+++ src/client/CMakeLists.txt	2013-07-09 13:08:27 +0000
@@ -59,6 +59,21 @@
 )
 endif()
 
+if( MIR_PLATFORM STREQUAL "nested_gbm")
+set(
+  CLIENT_SOURCES
+
+  nested_gbm/nested_gbm_client_platform.cpp
+  
+  gbm/gbm_client_platform.cpp
+  gbm/gbm_client_buffer_factory.cpp
+  gbm/gbm_client_buffer.cpp
+  gbm/mesa_native_display_container.cpp
+  gbm/gbm_native_surface.cpp
+  ${CLIENT_SOURCES}
+)
+endif()
+
 add_library(
   mirclient SHARED
 

=== modified file 'src/client/gbm/gbm_client_platform.cpp'
--- src/client/gbm/gbm_client_platform.cpp	2013-06-13 22:44:04 +0000
+++ src/client/gbm/gbm_client_platform.cpp	2013-07-09 13:08:27 +0000
@@ -153,7 +153,7 @@
     //TODO: this is awkward on both android and gbm...
     auto gbm_window = new GBMNativeSurface(*client_surface);
     auto egl_native_window = new EGLNativeWindowType;
-    *egl_native_window = gbm_window; 
+    *egl_native_window = (long unsigned int)gbm_window;
     NativeWindowDeleter deleter(gbm_window);
     return std::shared_ptr<EGLNativeWindowType>(egl_native_window, deleter);
 }

=== modified file 'src/client/mir_client_library.cpp'
--- src/client/mir_client_library.cpp	2013-06-28 10:55:30 +0000
+++ src/client/mir_client_library.cpp	2013-07-09 13:08:27 +0000
@@ -264,7 +264,7 @@
 
 MirEGLNativeWindowType mir_surface_get_egl_native_window(MirSurface *surface)
 {
-    return surface->generate_native_window();
+    return (MirEGLNativeWindowType)surface->generate_native_window();
 }
 
 MirWaitHandle *mir_connection_drm_auth_magic(MirConnection* connection,

=== added directory 'src/client/nested_gbm'
=== added file 'src/client/nested_gbm/nested_gbm_client_platform.cpp'
--- src/client/nested_gbm/nested_gbm_client_platform.cpp	1970-01-01 00:00:00 +0000
+++ src/client/nested_gbm/nested_gbm_client_platform.cpp	2013-07-09 13:08:27 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2012 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: Eleni Maria Stea <[e-mail]>
+ */
+
+#include "nested_gbm_client_platform.h"
+
+namespace mclng = mir::client::nested_gbm;
+
+MirPlatformType mclng::NestedGBMClientPlatform::platform_type() const
+{
+    return mir_platform_type_nested_gbm;
+}

=== added file 'src/client/nested_gbm/nested_gbm_client_platform.h'
--- src/client/nested_gbm/nested_gbm_client_platform.h	1970-01-01 00:00:00 +0000
+++ src/client/nested_gbm/nested_gbm_client_platform.h	2013-07-09 13:08:27 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2012 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: Eleni Maria Stea <[e-mail]>
+ */
+#ifndef MIR_CLIENT_NESTED_GBM_NESTED_GBM_CLIENT_PLATFORM_H_
+#define MIR_CLIENT_NESTED_GBM_NESTED_GBM_CLIENT_PLATFORM_H_
+
+#include "../gbm/gbm_client_platform.h"
+
+namespace mclg = mir::client::gbm;
+
+namespace mir
+{
+namespace client
+{
+namespace nested_gbm
+{
+
+class NestedGBMClientPlatform : public mclg::GBMClientPlatform
+{
+public:
+    virtual ~NestedGBMClientPlatform() {}
+    MirPlatformType platform_type() const;
+};
+
+}
+}
+}
+
+#endif /* MIR_CLIENT_NESTED_GBM_NESTED_GBM_CLIENT_PLATFORM_H_ */

=== modified file 'src/server/frontend/CMakeLists.txt'
--- src/server/frontend/CMakeLists.txt	2013-05-30 19:24:29 +0000
+++ src/server/frontend/CMakeLists.txt	2013-07-09 13:08:27 +0000
@@ -25,6 +25,9 @@
 elseif (MIR_PLATFORM STREQUAL "gbm")
   include_directories(${DRM_INCLUDE_DIRS})
   list(APPEND FRONTEND_SOURCES session_mediator_gbm.cpp)
+elseif (MIR_PLATFORM STREQUAL "nested_gbm")
+  include_directories(${DRM_INCLUDE_DIRS})
+  list(APPEND FRONTEND_SOURCES session_mediator_gbm.cpp)
 endif()
 
 add_library(

=== modified file 'src/server/graphics/CMakeLists.txt'
--- src/server/graphics/CMakeLists.txt	2013-06-25 10:44:13 +0000
+++ src/server/graphics/CMakeLists.txt	2013-07-09 13:08:27 +0000
@@ -11,6 +11,10 @@
   add_subdirectory(gbm/)
 endif()
 
+if (MIR_PLATFORM STREQUAL "nested_gbm")
+  add_subdirectory(nested_gbm/)
+endif()
+
 set(
   GRAPHICS_SOURCES
 

=== modified file 'src/server/graphics/gbm/gbm_buffer_allocator.cpp'
--- src/server/graphics/gbm/gbm_buffer_allocator.cpp	2013-06-14 17:16:31 +0000
+++ src/server/graphics/gbm/gbm_buffer_allocator.cpp	2013-07-09 13:08:27 +0000
@@ -37,6 +37,7 @@
 
 namespace mg  = mir::graphics;
 namespace mgg = mir::graphics::gbm;
+namespace mgng = mir::graphics::nested_gbm;
 namespace mc  = mir::compositor;
 namespace geom = mir::geometry;
 
@@ -106,6 +107,17 @@
 
 }
 
+#ifdef NESTED_GBM
+mgg::GBMBufferAllocator::GBMBufferAllocator(
+        const std::shared_ptr<mgng::NestedGBMPlatform>& platform,
+        const std::shared_ptr<BufferInitializer>& buffer_initializer)
+        : platform(platform),
+          buffer_initializer(buffer_initializer),
+          egl_extensions(std::make_shared<mg::EGLExtensions>())
+{
+    assert(buffer_initializer.get() != 0);
+}
+#else
 mgg::GBMBufferAllocator::GBMBufferAllocator(
         const std::shared_ptr<GBMPlatform>& platform,
         const std::shared_ptr<BufferInitializer>& buffer_initializer)
@@ -115,6 +127,7 @@
 {
     assert(buffer_initializer.get() != 0);
 }
+#endif
 
 std::shared_ptr<mc::Buffer> mgg::GBMBufferAllocator::alloc_buffer(
     mc::BufferProperties const& buffer_properties)

=== modified file 'src/server/graphics/gbm/gbm_buffer_allocator.h'
--- src/server/graphics/gbm/gbm_buffer_allocator.h	2013-06-14 17:16:31 +0000
+++ src/server/graphics/gbm/gbm_buffer_allocator.h	2013-07-09 13:08:27 +0000
@@ -22,8 +22,12 @@
 #include "mir/compositor/graphic_buffer_allocator.h"
 #include "mir/compositor/buffer_id.h"
 
+#include "../nested_gbm/nested_gbm_platform.h"
+
 #include <memory>
 
+namespace mgng = mir::graphics::nested_gbm;
+
 namespace mir
 {
 namespace graphics
@@ -38,8 +42,13 @@
 class GBMBufferAllocator: public compositor::GraphicBufferAllocator
 {
 public:
+#ifdef NESTED_GBM
+    GBMBufferAllocator(const std::shared_ptr<mgng::NestedGBMPlatform>& platform,
+       const std::shared_ptr<BufferInitializer>& buffer_initializer);
+#else
     GBMBufferAllocator(const std::shared_ptr<GBMPlatform>& platform,
                        const std::shared_ptr<BufferInitializer>& buffer_initializer);
+#endif
 
     virtual std::shared_ptr<compositor::Buffer> alloc_buffer(
         compositor::BufferProperties const& buffer_properties);
@@ -47,7 +56,11 @@
     std::vector<geometry::PixelFormat> supported_pixel_formats();
 
 private:
+#ifdef NESTED_GBM
+    std::shared_ptr<mgng::NestedGBMPlatform> platform;
+#else
     std::shared_ptr<GBMPlatform> platform;
+#endif
     std::shared_ptr<graphics::BufferInitializer> buffer_initializer;
     std::shared_ptr<EGLExtensions> const egl_extensions;
 };

=== modified file 'src/server/graphics/gbm/gbm_platform.h'
--- src/server/graphics/gbm/gbm_platform.h	2013-07-08 11:11:07 +0000
+++ src/server/graphics/gbm/gbm_platform.h	2013-07-09 13:08:27 +0000
@@ -22,9 +22,12 @@
 #include "mir/graphics/platform.h"
 #include "mir/graphics/drm_authenticator.h"
 #include "gbm_display_helpers.h"
+#include "internal_client.h"
 
 #include "mir_toolkit/mesa/native_display.h"
 
+namespace mg = mir::graphics;
+
 namespace mir
 {
 namespace graphics
@@ -48,7 +51,7 @@
             const std::shared_ptr<BufferInitializer>& buffer_initializer);
     std::shared_ptr<Display> create_display();
     std::shared_ptr<PlatformIPCPackage> get_ipc_package(); 
-    std::shared_ptr<InternalClient> create_internal_client();
+    std::shared_ptr<mg::InternalClient> create_internal_client();
 
     void fill_ipc_package(std::shared_ptr<compositor::BufferIPCPacker> const& packer,
                           std::shared_ptr<compositor::Buffer> const& buffer) const;

=== modified file 'src/server/graphics/gbm/internal_client.cpp'
--- src/server/graphics/gbm/internal_client.cpp	2013-06-05 21:17:25 +0000
+++ src/server/graphics/gbm/internal_client.cpp	2013-07-09 13:08:27 +0000
@@ -39,5 +39,5 @@
         client_window = std::make_shared<mgg::InternalNativeSurface>(surface);
     }
 
-    return client_window.get();
+    return (EGLNativeWindowType)client_window.get();
 }

=== added directory 'src/server/graphics/nested_gbm'
=== added file 'src/server/graphics/nested_gbm/CMakeLists.txt'
--- src/server/graphics/nested_gbm/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/CMakeLists.txt	2013-07-09 13:08:27 +0000
@@ -0,0 +1,49 @@
+include_directories(
+    ${MIRCLIENT_INCLUDE_DIRS}
+    ${DRM_INCLUDE_DIRS}
+    ${GBM_INCLUDE_DIRS}
+    ${EGL_INCLUDE_DIRS}
+    ${GLESv2_INCLUDE_DIRS}
+    ${UDEV_INCLUDE_DIRS}
+)
+
+# gbm.h and drm.h have trailing commas at the end of enum definitions
+# This is valid C99, but g++ 4.4 flags it as an error with -pedantic
+#string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+
+
+add_library(
+  mirplatformgraphics STATIC
+
+  nested_gbm_platform.cpp
+  nested_gbm_display.cpp
+  nested_gbm_display_configuration.cpp
+  nested_gbm_context_store.cpp
+  nested_gbm_surface_store.cpp
+  nested_gbm_gl_context.cpp
+  
+  ../gbm/gbm_buffer.cpp
+  ../gbm/gbm_buffer_allocator.cpp
+  ../gbm/gbm_display_helpers.cpp
+  ../gbm/internal_native_display.cpp
+  ../gbm/internal_client.cpp
+  ../gbm/drm_close_threadsafe.cpp
+  ../gbm/drm_mode_resources.cpp
+
+  # from frontend
+  ../../frontend/session_mediator_gbm.cpp
+)
+
+target_link_libraries(
+  mirplatformgraphics
+  mircompositor
+  mirlogging
+  mirserver
+
+  ${MIRCLIENT_LDFLAGS} ${MIRCLIENT_LIBRARIES}
+  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
+  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
+  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
+  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
+  ${UDEV_LDFLAGS} ${UDEV_LIBRARIES}
+)

=== added file 'src/server/graphics/nested_gbm/nested_gbm_context_store.cpp'
--- src/server/graphics/nested_gbm/nested_gbm_context_store.cpp	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/nested_gbm_context_store.cpp	2013-07-09 13:08:27 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Eleni Maria Stea <[e-mail]>
+ */
+
+#include "nested_gbm_context_store.h"
+
+#include <boost/throw_exception.hpp>
+#include <stdexcept>
+
+EGLContextStore::EGLContextStore(EGLDisplay egl_display, EGLContext egl_context) :
+    egl_display_{egl_display},
+    egl_context_{egl_context}
+{
+    if (egl_context_ == EGL_NO_CONTEXT)
+            BOOST_THROW_EXCEPTION(std::runtime_error("Could not create egl context\n"));
+}
+
+EGLContextStore::~EGLContextStore()
+{
+    eglDestroyContext(egl_display_, egl_context_);
+}
+
+EGLContextStore::operator EGLContext() const
+{
+    return egl_context_;
+}

=== added file 'src/server/graphics/nested_gbm/nested_gbm_context_store.h'
--- src/server/graphics/nested_gbm/nested_gbm_context_store.h	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/nested_gbm_context_store.h	2013-07-09 13:08:27 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Eleni Maria Stea <[e-mail]>
+ */
+
+#ifndef NESTED_GBM_EGL_CONTEXT_STORE_H_
+#define NESTED_GBM_EGL_CONTEXT_STORE_H_
+
+#include "EGL/egl.h"
+
+namespace
+{
+
+class EGLContextStore
+{
+public:
+    EGLContextStore(EGLDisplay egl_display, EGLContext egl_context);
+    virtual ~EGLContextStore() noexcept;
+
+    operator EGLContext() const;
+private:
+    EGLContextStore(EGLContextStore const&) = delete;
+    EGLContextStore& operator=(EGLContextStore const&) = delete;
+    EGLDisplay const egl_display_;
+    EGLContext const egl_context_;
+};
+
+}
+
+#endif /* NESTED_GBM_EGL_CONTEXT_STORE_H_ */

=== added file 'src/server/graphics/nested_gbm/nested_gbm_display.cpp'
--- src/server/graphics/nested_gbm/nested_gbm_display.cpp	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/nested_gbm_display.cpp	2013-07-09 13:08:27 +0000
@@ -0,0 +1,228 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Eleni Maria Stea <[e-mail]>
+ */
+
+#include "nested_gbm_platform.h"
+#include "nested_gbm_display.h"
+#include "nested_gbm_display_configuration.h"
+#include "nested_gbm_gl_context.h"
+
+#include <boost/throw_exception.hpp>
+#include <stdexcept>
+
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+#include <string.h>
+
+namespace mg = mir::graphics;
+namespace mgg = mir::graphics::gbm;
+namespace mgng = mir::graphics::nested_gbm;
+namespace geom = mir::geometry;
+
+mgng::NestedGBMDisplay::NestedGBMDisplay(std::shared_ptr<NestedGBMPlatform> const& platform,
+        std::shared_ptr<mg::DisplayReport> const& display_report) :
+    platform{platform},
+    display_report{display_report},
+    nm_surface{0},
+    egl_display{EGL_NO_DISPLAY},
+    egl_context{EGL_NO_CONTEXT},
+    egl_pbuf{EGL_NO_SURFACE}
+{
+    /////////////////////////////////////////////
+    // Mir initialization - Mir Surface (Window)
+    /////////////////////////////////////////////
+
+    if(!platform->nm_connection)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Connection to host-mir not found!\n"));
+
+    mir_connection_get_display_info(platform->nm_connection, &egl_display_info);
+    if(!egl_display_info.supported_pixel_format_items)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to get the supported pixel format items.\n"));
+
+    MirPixelFormat pixel_format = egl_display_info.supported_pixel_format[0];
+    if(!pixel_format || pixel_format == mir_pixel_format_invalid)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Invalid pixel format.\n"));
+
+    mir_surface_get_graphics_region(nm_surface, &nm_graphics_region);
+    MirSurfaceParameters const request_params = {__PRETTY_FUNCTION__, nm_graphics_region.width, nm_graphics_region.height, pixel_format, mir_buffer_usage_hardware};
+
+    nm_surface = mir_connection_create_surface_sync(platform->nm_connection, &request_params);
+    if(!nm_surface || !mir_surface_is_valid(nm_surface) || (strcmp(mir_surface_get_error_message(nm_surface), "") !=0))
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to create a mir surface.\n"));
+
+    ////////////////////////////////
+    // EGL display
+    ////////////////////////////////
+
+    EGLNativeDisplayType native_display;
+    if(!(native_display = (EGLNativeDisplayType) mir_connection_get_egl_native_display(platform->nm_connection)))
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to fetch EGL native display.\n"));
+
+    egl_display = eglGetDisplay(native_display);
+    if(egl_display == EGL_NO_DISPLAY)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to fetch EGL display.\n"));
+
+    EGLNativeWindowType native_window;
+    if(!(native_window = (EGLNativeWindowType) mir_surface_get_egl_native_window(nm_surface)))
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to fetch EGL native window.\n"));
+
+    ///////////////////////////////////
+    // EGL initialization
+    ///////////////////////////////////
+
+    EGLint attribs[] = {
+        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+        EGL_RED_SIZE, 8,
+        EGL_GREEN_SIZE, 8,
+        EGL_BLUE_SIZE, 8,
+        EGL_ALPHA_SIZE, 8,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_NONE
+    };
+
+    EGLint context_attribs[] = {
+        EGL_CONTEXT_CLIENT_VERSION, 2,
+        EGL_NONE
+    };
+
+    int res, major, minor, n;
+
+    res = eglInitialize(egl_display, &major, &minor);
+    if((res != EGL_TRUE) || (major != 1) || (minor != 4))
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to initialize EGL.\n"));
+
+    res = eglChooseConfig(egl_display, attribs, &egl_config, 1, &n);
+    if((res != EGL_TRUE) || (n != 1))
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to choose EGL configuration.\n"));
+
+    //////////////
+    //EGL surface
+    //////////////
+
+    egl_surface = eglCreateWindowSurface(egl_display, egl_config, native_window, NULL);
+    if(egl_surface == EGL_NO_SURFACE)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to create window surface.\n"));
+
+    egl_context = eglCreateContext(egl_display, egl_config, EGL_NO_CONTEXT, context_attribs);
+    if(egl_context == EGL_NO_CONTEXT)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to create context.\n"));
+
+    if(eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context) != EGL_TRUE)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to MakeCurrent.\n"));
+
+    egl_surface = eglGetCurrentSurface(EGL_DRAW);
+    if(egl_surface == EGL_NO_SURFACE)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to get current egl surface: "));
+}
+
+mgng::NestedGBMDisplay::~NestedGBMDisplay()
+{
+    eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    eglDestroyContext(egl_display, egl_context);
+    eglDestroySurface(egl_display, egl_surface);
+    eglDestroyContext(egl_display, egl_context);
+    eglTerminate(egl_display);
+    mir_surface_release_sync(nm_surface);
+}
+
+geom::Rectangle mgng::NestedGBMDisplay::view_area() const
+{
+    int display_width, display_height;
+    eglQuerySurface(egl_display, egl_surface, EGL_WIDTH, &display_width);
+    eglQuerySurface(egl_display, egl_surface, EGL_HEIGHT, &display_height);
+    geom::Width w(display_width);
+    geom::Height h(display_height);
+
+    geom::Point pt {
+        geom::X{0},
+        geom::Y{0}
+    };
+
+    geom::Size sz{w,h};
+    geom::Rectangle rect{pt, sz};
+    return rect;
+}
+
+void mgng::NestedGBMDisplay::clear()
+{
+    glClear(GL_COLOR_BUFFER_BIT);
+}
+
+void mgng::NestedGBMDisplay::post_update()
+{
+    mir_surface_swap_buffers_sync(nm_surface);
+ //   eglSwapBuffers(egl_display, egl_surface);
+}
+
+void mgng::NestedGBMDisplay::for_each_display_buffer(std::function<void(mg::DisplayBuffer&)> const& f)
+{
+    f(*this);
+}
+
+std::shared_ptr<mg::DisplayConfiguration> mgng::NestedGBMDisplay::configuration()
+{
+    return std::make_shared<NullDisplayConfiguration>();
+}
+
+void mgng::NestedGBMDisplay::configure(mg::DisplayConfiguration const& /*config*/)
+{
+}
+
+void mgng::NestedGBMDisplay::register_pause_resume_handlers(
+        MainLoop& /*main_loop*/,
+        DisplayPauseHandler const& /*pause_handler*/,
+        DisplayResumeHandler const& /*resume_handler*/)
+{
+}
+
+void mgng::NestedGBMDisplay::register_configuration_change_handler(
+    MainLoop&,
+    DisplayConfigurationChangeHandler const&)
+{
+}
+
+void mgng::NestedGBMDisplay::pause()
+{
+}
+
+void mgng::NestedGBMDisplay::resume()
+{
+}
+
+void mgng::NestedGBMDisplay::make_current()
+{
+	fprintf(stderr, "refresh\n");
+    if(eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context) != EGL_TRUE)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to MakeCurrent.\n"));
+
+	fprintf(stderr, "refresh\n");
+}
+
+void mgng::NestedGBMDisplay::release_current()
+{
+}
+
+auto mgng::NestedGBMDisplay::the_cursor() -> std::weak_ptr<Cursor>
+{
+    return std::weak_ptr<Cursor>();
+}
+
+std::unique_ptr<mg::GLContext> mgng::NestedGBMDisplay::create_gl_context()
+{
+    return std::unique_ptr<NestedGBMGLContext>{
+        new NestedGBMGLContext{egl_display, egl_config, egl_context}};
+}

=== added file 'src/server/graphics/nested_gbm/nested_gbm_display.h'
--- src/server/graphics/nested_gbm/nested_gbm_display.h	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/nested_gbm_display.h	2013-07-09 13:08:27 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Eleni Maria Stea <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_NESTED_GBM_NESTED_GBM_DISPLAY_H_
+#define MIR_GRAPHICS_NESTED_GBM_NESTED_GBM_DISPLAY_H_
+
+#include "nested_gbm_platform.h"
+
+#include "mir_toolkit/mir_client_library.h"
+
+#include "mir/graphics/display.h"
+#include "mir/graphics/display_buffer.h"
+
+#include "../gbm/gbm_display_helpers.h"
+
+namespace mir
+{
+
+namespace geometry
+{
+struct Rectangle;
+}
+
+namespace graphics
+{
+
+class DisplayReport;
+class DisplayBuffer;
+
+namespace nested_gbm
+{
+
+class NestedGBMDisplay : public Display, public DisplayBuffer
+{
+public:
+    NestedGBMDisplay(std::shared_ptr<NestedGBMPlatform> const& platform,
+            std::shared_ptr<DisplayReport> const& display_report);
+    virtual ~NestedGBMDisplay();
+
+    geometry::Rectangle view_area() const;
+    void clear();
+    void post_update();
+    void for_each_display_buffer(std::function<void(DisplayBuffer&)> const& f);
+
+    std::shared_ptr<DisplayConfiguration> configuration();
+    void configure(DisplayConfiguration const&);
+
+    void register_pause_resume_handlers(
+            MainLoop& main_loop,
+            DisplayPauseHandler const& pause_handler,
+            DisplayResumeHandler const& resume_handler);
+
+    void register_configuration_change_handler(
+            MainLoop& main_loop,
+            DisplayConfigurationChangeHandler const& conf_change_handler);
+
+    void pause();
+    void resume();
+
+    void make_current();
+    void release_current();
+
+    std::weak_ptr<Cursor> the_cursor();
+    std::unique_ptr<graphics::GLContext> create_gl_context();
+
+private:
+    std::shared_ptr<NestedGBMPlatform> const platform;
+    std::shared_ptr<DisplayReport> const display_report;
+
+    //Mir Window, Mir Context etc
+    MirSurface* nm_surface;
+    MirDisplayInfo egl_display_info;
+    MirGraphicsRegion nm_graphics_region;
+
+    EGLDisplay egl_display;
+    EGLContext egl_context;
+    EGLSurface egl_surface;
+    EGLSurface egl_pbuf;
+    EGLConfig egl_config;
+};
+
+}
+}
+}
+
+#endif /* MIR_GRAPHICS_NESTED_GBM_NESTED_GBM_DISPLAY_H_ */

=== added file 'src/server/graphics/nested_gbm/nested_gbm_display_configuration.cpp'
--- src/server/graphics/nested_gbm/nested_gbm_display_configuration.cpp	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/nested_gbm_display_configuration.cpp	2013-07-09 13:08:27 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Eleni Maria Stea <[e-mail]>
+ */
+
+#include "nested_gbm_display_configuration.h"
+
+NullDisplayConfiguration::~NullDisplayConfiguration()
+{
+}
+
+void NullDisplayConfiguration::for_each_card(std::function<void(mg::DisplayConfigurationCard const&)>) const
+{
+}
+
+void NullDisplayConfiguration::for_each_output(std::function<void(mg::DisplayConfigurationOutput const&)>) const
+{
+}

=== added file 'src/server/graphics/nested_gbm/nested_gbm_display_configuration.h'
--- src/server/graphics/nested_gbm/nested_gbm_display_configuration.h	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/nested_gbm_display_configuration.h	2013-07-09 13:08:27 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Eleni Maria Stea <[e-mail]>
+ */
+
+#ifndef NESTED_GBM_DISPLAY_CONFIGURATION_H_
+#define NESTED_GBM_DISPLAY_CONFIGURATION_H_
+
+#include "mir/graphics/display_configuration.h"
+
+namespace mg = mir::graphics;
+
+namespace
+{
+
+class NullDisplayConfiguration : public mg::DisplayConfiguration
+{
+public:
+    virtual ~NullDisplayConfiguration();
+    void for_each_card(std::function<void(mg::DisplayConfigurationCard const&)>) const;
+    void for_each_output(std::function<void(mg::DisplayConfigurationOutput const&)>) const;
+};
+
+}
+#endif /* NESTED_GBM_DISPLAY_CONFIGURATION_H_ */

=== added file 'src/server/graphics/nested_gbm/nested_gbm_gl_context.cpp'
--- src/server/graphics/nested_gbm/nested_gbm_gl_context.cpp	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/nested_gbm_gl_context.cpp	2013-07-09 13:08:27 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Eleni Maria Stea <[e-mail]>
+ */
+
+#include "nested_gbm_gl_context.h"
+
+#include <boost/throw_exception.hpp>
+#include <stdexcept>
+
+static EGLint const dummy_pbuffer_attribs[] =
+{
+    EGL_WIDTH, 1,
+    EGL_HEIGHT, 1,
+    EGL_NONE
+};
+
+static const EGLint default_egl_context_attr [] =
+{
+    EGL_CONTEXT_CLIENT_VERSION, 2,
+    EGL_NONE
+};
+
+NestedGBMGLContext::NestedGBMGLContext(EGLDisplay egl_display, EGLConfig egl_config, EGLContext egl_context) :
+    egl_display{egl_display},
+    egl_context{egl_display, eglCreateContext(egl_display, egl_config, egl_context, default_egl_context_attr)},
+    egl_surface{egl_display, eglCreatePbufferSurface(egl_display, egl_config, dummy_pbuffer_attribs)}
+{
+}
+
+NestedGBMGLContext::~NestedGBMGLContext()
+{
+    if (eglGetCurrentContext() != EGL_NO_CONTEXT)
+        release_current();
+}
+
+void NestedGBMGLContext::make_current()
+{
+    if (eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context) == EGL_FALSE)
+        BOOST_THROW_EXCEPTION(std::runtime_error("could not activate dummy surface with eglMakeCurrent\n"));
+}
+
+void NestedGBMGLContext::release_current()
+{
+    eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+}

=== added file 'src/server/graphics/nested_gbm/nested_gbm_gl_context.h'
--- src/server/graphics/nested_gbm/nested_gbm_gl_context.h	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/nested_gbm_gl_context.h	2013-07-09 13:08:27 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Eleni Maria Stea <[e-mail]>
+ */
+
+#ifndef NESTED_GBM_GL_CONTEXT_H_
+#define NESTED_GBM_GL_CONTEXT_H_
+
+#include "mir/graphics/gl_context.h"
+#include "nested_gbm_context_store.h"
+#include "nested_gbm_surface_store.h"
+
+#include <EGL/egl.h>
+
+namespace mg = mir::graphics;
+
+namespace
+{
+
+class NestedGBMGLContext : public mg::GLContext
+{
+    public:
+    NestedGBMGLContext(EGLDisplay egl_display, EGLConfig egl_config, EGLContext egl_context);
+    virtual ~NestedGBMGLContext() noexcept;
+
+    void make_current();
+    void release_current();
+
+private:
+    EGLDisplay const egl_display;
+    EGLContextStore const egl_context;
+    EGLSurfaceStore const egl_surface;
+};
+
+}
+
+#endif /* NESTED_GBM_GL_CONTEXT_H_ */

=== added file 'src/server/graphics/nested_gbm/nested_gbm_platform.cpp'
--- src/server/graphics/nested_gbm/nested_gbm_platform.cpp	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/nested_gbm_platform.cpp	2013-07-09 13:08:27 +0000
@@ -0,0 +1,170 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Eleni Maria Stea <[e-mail]>
+ */
+
+#include "nested_gbm_platform.h"
+#include "nested_gbm_display.h"
+
+#include "../gbm/gbm_platform.h"
+#include "../gbm/gbm_buffer_allocator.h"
+
+#include "../gbm/internal_client.h"
+#include "../gbm/internal_native_display.h"
+
+#include "mir_toolkit/mir_client_library.h"
+
+#include "mir/compositor/buffer_ipc_packer.h"
+#include "mir/graphics/platform_ipc_package.h"
+#include "../../frontend/protobuf_buffer_packer.h"
+
+#include <string.h>
+
+#include <boost/throw_exception.hpp>
+#include <stdexcept>
+
+//TODO: remove
+#include <assert.h>
+
+#include <memory>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <xf86drm.h>
+
+namespace mg = mir::graphics;
+namespace mgng = mir::graphics::nested_gbm;
+namespace mgg = mir::graphics::gbm;
+namespace mc = mir::compositor;
+
+//static std::string socket_file = "/tmp/mir_socket_nested";
+
+struct NestedGBMPlatformIPCPackage : public mg::PlatformIPCPackage
+{
+    NestedGBMPlatformIPCPackage(int drm_auth_fd)
+    {
+        ipc_fds.push_back(drm_auth_fd);
+    }
+
+    virtual ~NestedGBMPlatformIPCPackage()
+    {
+        if((int)ipc_fds.size() > 0 && (int)ipc_fds[0] >= 0)
+            drmClose(ipc_fds[0]);
+    }
+};
+
+std::shared_ptr<mgg::InternalNativeDisplay> mgng::NestedGBMPlatform::internal_native_display;
+bool mgng::NestedGBMPlatform::internal_display_clients_present;
+
+mgng::NestedGBMPlatform::NestedGBMPlatform(std::shared_ptr<mg::DisplayReport> const& display_report)
+    : display_report{display_report}
+{
+	nm_connection = 0;
+    if(!(nm_connection = mir_connect_sync("/tmp/mir_socket", "nested_mir"))) {
+        printf("no conn\n");
+        assert(1);
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Platform: Failed to connect!\n"));
+    }
+    if(!mir_connection_is_valid(nm_connection))
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Platform: Invalid connection!\n"));
+
+    if(!(strcmp(mir_connection_get_error_message(nm_connection),"") == 0))
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Platform: Errors occured!\n"));
+
+    drm.setup(udev);
+    gbm.setup(drm);
+    internal_display_clients_present = true;
+}
+
+mgng::NestedGBMPlatform::~NestedGBMPlatform()
+{
+    internal_native_display.reset();
+    internal_display_clients_present = false;
+
+    mir_connection_release(nm_connection);
+}
+
+////////////////////////////////////////
+////////////////////////////////////////
+
+std::shared_ptr<mc::GraphicBufferAllocator> mgng::NestedGBMPlatform::create_buffer_allocator(
+        const std::shared_ptr<mg::BufferInitializer>& buffer_initializer)
+{
+    return std::make_shared<mgg::GBMBufferAllocator>(this->shared_from_this(), buffer_initializer);
+}
+
+std::shared_ptr<mg::Display> mgng::NestedGBMPlatform::create_display()
+{
+    return std::make_shared<mgng::NestedGBMDisplay>(
+            this->shared_from_this(),
+            display_report);
+}
+
+////////////////////////////////////////
+////////////////////////////////////////
+
+std::shared_ptr<mg::InternalClient> mgng::NestedGBMPlatform::create_internal_client()
+{
+    if(!internal_native_display)
+        internal_native_display = std::make_shared<mgg::InternalNativeDisplay>(get_ipc_package());
+
+    internal_display_clients_present = false;
+    return std::make_shared<mgg::InternalClient>(mgng::NestedGBMPlatform::internal_native_display);
+}
+
+std::shared_ptr<mg::PlatformIPCPackage> mgng::NestedGBMPlatform::get_ipc_package()
+{
+    return std::make_shared<NestedGBMPlatformIPCPackage>(drm.get_authenticated_fd());
+}
+
+void mgng::NestedGBMPlatform::fill_ipc_package(std::shared_ptr<compositor::BufferIPCPacker> const& packer,
+                                        std::shared_ptr<compositor::Buffer> const& buffer) const
+{
+    auto native_handle = buffer->native_buffer_handle();
+    for(auto i=0; i<native_handle->data_items; i++)
+    {
+        packer->pack_data(native_handle->data[i]);
+    }
+    for(auto i=0; i<native_handle->fd_items; i++)
+    {
+        packer->pack_fd(native_handle->fd[i]);
+    }
+
+    packer->pack_stride(buffer->stride());
+}
+
+void mgng::NestedGBMPlatform::drm_auth_magic(drm_magic_t magic)
+{
+   drm.auth_magic(magic);
+}
+
+std::shared_ptr<mg::Platform> mg::create_platform(std::shared_ptr<DisplayReport> const& display_report)
+{
+    return std::make_shared<mgng::NestedGBMPlatform>(display_report);
+}
+
+extern "C"
+{
+int mir_server_internal_display_is_valid(MirMesaEGLNativeDisplay* display)
+{
+    return ((mgng::NestedGBMPlatform::internal_display_clients_present) &&
+            (display == (MirMesaEGLNativeDisplay*)mgng::NestedGBMPlatform::internal_native_display.get()));
+}
+
+int mir_egl_mesa_display_is_valid(MirMesaEGLNativeDisplay* display)
+{
+    return mir_server_internal_display_is_valid(display);
+}
+}

=== added file 'src/server/graphics/nested_gbm/nested_gbm_platform.h'
--- src/server/graphics/nested_gbm/nested_gbm_platform.h	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/nested_gbm_platform.h	2013-07-09 13:08:27 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Eleni Maria Stea <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_NESTED_GBM_NESTED_GBM_PLATFORM_H_
+#define MIR_GRAPHICS_NESTED_GBM_NESTED_GBM_PLATFORM_H_
+
+#include "../gbm/gbm_display_helpers.h"
+#include "../gbm/internal_native_display.h"
+#include "../gbm/internal_client.h"
+
+#include "mir/graphics/platform.h"
+#include "mir/graphics/drm_authenticator.h"
+#include "mir_toolkit/mesa/native_display.h"
+
+namespace mggh = mir::graphics::gbm::helpers;
+namespace mgg = mir::graphics::gbm;
+namespace mg = mir::graphics;
+
+namespace mir
+{
+namespace graphics
+{
+std::shared_ptr<Platform> create_platform(std::shared_ptr<DisplayReport> const& display_report);
+
+namespace nested_gbm
+{
+
+class NestedGBMPlatform : public Platform,
+    public DRMAuthenticator,
+    public std::enable_shared_from_this<NestedGBMPlatform>
+{
+public:
+    explicit NestedGBMPlatform(std::shared_ptr<DisplayReport>const& report);
+    virtual ~NestedGBMPlatform();
+
+    /* from Platform */
+    std::shared_ptr<compositor::GraphicBufferAllocator> create_buffer_allocator(
+            const std::shared_ptr<BufferInitializer>& buffer_initializer);
+
+    std::shared_ptr<Display> create_display();
+    std::shared_ptr<PlatformIPCPackage> get_ipc_package();
+    std::shared_ptr<mg::InternalClient> create_internal_client();
+
+    void fill_ipc_package(std::shared_ptr<compositor::BufferIPCPacker> const& packer,
+            std::shared_ptr<compositor::Buffer> const& buffer) const;
+
+    /* from DrmAuthenticator */
+    void drm_auth_magic(drm_magic_t magic);
+
+    mggh::UdevHelper udev;
+    mggh::DRMHelper drm;
+    mggh::GBMHelper gbm;
+
+    std::shared_ptr<DisplayReport> const display_report;
+
+    //connection shared by all internal clients
+    static bool internal_display_clients_present;
+    static std::shared_ptr<mgg::InternalNativeDisplay> internal_native_display;
+
+    //TODO
+    MirConnection* nm_connection;
+};
+
+}
+}
+}
+
+#endif /* MIR_GRAPHICS_NESTED_GBM_NESTED_GBM_PLATFORM_H_ */

=== added file 'src/server/graphics/nested_gbm/nested_gbm_surface_store.cpp'
--- src/server/graphics/nested_gbm/nested_gbm_surface_store.cpp	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/nested_gbm_surface_store.cpp	2013-07-09 13:08:27 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Eleni Maria Stea <[e-mail]>
+ */
+
+#include "nested_gbm_surface_store.h"
+
+#include <boost/throw_exception.hpp>
+#include <stdexcept>
+
+EGLSurfaceStore::EGLSurfaceStore(EGLDisplay egl_display, EGLSurface egl_surface) :
+    egl_display_{egl_display},
+    egl_surface_{egl_surface}
+{
+    if (egl_surface_ == EGL_NO_SURFACE)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Could not create egl surface\n"));
+}
+
+EGLSurfaceStore::~EGLSurfaceStore()
+{
+    eglDestroySurface(egl_display_, egl_surface_);
+}
+
+EGLSurfaceStore::operator EGLSurface() const
+{
+    return egl_surface_;
+}

=== added file 'src/server/graphics/nested_gbm/nested_gbm_surface_store.h'
--- src/server/graphics/nested_gbm/nested_gbm_surface_store.h	1970-01-01 00:00:00 +0000
+++ src/server/graphics/nested_gbm/nested_gbm_surface_store.h	2013-07-09 13:08:27 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Eleni Maria Stea <[e-mail]>
+ */
+
+#ifndef NESTED_GBM_SURFACE_STORE_H_
+#define NESTED_GBM_SURFACE_STORE_H_
+
+#include <EGL/egl.h>
+
+namespace
+{
+
+class EGLSurfaceStore
+{
+public:
+    EGLSurfaceStore(EGLDisplay egl_display, EGLSurface egl_surface);
+    virtual ~EGLSurfaceStore() noexcept;
+
+    operator EGLSurface() const;
+private:
+    EGLSurfaceStore(EGLSurfaceStore const&) = delete;
+    EGLSurfaceStore& operator=(EGLSurfaceStore const&) = delete;
+    EGLDisplay const egl_display_;
+    EGLSurface const egl_surface_;
+};
+
+}
+
+#endif /* NESTED_GBM_SURFACE_STORE_H_ */

=== modified file 'src/server/run_mir.cpp'
--- src/server/run_mir.cpp	2013-04-24 05:22:20 +0000
+++ src/server/run_mir.cpp	2013-07-09 13:08:27 +0000
@@ -38,6 +38,7 @@
         });
 
     DisplayServer server(config);
+
     server_ptr = &server;
 
     init(server);