Merge lp://staging/~vanvugt/mir/set-logical-size 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: | 4171 |
Proposed branch: | lp://staging/~vanvugt/mir/set-logical-size |
Merge into: | lp://staging/mir |
Prerequisite: | lp://staging/~vanvugt/mir/output-transformation |
Diff against target: |
749 lines (+273/-7) 23 files modified
include/client/mir_toolkit/mir_display_configuration.h (+23/-0) include/platform/mir/graphics/display_configuration.h (+4/-0) src/client/display_configuration_api.cpp (+20/-0) src/client/symbols.map (+2/-0) src/platform/graphics/display_configuration.cpp (+29/-3) src/platforms/mesa/server/kms/real_kms_display_configuration.cpp (+1/-0) src/platforms/mesa/server/x11/graphics/display_configuration.cpp (+1/-0) src/protobuf/mir_protobuf.proto (+7/-0) src/server/frontend/protobuf_buffer_packer.cpp (+1/-0) src/server/frontend/session_mediator.cpp (+14/-0) src/server/graphics/nested/nested_display_configuration.cpp (+9/-1) src/server/graphics/offscreen/display_configuration.cpp (+1/-0) src/utils/out.c (+19/-0) tests/acceptance-tests/test_latency.cpp (+1/-0) tests/acceptance-tests/test_new_display_configuration.cpp (+57/-0) tests/mir_test/display_config_matchers.cpp (+27/-2) tests/mir_test_doubles/stub_display_configuration.cpp (+4/-0) tests/unit-tests/graphics/test_default_display_configuration_policy.cpp (+4/-1) tests/unit-tests/graphics/test_display_configuration.cpp (+28/-0) tests/unit-tests/graphics/test_overlapping_output_grouping.cpp (+1/-0) tests/unit-tests/platforms/mesa/kms/test_cursor.cpp (+3/-0) tests/unit-tests/platforms/mesa/kms/test_display_configuration.cpp (+9/-0) tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp (+8/-0) |
To merge this branch: | bzr merge lp://staging/~vanvugt/mir/set-logical-size |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Approve | |
Alan Griffiths | Approve | ||
Review via email: mp+322925@code.staging.launchpad.net |
Commit message
Add the ability to set custom display resolutions (or fake modes if
you like). These affect the logical view area and scaling that appears
on screen but do not affect the actual display mode the monitor is set
to. So the renderer will scale up/down and letter-box (add black bars)
as required. (LP: #1639226 mostly complete)
This now works apparently perfectly (try mirout fakemode ...) with the
one caveat that the hardware cursor doesn't match up yet. You can work
around that by simply running your server with '--cursor software'.
To post a comment you must log in.
PASSED: Continuous integration, rev:4010 /mir-jenkins. ubuntu. com/job/ mir-ci/ 3375/ /mir-jenkins. ubuntu. com/job/ build-mir/ 4567 /mir-jenkins. ubuntu. com/job/ build-0- fetch/4693 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 4682 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= zesty/4682 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= zesty/4599 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= zesty/4599/ artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 4599 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 4599/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= zesty/4599 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= zesty/4599/ artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= mesa,release= zesty/4599 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= mesa,release= zesty/4599/ artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 4599 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 4599/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
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:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 3375/rebuild
https:/