Merge lp:~vanvugt/mir/fix-1480755 into lp:mir

[Daniel van Vugt]

Just fix the EGL demos to get back support for bypass/overlays.
(LP: #1480755)

We're getting sub-optimal pixel formats from the new function designed to choose the right one for you. Unfortunately that's not the root of the problem. The root of the problem is Mesa failing to return all the visuals it is capable of. RAOF says he thinks it's feasible to fix Mesa, and that sounds like the right fix to aim for, eventually.

In the mean time a simple workaround for Mir's demo clients achieves the same thing.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2807
http://jenkins.qa.ubuntu.com/job/mir-ci/4467/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3393
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/920
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3341
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/616/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3341
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3341/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6130
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22300

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

lgtm for a workaround until the mesa fix is in

review: Approve

[Chris Halse Rogers (raof)]

Sure

review: Approve

[Chris Halse Rogers (raof)]

(CI failure should be fixed on trunk, so TAing)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1739/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3409
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/937
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3357/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/292
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/292/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3357
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3357/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6146/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22328

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Fetched 10.9 MB in 21s (514 kB/s)
E: Failed to fetch http://ports.ubuntu.com/ubuntu-ports/pool/universe/g/gcc-4.8/gcc-4.8-base_4.8.4-3ubuntu1_armhf.deb Temporary failure resolving 'ports.ubuntu.com'

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2015-07-16 08:13:28 +0000
+++ examples/eglapp.c	2015-08-04 07:36:50 +0000
@@ -346,6 +346,7 @@
     ok = eglInitialize(egldisplay, NULL, NULL);
     CHECK(ok, "Can't eglInitialize");
 
+    EGLint alpha_bits = mir_eglapp_background_opacity == 1.0f ? 0 : rgb_bits;
     const EGLint attribs[] =
     {
         EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
@@ -354,7 +355,7 @@
         EGL_RED_SIZE, rgb_bits,
         EGL_GREEN_SIZE, rgb_bits,
         EGL_BLUE_SIZE, rgb_bits,
-        EGL_ALPHA_SIZE, mir_eglapp_background_opacity == 1.0f ? 0 : rgb_bits,
+        EGL_ALPHA_SIZE, alpha_bits,
         EGL_NONE
     };
 
@@ -365,7 +366,22 @@
     MirPixelFormat pixel_format =
         mir_connection_get_egl_pixel_format(connection, egldisplay, eglconfig);
 
-    printf("Using Mir pixel format %d.\n", pixel_format);
+    printf("Mir chose pixel format %d.\n", pixel_format);
+    if (alpha_bits == 0)
+    {
+        /*
+         * If we are opaque then it's OK to switch pixel format slightly,
+         * to enable bypass/overlays to work. Otherwise the presence of an
+         * alpha channel would prevent them from being used.
+         * It would be really nice if Mesa just gave us the right answer in
+         * the first place though. (LP: #1480755)
+         */
+        if (pixel_format == mir_pixel_format_abgr_8888)
+            pixel_format = mir_pixel_format_xbgr_8888;
+        else if (pixel_format == mir_pixel_format_argb_8888)
+            pixel_format = mir_pixel_format_xrgb_8888;
+    }
+    printf("Using pixel format %d.\n", pixel_format);
 
     /* eglapps are interested in the screen size, so
        use mir_connection_create_display_config */