Merge lp:~vanvugt/mir/fix-1610054 into lp:mir
Proposed by
Daniel van Vugt
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3638 |
Proposed branch: | lp:~vanvugt/mir/fix-1610054 |
Merge into: | lp:mir |
Diff against target: |
208 lines (+74/-7) 6 files modified
src/platforms/mesa/server/kms/cursor.cpp (+9/-0) src/platforms/mesa/server/kms/cursor.h (+1/-0) src/platforms/mesa/server/kms/display.cpp (+13/-3) src/platforms/mesa/server/kms/real_kms_output.cpp (+2/-2) tests/unit-tests/graphics/mesa/kms/test_cursor.cpp (+25/-2) tests/unit-tests/graphics/mesa/kms/test_real_kms_output.cpp (+24/-0) |
To merge this branch: | bzr merge lp:~vanvugt/mir/fix-1610054 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cemil Azizoglu (community) | Approve | ||
Mir CI Bot | continuous-integration | Approve | |
Review via email: mp+302121@code.launchpad.net |
Commit message
On those devices that have KMS but no hardware cursor support,
fall back automatically to the software cursor (LP: #1610054)
To post a comment you must log in.
FAILED: Continuous integration, rev:3634 /mir-jenkins. ubuntu. com/job/ mir-ci/ 1403/ /mir-jenkins. ubuntu. com/job/ build-mir/ 1710/console /mir-jenkins. ubuntu. com/job/ build-0- fetch/1763 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 1754 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 1754 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= yakkety/ 1754 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 1731 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 1731/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 1731 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 1731/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= yakkety/ 1731 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= yakkety/ 1731/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 1731/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 1731/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 1731 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 1731/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 1731 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 1731/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 1403/rebuild
https:/