Merge lp:~alan-griffiths/mir/a-surface-for-each-output into lp:~mir-team/mir/trunk

[Alan Griffiths]

graphics: hard-wire nested Mir to create an output for every host output

graphics: hard-wire nested Mir to create an output for every host output

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:992
http://jenkins.qa.ubuntu.com/job/mir-ci/1340/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/578
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/578/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Eleni Maria Stea (hikiko)]

It looks good :)

review: Approve

[Alexandros Frantzis (afrantzis)]

Looks good as an intermediate step.

Note that for proper mirrored mode support we will need to detect overlapping outputs and only use a single surface for them. The OverlappingOutputGrouping utility class used by the GBM backend for a similar purpose could help with this.

review: Approve

=== modified file 'src/server/graphics/nested/nested_display.cpp'
--- src/server/graphics/nested/nested_display.cpp	2013-08-20 16:34:28 +0000
+++ src/server/graphics/nested/nested_display.cpp	2013-08-20 16:34:28 +0000
@@ -22,7 +22,6 @@
 
 #include "mir/geometry/rectangle.h"
 
-#include <cstring>
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 
@@ -54,21 +53,25 @@
     MirDisplayConfigHandle operator=(MirDisplayConfigHandle const&) = delete;
 };
 
-std::shared_ptr<mgn::detail::NestedOutput> make_one_output(MirConnection* connection)
+auto configure_outputs(MirConnection* connection)
+-> std::unordered_map<uint32_t, std::shared_ptr<mgn::detail::NestedOutput>>
 {
     MirDisplayConfigHandle display_config{connection};
 
-    // TODO we may have multiple displays which implies multiple surfaces
-    // TODO as a POC just use the first active display
+    std::unordered_map<uint32_t, std::shared_ptr<mgn::detail::NestedOutput>> result;
+
     for (decltype(display_config->num_outputs) i = 0; i != display_config->num_outputs; ++i)
     {
         auto const egl_display_info = display_config->outputs+i;
 
         if (egl_display_info->used)
-            return std::make_shared<mgn::detail::NestedOutput>(connection, egl_display_info);
+        {
+            result[egl_display_info->output_id] =
+                std::make_shared<mgn::detail::NestedOutput>(connection, egl_display_info);
+        }
     }
 
-    BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir needs at least one display"));
+    return result;
 }
 
 EGLint const egl_attribs[] = {
@@ -100,7 +103,7 @@
             int(egl_display_mode->vertical_resolution),
             egl_display_format,
             mir_buffer_usage_hardware,
-            mir_display_output_id_invalid
+            egl_display_info->output_id
         };
 
     mir_surface = mir_connection_create_surface_sync(connection, &request_params);
@@ -184,8 +187,10 @@
 
 mgn::NestedDisplay::NestedDisplay(MirConnection* connection, std::shared_ptr<mg::DisplayReport> const& display_report) :
     display_report{display_report},
-    one_output{make_one_output(connection)}
+    outputs{configure_outputs(connection)}
 {
+    if (outputs.empty())
+        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir needs at least one output for display"));
 }
 
 mgn::NestedDisplay::~NestedDisplay() noexcept

=== modified file 'src/server/graphics/nested/nested_display.h'
--- src/server/graphics/nested/nested_display.h	2013-08-19 16:58:41 +0000
+++ src/server/graphics/nested/nested_display.h	2013-08-20 16:34:28 +0000
@@ -26,6 +26,8 @@
 
 #include <EGL/egl.h>
 
+#include <unordered_map>
+
 namespace mir
 {
 namespace geometry
@@ -125,9 +127,7 @@
 
 private:
     std::shared_ptr<DisplayReport> const display_report;
-
-    // TODO support multiple outputs
-    std::shared_ptr<detail::NestedOutput> const one_output;
+    std::unordered_map<uint32_t, std::shared_ptr<detail::NestedOutput>> outputs;
 };
 
 }