Merge lp://qastaging/~andreas-pokorny/mir/add-display-configuration-output-assembly-to-display-device into lp://qastaging/mir
| Status: | Rejected |
|---|---|
| Rejected by: | Andreas Pokorny |
| Proposed branch: | lp://qastaging/~andreas-pokorny/mir/add-display-configuration-output-assembly-to-display-device |
| Merge into: | lp://qastaging/mir |
| Diff against target: |
899 lines (+608/-23) 18 files modified
src/platform/graphics/android/CMakeLists.txt (+1/-0) src/platform/graphics/android/display_configuration_utilities.cpp (+57/-0) src/platform/graphics/android/display_configuration_utilities.h (+35/-0) src/platform/graphics/android/display_device.h (+2/-0) src/platform/graphics/android/fb_device.cpp (+18/-5) src/platform/graphics/android/fb_device.h (+1/-0) src/platform/graphics/android/hwc_device.cpp (+116/-0) src/platform/graphics/android/hwc_device.h (+1/-0) src/platform/graphics/android/hwc_fb_device.cpp (+9/-0) src/platform/graphics/android/hwc_fb_device.h (+1/-0) src/platform/graphics/android/hwc_wrapper.h (+13/-0) src/platform/graphics/android/real_hwc_wrapper.cpp (+45/-0) src/platform/graphics/android/real_hwc_wrapper.h (+2/-0) tests/include/mir_test_doubles/mock_display_device.h (+1/-0) tests/include/mir_test_doubles/mock_fb_hal_device.h (+11/-5) tests/include/mir_test_doubles/mock_hwc_device_wrapper.h (+3/-0) tests/unit-tests/graphics/android/test_fb_device.cpp (+46/-1) tests/unit-tests/graphics/android/test_hwc_common_device.cpp (+246/-12) |
| To merge this branch: | bzr merge lp://qastaging/~andreas-pokorny/mir/add-display-configuration-output-assembly-to-display-device |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Kevin DuBois (community) | Needs Fixing | ||
|
Review via email:
|
|||
Commit message
Add means to query display output configuration from DisplayDevice
This adds methods to DisplayDevice and HwcWrapper to assemble a DisplayConfigur
Description of the change
Adds a method to query the output configuration for a hwc display. With this MP the code path is not yet in use, but just prepared.
| Kevin DuBois (kdub) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Alberto Aguirre (albaguirre) wrote | # |
Unmerged revisions
- 2008. By Andreas Pokorny
-
Add means to query display output configuration from DisplayDevice
This adds a methods to DisplayDevice and HwcWrapper to assemble a
DisplayConfigurationOutput using the fb and hwc interfaces and EGL.
The code is largely borrowed from mir::graphics::android: :Framebuffers.
This change does not yet make mir::android::DisplayConfigu ration use this
code path.
407 +++ src/platform/
This is supposed to be an adapter layer around the hwc interface. Its kept thin and mostly in terms of hwc types so that the logs can closely reflect the actual calls to the 3rd party code. This lets us collaborate more easily with vendors. It shouldn't be doing heavy lifting. The code that was added is a duplication of the code in framebuffers.cpp
77 +++ src/platform/
given this would only be used by the fb device, it would probably be better to be in an anonymous namespace closer to the creation of the the fb_device.cpp file instead of in the two types of DisplayDevices that rely on the framebuffer device.
200 +#include <EGL/egl.h>
201 +#include <EGL/eglext.h>
I've gone through some pains to keep egl out of the displaydevice setup, would like to keep the egl stuff in the DisplayBuffer or the HwcFallbackRenderer
290 + for(auto config : configs)
const&