Merge lp:~alan-griffiths/mir/multiwin-fix-for-nested into lp:mir

[Alan Griffiths]

graphics: fix nested to use opaque buffers for output

graphics: fix nested to use opaque buffers for output

This fixes a problem best seen with ./mir_demo_client_multiwin (where the windows appear invisible unless the alpha is cranked way up in the sourcecode).

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Daniel van Vugt (vanvugt)]

I'm concerned we're pulling egl_context_attribs from a different file (nested_output.cpp/h) but it's not clear from the name. You should either retain a local attrib list or name the shared one in a way that makes it more obvious where it's coming from. Maybe use the word "nested".

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1068
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2000
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1885
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/2/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/server/graphics/nested/nested_display.cpp'
--- src/server/graphics/nested/nested_display.cpp	2013-09-12 13:13:23 +0000
+++ src/server/graphics/nested/nested_display.cpp	2013-09-13 15:54:49 +0000
@@ -66,22 +66,7 @@
         BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir Display Error: Failed to initialize EGL."));
     }
 
-    static const EGLint context_attr[] = {
-        EGL_CONTEXT_CLIENT_VERSION, 2,
-        EGL_NONE
-    };
-
-    static const EGLint config_attr[] = {
-        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-        EGL_RED_SIZE, 8,
-        EGL_GREEN_SIZE, 8,
-        EGL_BLUE_SIZE, 8,
-        EGL_ALPHA_SIZE, 0,
-        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-        EGL_NONE
-    };
-
-    egl_context_ = eglCreateContext(egl_display, choose_config(config_attr), EGL_NO_CONTEXT, context_attr);
+    egl_context_ = eglCreateContext(egl_display, choose_config(egl_attribs), EGL_NO_CONTEXT, egl_context_attribs);
     if (egl_context_ == EGL_NO_CONTEXT)
         BOOST_THROW_EXCEPTION(std::runtime_error("Failed to create shared EGL context"));
 }
@@ -125,11 +110,30 @@
     event_handler{event_handler},
     display_report{display_report},
     egl_display{*connection},
+    egl_pixel_format{mir_pixel_format_xbgr_8888},
     outputs{}
 {
     egl_display.initialize();
     eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, egl_display.egl_context());
     configure(*configuration());
+
+
+    static unsigned const max_formats = 32;
+    MirPixelFormat formats[max_formats];
+    unsigned int valid_formats;
+
+    mir_connection_get_available_surface_formats(*connection, formats, max_formats, &valid_formats);
+
+    // Find an opaque buffer format
+    for (auto f = formats; f != formats+valid_formats; ++f)
+    {
+        if (*f == mir_pixel_format_xbgr_8888 ||
+            *f == mir_pixel_format_xrgb_8888)
+        {
+            egl_pixel_format = *f;
+            break;
+        }
+    }
 }
 
 mgn::NestedDisplay::~NestedDisplay() noexcept
@@ -163,14 +167,13 @@
                 geometry::Rectangle const area{output.top_left, output.modes[output.current_mode_index].size};
 
                 auto const& egl_display_mode = output.modes[output.current_mode_index];
-                auto const egl_display_format = output.pixel_formats[output.current_format_index];
 
                 MirSurfaceParameters const request_params =
                     {
                         "Mir nested display",
                         egl_display_mode.size.width.as_int(),
                         egl_display_mode.size.height.as_int(),
-                        MirPixelFormat(egl_display_format),
+                        egl_pixel_format,
                         mir_buffer_usage_hardware,
                         static_cast<uint32_t>(output.id.as_value())
                     };

=== modified file 'src/server/graphics/nested/nested_display.h'
--- src/server/graphics/nested/nested_display.h	2013-09-12 13:13:23 +0000
+++ src/server/graphics/nested/nested_display.h	2013-09-13 15:54:49 +0000
@@ -121,6 +121,7 @@
     std::shared_ptr<input::EventFilter> const event_handler;
     std::shared_ptr<DisplayReport> const display_report;
     detail::EGLDisplayHandle egl_display;
+    MirPixelFormat egl_pixel_format;
 
     std::mutex outputs_mutex;
     std::unordered_map<DisplayConfigurationOutputId, std::shared_ptr<detail::NestedOutput>> outputs;

=== modified file 'src/server/graphics/nested/nested_output.cpp'
--- src/server/graphics/nested/nested_output.cpp	2013-09-11 13:56:56 +0000
+++ src/server/graphics/nested/nested_output.cpp	2013-09-13 15:54:49 +0000
@@ -42,7 +42,7 @@
     EGL_RED_SIZE, 8,
     EGL_GREEN_SIZE, 8,
     EGL_BLUE_SIZE, 8,
-    EGL_ALPHA_SIZE, 8,
+    EGL_ALPHA_SIZE, 0,
     EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
     EGL_NONE
 };