Merge lp:~vanvugt/mir/unwanted-alpha into lp:mir

[Daniel van Vugt]

Extend mir_connection_get_egl_pixel_format to take additional hints
from the client's requested attribute list. This way the existence
of an alpha channel (chosen by the driver but unwanted by the client)
doesn't force Mir into a slower compositing mode (LP: #1480755).

I could have just hacked examples/eglapp.c and declared the bug fixed, but that would not suffice for other toolkits (particularly games). So this more long-winded solution solves the problem for everyone.

I also investigated the possibility that our dumb demo code was simply not finding the best EGLConfig by virtue of always truncating the list of configs to length one. But even if you look at the full list, the problem is present for every available EGLConfig (EGL_ALPHA_SIZE==8 even when I didn't ask for it).

Annoyingly the first version of mir_connection_get_egl_pixel_format
is actually returning the right result (the pixel format the driver
is using) so there's nothing immediately obvious to fix. But the right
pixel format is not necessarily the fastest one. If we can see the
client hasn't asked for an alpha channel then we should disable the
alpha channel. This way composite bypass can still be used on platforms
that always return an alpha channel (e.g. Mesa on Haswell always returns EGL_ALPHA_SIZE==8).

I'm fairly sure we only want to fix this on Mesa where the bug was
found. On Android we have a greater chance of supporting translucent
overlays in future so don't want to (and don't need to) use as big a
hammer (see TODOs in hwc_layerlist.cpp).

[Alan Griffiths (alan-griffiths)]

395 +TEST_F(MesaClientPlatformTest, takes_opacity_hint_from_attribs)

This test checks for the correct result in several different scenarios (multiple unrelated EXPECT_EQs). I'd prefer a test for each of them.

review: Abstain

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2809
http://jenkins.qa.ubuntu.com/job/mir-ci/4460/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3382
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/908
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/609
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/609/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3330
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6121
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22278

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

+1 to separating out the test into its different expectations, but lgtm otherwise

review: Approve

[Daniel van Vugt (vanvugt)]

Chris suggested today that we should just fix Mesa instead. If Mesa returned RGBA of 8880 instead of 8888 when we are asking for 8880, then there would not be a bug to fix.

review: Needs Information

Unmerged revisions

2809. By Daniel van Vugt on 2015-08-03

Bump the client platform ABI, since it's now broken.

2808. By Daniel van Vugt on 2015-08-03

Restore ABI backward-compatibility

2807. By Daniel van Vugt on 2015-08-03

Extend the tests further

2806. By Daniel van Vugt on 2015-08-03

Enable the fix. Tests now pass.

2805. By Daniel van Vugt on 2015-08-03

Fix the test. Copy and paste stupidity.

2804. By Daniel van Vugt on 2015-08-03

Disable the fix and write some regression tests.

2803. By Daniel van Vugt on 2015-08-03

First working prototype

=== modified file 'debian/control'
--- debian/control	2015-07-28 22:27:27 +0000
+++ debian/control	2015-08-03 08:59:59 +0000
@@ -314,7 +314,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Android drivers.
 
-Package: mir-client-platform-mesa3
+Package: mir-client-platform-mesa4
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -342,7 +342,7 @@
  Contains header files required to use the platform specific capabilities of
  the Mir Mesa backend.
 
-Package: mir-client-platform-android3
+Package: mir-client-platform-android4
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
@@ -363,7 +363,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          mir-platform-graphics-mesa-kms4,
-         mir-client-platform-mesa3,
+         mir-client-platform-mesa4,
 Description: Display server for Ubuntu - desktop driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -378,7 +378,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          mir-platform-graphics-android4,
-         mir-client-platform-android3,
+         mir-client-platform-android4,
 Description: Display server for Ubuntu - android driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.

=== renamed file 'debian/mir-client-platform-android3.install' => 'debian/mir-client-platform-android4.install'
--- debian/mir-client-platform-android3.install	2015-07-17 06:29:44 +0000
+++ debian/mir-client-platform-android4.install	2015-08-03 08:59:59 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/client-platform/android.so.3
+usr/lib/*/mir/client-platform/android.so.4

=== renamed file 'debian/mir-client-platform-mesa3.install' => 'debian/mir-client-platform-mesa4.install'
--- debian/mir-client-platform-mesa3.install	2015-07-17 06:29:44 +0000
+++ debian/mir-client-platform-mesa4.install	2015-08-03 08:59:59 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/client-platform/mesa.so.3
+usr/lib/*/mir/client-platform/mesa.so.4

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2015-07-16 08:13:28 +0000
+++ examples/eglapp.c	2015-08-03 08:59:59 +0000
@@ -363,7 +363,8 @@
     CHECK(neglconfigs > 0, "No EGL config available");
 
     MirPixelFormat pixel_format =
-        mir_connection_get_egl_pixel_format(connection, egldisplay, eglconfig);
+        mir_connection_get_egl_pixel_format(connection, egldisplay, eglconfig,
+                                            attribs);
 
     printf("Using Mir pixel format %d.\n", pixel_format);
 

=== modified file 'examples/scroll.cpp'
--- examples/scroll.cpp	2015-07-14 08:30:45 +0000
+++ examples/scroll.cpp	2015-08-03 08:59:59 +0000
@@ -66,7 +66,8 @@
     assert(n == 1);
 
     MirPixelFormat pixel_format =
-        mir_connection_get_egl_pixel_format(connection, disp, egl_config);
+        mir_connection_get_egl_pixel_format(connection, disp, egl_config,
+                                            attribs);
 
     printf("Mir chose pixel format %d\n", pixel_format);
 

=== modified file 'include/client/mir_toolkit/mir_connection.h'
--- include/client/mir_toolkit/mir_connection.h	2015-07-29 09:35:16 +0000
+++ include/client/mir_toolkit/mir_connection.h	2015-08-03 08:59:59 +0000
@@ -189,10 +189,15 @@
  *   \param [in] connection  The connection
  *   \param [in] egldisplay  The EGLDisplay for the given config
  *   \param [in] eglconfig   The EGLConfig you have chosen to use
+ *   \param [in] attribs     (Optional) The attribute list used to choose the
+ *                           above eglconfig (or NULL). If provided, this may
+ *                           allow Mir to choose a higher performing pixel
+ *                           format.
  *   \return                 The MirPixelFormat to use in surface creation
  */
 MirPixelFormat mir_connection_get_egl_pixel_format(
-    MirConnection *connection, void *egldisplay, void *eglconfig);
+    MirConnection *connection, void *egldisplay, void *eglconfig,
+    int const* attribs);
 
 /**
  * Get the list of possible formats that a surface can be created with.

=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2015-07-29 17:32:39 +0000
+++ src/client/mir_connection.cpp	2015-08-03 08:59:59 +0000
@@ -523,10 +523,11 @@
     return *native_display;
 }
 
-MirPixelFormat MirConnection::egl_pixel_format(EGLDisplay disp, EGLConfig conf) const
+MirPixelFormat MirConnection::egl_pixel_format(EGLDisplay disp, EGLConfig conf,
+                                               EGLint const* attribs) const
 {
     std::lock_guard<decltype(mutex)> lock(mutex);
-    return platform->get_egl_pixel_format(disp, conf);
+    return platform->get_egl_pixel_format(disp, conf, attribs);
 }
 
 void MirConnection::on_stream_created(int id, mcl::ClientBufferStream* stream)

=== modified file 'src/client/mir_connection.h'
--- src/client/mir_connection.h	2015-07-29 17:32:39 +0000
+++ src/client/mir_connection.h	2015-08-03 08:59:59 +0000
@@ -152,7 +152,8 @@
     static bool is_valid(MirConnection *connection);
 
     EGLNativeDisplayType egl_native_display();
-    MirPixelFormat       egl_pixel_format(EGLDisplay, EGLConfig) const;
+    MirPixelFormat       egl_pixel_format(EGLDisplay, EGLConfig,
+                                          EGLint const*) const;
 
     void on_surface_created(int id, MirSurface* surface);
     void on_stream_created(int id, mir::client::ClientBufferStream* stream);

=== modified file 'src/client/mir_connection_api.cpp'
--- src/client/mir_connection_api.cpp	2015-07-25 08:10:48 +0000
+++ src/client/mir_connection_api.cpp	2015-08-03 08:59:59 +0000
@@ -253,12 +253,24 @@
     return connection->egl_native_display();
 }
 
-MirPixelFormat mir_connection_get_egl_pixel_format(MirConnection* connection,
+extern "C" {
+
+__asm__(".symver mir_connection_get_egl_pixel_format4,mir_connection_get_egl_pixel_format@@MIR_CLIENT_9.2");
+MirPixelFormat mir_connection_get_egl_pixel_format4(MirConnection* connection,
+    EGLDisplay disp, EGLConfig conf, EGLint const* attribs)
+{
+    return connection->egl_pixel_format(disp, conf, attribs);
+}
+
+__asm__(".symver mir_connection_get_egl_pixel_format3,mir_connection_get_egl_pixel_format@MIR_CLIENT_9.1");
+MirPixelFormat mir_connection_get_egl_pixel_format3(MirConnection* connection,
     EGLDisplay disp, EGLConfig conf)
 {
-    return connection->egl_pixel_format(disp, conf);
+    return mir_connection_get_egl_pixel_format4(connection, disp, conf, nullptr);
 }
 
+} // extern "C"
+
 void mir_connection_get_available_surface_formats(
     MirConnection* connection,
     MirPixelFormat* formats,

=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2015-07-28 02:44:07 +0000
+++ src/client/symbols.map	2015-08-03 08:59:59 +0000
@@ -172,10 +172,16 @@
     mir_touch_event_input_event;
     mir_surface_spec_attach_to_foreign_parent;
     mir_surface_spec_set_input_shape;
-    mir_connection_get_egl_pixel_format;
+    mir_connection_get_egl_pixel_format;   # 3 parameter version
   local: *;
 } MIR_CLIENT_9;
 
+MIR_CLIENT_9.2 {  # New functions in Mir 0.16
+  global:
+    mir_connection_get_egl_pixel_format;   # 4 parameter version
+  local: *;
+} MIR_CLIENT_9.1;
+
 MIR_CLIENT_DETAIL_9 {
   global:
     extern "C++" { 

=== modified file 'src/include/client/mir/client_platform.h'
--- src/include/client/mir/client_platform.h	2015-07-13 10:10:42 +0000
+++ src/include/client/mir/client_platform.h	2015-08-03 08:59:59 +0000
@@ -65,7 +65,8 @@
     virtual std::shared_ptr<EGLNativeWindowType> create_egl_native_window(EGLNativeSurface *surface) = 0;
     virtual std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() = 0;
     virtual MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const = 0;
-    virtual MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const = 0;
+    virtual MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig,
+                                                EGLint const*) const = 0;
 };
 
 }

=== modified file 'src/platforms/CMakeLists.txt'
--- src/platforms/CMakeLists.txt	2015-07-23 02:39:20 +0000
+++ src/platforms/CMakeLists.txt	2015-08-03 08:59:59 +0000
@@ -20,7 +20,7 @@
   PARENT_SCOPE
 )
 
-set(MIR_CLIENT_PLATFORM_ABI 3)
+set(MIR_CLIENT_PLATFORM_ABI 4)
 set(MIR_CLIENT_PLATFORM_ABI ${MIR_CLIENT_PLATFORM_ABI} PARENT_SCOPE)
 set(MIR_CLIENT_PLATFORM_VERSION "MIR_CLIENT_PLATFORM_${MIR_CLIENT_PLATFORM_ABI}")
 set(MIR_CLIENT_PLATFORM_VERSION ${MIR_CLIENT_PLATFORM_VERSION} PARENT_SCOPE)

=== modified file 'src/platforms/android/client/android_client_platform.cpp'
--- src/platforms/android/client/android_client_platform.cpp	2015-07-21 04:30:03 +0000
+++ src/platforms/android/client/android_client_platform.cpp	2015-08-03 08:59:59 +0000
@@ -138,7 +138,7 @@
     __attribute__((weak));
 
 MirPixelFormat mcla::AndroidClientPlatform::get_egl_pixel_format(
-    EGLDisplay disp, EGLConfig conf) const
+    EGLDisplay disp, EGLConfig conf, EGLint const*) const
 {
     MirPixelFormat mir_format = mir_pixel_format_invalid;
 

=== modified file 'src/platforms/android/client/android_client_platform.h'
--- src/platforms/android/client/android_client_platform.h	2015-07-13 10:10:42 +0000
+++ src/platforms/android/client/android_client_platform.h	2015-08-03 08:59:59 +0000
@@ -40,7 +40,8 @@
     std::shared_ptr<EGLNativeWindowType> create_egl_native_window(EGLNativeSurface *surface) override;
     std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
     MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;
-    MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
+    MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig,
+                                        EGLint const*) const override;
 
 private:
     ClientContext* const context;

=== modified file 'src/platforms/android/client/symbols.map'
--- src/platforms/android/client/symbols.map	2015-07-17 06:31:02 +0000
+++ src/platforms/android/client/symbols.map	2015-08-03 08:59:59 +0000
@@ -1,4 +1,4 @@
-MIR_CLIENT_PLATFORM_3 {
+MIR_CLIENT_PLATFORM_4 {
   global:
     create_client_platform;
     is_appropriate_module;

=== modified file 'src/platforms/mesa/client/client_platform.cpp'
--- src/platforms/mesa/client/client_platform.cpp	2015-07-17 08:08:44 +0000
+++ src/platforms/mesa/client/client_platform.cpp	2015-08-03 08:59:59 +0000
@@ -193,10 +193,25 @@
     __attribute__((weak));
 
 MirPixelFormat mclm::ClientPlatform::get_egl_pixel_format(
-    EGLDisplay disp, EGLConfig conf) const
+    EGLDisplay disp, EGLConfig conf, EGLint const* attribs) const
 {
     MirPixelFormat mir_format = mir_pixel_format_invalid;
 
+    bool force_opaque = false;  // Don't guess attribs if unavailable
+    if (attribs)
+    {
+        // Optimize our choice of pixel format for the best chance of enabling
+        // composite bypass/overlays... (LP: #1480755)
+        force_opaque = true;
+        EGLint const* a = attribs;
+        while (a[0] != EGL_NONE)
+        {
+            if (a[0] == EGL_ALPHA_SIZE && a[1] > 0)
+                force_opaque = false;
+            a += 2;
+        }
+    }
+
     /*
      * This is based on gbm_dri_is_format_supported() however we can't call it
      * via the public API gbm_device_is_format_supported because that is
@@ -217,7 +232,8 @@
     {
         // GBM is very limited, which at least makes this simple...
         if (a == 8)
-            mir_format = mir_pixel_format_argb_8888;
+            mir_format = force_opaque ? mir_pixel_format_xrgb_8888 :
+                                        mir_pixel_format_argb_8888;
         else if (a == 0)
             mir_format = mir_pixel_format_xrgb_8888;
     }

=== modified file 'src/platforms/mesa/client/client_platform.h'
--- src/platforms/mesa/client/client_platform.h	2015-07-13 10:10:42 +0000
+++ src/platforms/mesa/client/client_platform.h	2015-08-03 08:59:59 +0000
@@ -48,7 +48,8 @@
     std::shared_ptr<EGLNativeWindowType> create_egl_native_window(EGLNativeSurface *surface) override;
     std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
     MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;
-    MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
+    MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig,
+                                        EGLint const*) const override;
 
 private:
     ClientContext* const context;

=== modified file 'src/platforms/mesa/client/symbols.map'
--- src/platforms/mesa/client/symbols.map	2015-07-17 06:31:02 +0000
+++ src/platforms/mesa/client/symbols.map	2015-08-03 08:59:59 +0000
@@ -1,4 +1,4 @@
-MIR_CLIENT_PLATFORM_3 {
+MIR_CLIENT_PLATFORM_4 {
   global:
     create_client_platform;
     is_appropriate_module;

=== modified file 'tests/acceptance-tests/test_client_library_errors.cpp'
--- tests/acceptance-tests/test_client_library_errors.cpp	2015-07-22 02:54:31 +0000
+++ tests/acceptance-tests/test_client_library_errors.cpp	2015-08-03 08:59:59 +0000
@@ -104,7 +104,8 @@
         BOOST_THROW_EXCEPTION(std::runtime_error{exception_text});
         return nullptr;
     }
-    MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override
+    MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig,
+                                        EGLint const*) const override
     {
         return mir_pixel_format_invalid;
     }

=== modified file 'tests/mir_test_framework/stub_client_platform_factory.cpp'
--- tests/mir_test_framework/stub_client_platform_factory.cpp	2015-07-17 07:07:33 +0000
+++ tests/mir_test_framework/stub_client_platform_factory.cpp	2015-08-03 08:59:59 +0000
@@ -84,7 +84,8 @@
 #endif
     }
 
-    MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override
+    MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig,
+                                        EGLint const*) const override
     {
         return mir_pixel_format_argb_8888;
     }

=== modified file 'tests/mir_test_framework/symbols-client.map'
--- tests/mir_test_framework/symbols-client.map	2015-07-17 06:44:08 +0000
+++ tests/mir_test_framework/symbols-client.map	2015-08-03 08:59:59 +0000
@@ -1,4 +1,4 @@
-MIR_CLIENT_PLATFORM_3 {
+MIR_CLIENT_PLATFORM_4 {
   global: 
     create_client_platform;
     is_appropriate_module;

=== modified file 'tests/unit-tests/client/android/test_android_client_platform.cpp'
--- tests/unit-tests/client/android/test_android_client_platform.cpp	2015-07-16 10:11:49 +0000
+++ tests/unit-tests/client/android/test_android_client_platform.cpp	2015-08-03 08:59:59 +0000
@@ -74,8 +74,12 @@
         .WillOnce(DoAll(SetArgPointee<3>(0),
                         Return(EGL_FALSE)));
 
-    EXPECT_EQ(mir_pixel_format_rgb_565, platform->get_egl_pixel_format(d, c));
-    EXPECT_EQ(mir_pixel_format_rgb_888, platform->get_egl_pixel_format(d, c));
-    EXPECT_EQ(mir_pixel_format_argb_8888, platform->get_egl_pixel_format(d, c));
-    EXPECT_EQ(mir_pixel_format_invalid, platform->get_egl_pixel_format(d, c));
+    EXPECT_EQ(mir_pixel_format_rgb_565,
+              platform->get_egl_pixel_format(d, c, nullptr));
+    EXPECT_EQ(mir_pixel_format_rgb_888,
+              platform->get_egl_pixel_format(d, c, nullptr));
+    EXPECT_EQ(mir_pixel_format_argb_8888,
+              platform->get_egl_pixel_format(d, c, nullptr));
+    EXPECT_EQ(mir_pixel_format_invalid,
+              platform->get_egl_pixel_format(d, c, nullptr));
 }

=== modified file 'tests/unit-tests/client/mesa/test_client_platform.cpp'
--- tests/unit-tests/client/mesa/test_client_platform.cpp	2015-07-16 10:45:52 +0000
+++ tests/unit-tests/client/mesa/test_client_platform.cpp	2015-08-03 08:59:59 +0000
@@ -147,7 +147,83 @@
         .WillOnce(DoAll(SetArgPointee<3>(0), Return(EGL_TRUE)))
         .WillOnce(DoAll(SetArgPointee<3>(666), Return(EGL_FALSE)));
 
-    EXPECT_EQ(mir_pixel_format_argb_8888, platform->get_egl_pixel_format(d, c));
-    EXPECT_EQ(mir_pixel_format_xrgb_8888, platform->get_egl_pixel_format(d, c));
-    EXPECT_EQ(mir_pixel_format_invalid, platform->get_egl_pixel_format(d, c));
+    EXPECT_EQ(mir_pixel_format_argb_8888,
+              platform->get_egl_pixel_format(d, c, nullptr));
+    EXPECT_EQ(mir_pixel_format_xrgb_8888,
+              platform->get_egl_pixel_format(d, c, nullptr));
+    EXPECT_EQ(mir_pixel_format_invalid,
+              platform->get_egl_pixel_format(d, c, nullptr));
+}
+
+TEST_F(MesaClientPlatformTest, takes_opacity_hint_from_attribs)
+{   // Regression test for LP: #1480755
+    using namespace testing;
+
+    auto const d = reinterpret_cast<EGLDisplay>(0x1234);
+    auto const c = reinterpret_cast<EGLConfig>(0x5678);
+
+    // Emulate the i915 Haswell driver which likes to return 8888 always
+    EXPECT_CALL(mock_egl, eglGetConfigAttrib(d, c, EGL_RED_SIZE, _))
+        .WillRepeatedly(DoAll(SetArgPointee<3>(8), Return(EGL_TRUE)));
+    EXPECT_CALL(mock_egl, eglGetConfigAttrib(d, c, EGL_GREEN_SIZE, _))
+        .WillRepeatedly(DoAll(SetArgPointee<3>(8), Return(EGL_TRUE)));
+    EXPECT_CALL(mock_egl, eglGetConfigAttrib(d, c, EGL_BLUE_SIZE, _))
+        .WillRepeatedly(DoAll(SetArgPointee<3>(8), Return(EGL_TRUE)));
+    EXPECT_CALL(mock_egl, eglGetConfigAttrib(d, c, EGL_ALPHA_SIZE, _))
+        .WillRepeatedly(DoAll(SetArgPointee<3>(8), Return(EGL_TRUE)));
+
+    EGLint const opaque_request[] =
+    {
+        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER,
+        EGL_RED_SIZE, 5,
+        EGL_GREEN_SIZE, 5,
+        EGL_BLUE_SIZE, 5,
+        EGL_ALPHA_SIZE, 0,
+        EGL_NONE
+    };
+    EXPECT_EQ(mir_pixel_format_xrgb_8888,
+              platform->get_egl_pixel_format(d, c, opaque_request));
+
+    EGLint const translucent_request[] =
+    {
+        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER,
+        EGL_RED_SIZE, 4,
+        EGL_GREEN_SIZE, 4,
+        EGL_BLUE_SIZE, 4,
+        EGL_ALPHA_SIZE, 4,
+        EGL_NONE
+    };
+    EXPECT_EQ(mir_pixel_format_argb_8888,
+              platform->get_egl_pixel_format(d, c, translucent_request));
+
+    EGLint const dontcare_request[] =
+    {
+        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER,
+        EGL_RED_SIZE, 5,
+        EGL_GREEN_SIZE, 5,
+        EGL_BLUE_SIZE, 5,
+        EGL_ALPHA_SIZE, EGL_DONT_CARE,
+        EGL_NONE
+    };
+    EXPECT_EQ(mir_pixel_format_xrgb_8888,
+              platform->get_egl_pixel_format(d, c, dontcare_request));
+
+    EGLint const missing_request[] =
+    {
+        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER,
+        EGL_RED_SIZE, 5,
+        EGL_GREEN_SIZE, 5,
+        EGL_BLUE_SIZE, 5,
+        EGL_NONE
+    };
+    EXPECT_EQ(mir_pixel_format_xrgb_8888,
+              platform->get_egl_pixel_format(d, c, missing_request));
 }

=== modified file 'tests/unit-tests/client/test_client_buffer_stream.cpp'
--- tests/unit-tests/client/test_client_buffer_stream.cpp	2015-07-28 23:05:14 +0000
+++ tests/unit-tests/client/test_client_buffer_stream.cpp	2015-08-03 08:59:59 +0000
@@ -103,7 +103,8 @@
     {
         return nullptr;
     }
-    MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override
+    MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig,
+                                        EGLint const*) const override
     {
         return mir_pixel_format_invalid;
     }

=== modified file 'tests/unit-tests/client/test_client_mir_surface.cpp'
--- tests/unit-tests/client/test_client_mir_surface.cpp	2015-07-29 01:39:52 +0000
+++ tests/unit-tests/client/test_client_mir_surface.cpp	2015-08-03 08:59:59 +0000
@@ -244,7 +244,8 @@
         return nullptr;
     }
 
-    MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override
+    MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig,
+                                        EGLint const*) const override
     {
         return mir_pixel_format_invalid;
     }

=== modified file 'tests/unit-tests/client/test_mir_connection.cpp'
--- tests/unit-tests/client/test_mir_connection.cpp	2015-07-29 01:39:52 +0000
+++ tests/unit-tests/client/test_mir_connection.cpp	2015-08-03 08:59:59 +0000
@@ -134,8 +134,8 @@
     MOCK_METHOD0(create_buffer_factory, std::shared_ptr<mcl::ClientBufferFactory>());
     MOCK_METHOD1(create_egl_native_window, std::shared_ptr<EGLNativeWindowType>(mcl::EGLNativeSurface*));
     MOCK_METHOD0(create_egl_native_display, std::shared_ptr<EGLNativeDisplayType>());
-    MOCK_CONST_METHOD2(get_egl_pixel_format,
-        MirPixelFormat(EGLDisplay, EGLConfig));
+    MOCK_CONST_METHOD3(get_egl_pixel_format,
+        MirPixelFormat(EGLDisplay, EGLConfig, EGLint const*));
 
     mcl::ClientContext* client_context = nullptr;
 };