Merge lp:~andreas-pokorny/mir/fix-1272041 into lp:mir

[Andreas Pokorny]

Workaround for N4 nested server issue. This change removes mir_pixel_format_bgr_888 - HAL_PIXEL_FORMAT_RGB_888 from the list of supported pixel formats on android. (LP:#1272041)

Workaround for N4 nested server issue. This change removes mir_pixel_format_bgr_888 & HAL_PIXEL_FORMAT_RGB_888 from the list of supported pixel formats on android.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1353
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/720/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/723
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/450
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/450/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/454
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/454/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/325
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/325/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/337
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3316

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Is it a problem that ABGR comes before XBGR? Or will code elsewhere still prioritize XBGR first?

review: Needs Information

[Daniel van Vugt (vanvugt)]

Regardless of the answer to my question, this won't make it any worse :)

review: Approve

[Andreas Pokorny (andreas-pokorny)]

> Is it a problem that ABGR comes before XBGR? Or will code elsewhere still
> prioritize XBGR first?

Yes we have unit tests that test the default display configuration policies with cases like that. I.e. unless the current format is not already opaque it picks the first opaque format form the list of available ones. Hence when you really want to go for transparency you have to decorate/replace it and fore the format you want.

[Alan Griffiths (alan-griffiths)]

OK as workaround. But it seems like we should not be hard coding the supported pixel formats.

review: Approve

[Kevin DuBois (kdub)]

I'm working getting the android display configuration a bit cleaner, and we should pick up the actual display format instead of just hardcoding

=== modified file 'src/platform/graphics/android/android_display_configuration.cpp'
--- src/platform/graphics/android/android_display_configuration.cpp	2014-01-14 07:16:04 +0000
+++ src/platform/graphics/android/android_display_configuration.cpp	2014-01-23 22:13:35 +0000
@@ -26,7 +26,6 @@
                         mg::DisplayConfigurationOutputType::lvds,
                         {
                             mir_pixel_format_abgr_8888,
-                            mir_pixel_format_bgr_888,
                             mir_pixel_format_xbgr_8888
                         },
                         {mg::DisplayConfigurationMode{display_size,0.0f}},