Merge lp:~afrantzis/mir/fix-1486535-emulator-failures into lp:mir

[Alexandros Frantzis]

Fix Mir failures on the ubuntu-touch emulator
(LP: #1486535)

Fix Mir failures on the ubuntu-touch emulator

This MP consists of the parts/commits.

The main fix:

"android: Report the display configuration correctly on HWC 1.0 systems"

and a workaround for what seems to be a bug in the emulator EGL implementation:

"examples: Don't specify EGL_COLOR_BUFFER_TYPE EGL attribute

Specifying EGL_COLOR_BUFFER_TYPE seems to confuse the ubuntu-touch
emulator EGL implementation, causing it to not find any matching
EGLConfigs. This seems like a bug in the EGL implementation.

In any case, setting this attribute to EGL_RGB_BUFFER is not actually
needed since that's the default value."

This is a candidate for backporting to 0.14.x (to be used in OTA6).

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2856
http://jenkins.qa.ubuntu.com/job/mir-ci/4618/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3582
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2493
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3532
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/767
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/767/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3532
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3532/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6305
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22688

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

The EGL bit looks wrong. That's been there forever so it seems like the actual bug is a regression in the emulator. We should be fixing the emulator instead.

review: Needs Information

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2015-08-06 03:17:35 +0000
+++ examples/eglapp.c	2015-08-19 17:16:28 +0000
@@ -351,7 +351,6 @@
     {
         EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
         EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-        EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER,
         EGL_RED_SIZE, rgb_bits,
         EGL_GREEN_SIZE, rgb_bits,
         EGL_BLUE_SIZE, rgb_bits,

=== modified file 'src/platforms/android/server/fb_device.cpp'
--- src/platforms/android/server/fb_device.cpp	2015-07-21 04:30:03 +0000
+++ src/platforms/android/server/fb_device.cpp	2015-08-19 17:16:28 +0000
@@ -53,10 +53,12 @@
         fb_device->enableScreen(fb_device.get(), enable);
 }
 
-mg::DisplayConfigurationOutput mga::FbControl::active_config_for(DisplayName)
+mg::DisplayConfigurationOutput mga::FbControl::active_config_for(DisplayName display_name)
 {
+    auto const connected = (display_name == DisplayName::primary);
+
     return {
-        mg::DisplayConfigurationOutputId{0},
+        static_cast<mg::DisplayConfigurationOutputId>(display_name),
         mg::DisplayConfigurationCardId{0},
         mg::DisplayConfigurationOutputType::lvds,
         std::vector<MirPixelFormat>{mga::to_mir_format(fb_device->format)},
@@ -65,11 +67,11 @@
         },
         0,
         {0,0},
-        true,
-        false,
+        connected,
+        connected,
         {0,0},
         0,
-        mir_pixel_format_abgr_8888,
+        mga::to_mir_format(fb_device->format),
         mir_power_mode_on,
         mir_orientation_normal
     };

=== modified file 'tests/unit-tests/graphics/android/test_fb_device.cpp'
--- tests/unit-tests/graphics/android/test_fb_device.cpp	2015-06-26 09:52:00 +0000
+++ tests/unit-tests/graphics/android/test_fb_device.cpp	2015-08-19 17:16:28 +0000
@@ -146,3 +146,30 @@
     EXPECT_EQ(display_size, attribs.modes[attribs.current_mode_index].size);
     EXPECT_EQ(mir_pixel_format_abgr_8888, attribs.current_format);
 }
+
+TEST_F(FBDevice, supports_primary_display)
+{
+    mga::FbControl fb_control(fb_hal_mock);
+    auto const primary = fb_control.active_config_for(mga::DisplayName::primary);
+
+    EXPECT_TRUE(primary.connected);
+    EXPECT_TRUE(primary.used);
+}
+
+TEST_F(FBDevice, does_not_support_external_display)
+{
+    mga::FbControl fb_control(fb_hal_mock);
+    auto const external = fb_control.active_config_for(mga::DisplayName::external);
+
+    EXPECT_FALSE(external.connected);
+    EXPECT_FALSE(external.used);
+}
+
+TEST_F(FBDevice, assigns_different_output_ids_to_displays)
+{
+    mga::FbControl fb_control(fb_hal_mock);
+    auto const primary = fb_control.active_config_for(mga::DisplayName::primary);
+    auto const external = fb_control.active_config_for(mga::DisplayName::external);
+
+    EXPECT_NE(primary.id, external.id);
+}