Merge lp://staging/~vanvugt/mir/displaybuffer-transform into lp://staging/mir
Proposed by
Daniel van Vugt
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4001 |
Proposed branch: | lp://staging/~vanvugt/mir/displaybuffer-transform |
Merge into: | lp://staging/mir |
Diff against target: |
960 lines (+174/-210) 29 files modified
include/platform/mir/graphics/display_buffer.h (+9/-20) include/renderer/mir/renderer/renderer.h (+2/-2) include/test/mir/test/doubles/null_display_buffer.h (+1/-2) playground/demo-shell/demo_compositor.cpp (+1/-1) src/include/platform/mir/graphics/transformation.h (+52/-0) src/platforms/android/server/display_buffer.cpp (+8/-15) src/platforms/android/server/display_buffer.h (+2/-2) src/platforms/eglstream-kms/server/display.cpp (+3/-8) src/platforms/mesa/server/kms/display_buffer.cpp (+9/-13) src/platforms/mesa/server/kms/display_buffer.h (+2/-3) src/platforms/mesa/server/x11/graphics/display_buffer.cpp (+6/-8) src/platforms/mesa/server/x11/graphics/display_buffer.h (+2/-2) src/renderers/gl/renderer.cpp (+3/-58) src/renderers/gl/renderer.h (+1/-3) src/server/compositor/default_display_buffer_compositor.cpp (+1/-1) src/server/compositor/screencast_display_buffer.cpp (+6/-9) src/server/compositor/screencast_display_buffer.h (+2/-4) src/server/graphics/nested/display_buffer.cpp (+3/-12) src/server/graphics/nested/display_buffer.h (+1/-2) tests/include/mir/test/doubles/mock_display_buffer.h (+1/-2) tests/include/mir/test/doubles/mock_renderer.h (+1/-1) tests/include/mir/test/doubles/stub_renderer.h (+1/-1) tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+21/-26) tests/unit-tests/compositor/test_screencast_display_buffer.cpp (+3/-1) tests/unit-tests/platforms/android/server/test_display.cpp (+11/-4) tests/unit-tests/platforms/android/server/test_display_buffer.cpp (+14/-6) tests/unit-tests/platforms/android/server/test_display_group.cpp (+1/-2) tests/unit-tests/platforms/mesa/kms/test_display.cpp (+3/-1) tests/unit-tests/platforms/mesa/kms/test_display_buffer.cpp (+4/-1) |
To merge this branch: | bzr merge lp://staging/~vanvugt/mir/displaybuffer-transform |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Approve | |
Daniel van Vugt | Approve | ||
Cemil Azizoglu (community) | Approve | ||
Alan Griffiths | Approve | ||
Review via email: mp+315743@code.staging.launchpad.net |
Commit message
Generalise DisplayBuffer transformations with a matrix.
This not only simplifies the code but makes it more flexible, to
support scaling in future (a prerequisite for LP: #1639226).
We could also do keystone correction with this if we want.
To post a comment you must log in.
PASSED: Continuous integration, rev:3996 /mir-jenkins. ubuntu. com/job/ mir-ci/ 2880/ /mir-jenkins. ubuntu. com/job/ build-mir/ 3800 /mir-jenkins. ubuntu. com/job/ build-0- fetch/3879 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 3869 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 3869 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= zesty/3869 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= zesty/3827 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= zesty/3827/ artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3827 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3827/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= zesty/3827 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= zesty/3827/ artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 3827 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 3827/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 3827 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 3827/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3827 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3827/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 2880/rebuild
https:/