Merge lp://staging/~afrantzis/mir/fix-1486535-emulator-failures into lp://staging/mir
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Kevin DuBois | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2858 | ||||
Proposed branch: | lp://staging/~afrantzis/mir/fix-1486535-emulator-failures | ||||
Merge into: | lp://staging/mir | ||||
Diff against target: |
80 lines (+34/-6) 3 files modified
examples/eglapp.c (+0/-1) src/platforms/android/server/fb_device.cpp (+7/-5) tests/unit-tests/graphics/android/test_fb_device.cpp (+27/-0) |
||||
To merge this branch: | bzr merge lp://staging/~afrantzis/mir/fix-1486535-emulator-failures | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Needs Information | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Cemil Azizoglu (community) | Approve | ||
Kevin DuBois (community) | Approve | ||
Review via email: mp+268521@code.staging.launchpad.net |
Commit message
Fix Mir failures on the ubuntu-touch emulator
(LP: #1486535)
Description of the change
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_
Specifying EGL_COLOR_
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).
lgtm