Merge lp:~robertcarr/mir/emancipate-egl-native-display-from-surface into lp:~mir-team/mir/trunk
Proposed by
Robert Carr
Status: | Merged |
---|---|
Approved by: | Robert Carr |
Approved revision: | no longer in the source branch. |
Merged at revision: | 687 |
Proposed branch: | lp:~robertcarr/mir/emancipate-egl-native-display-from-surface |
Merge into: | lp:~mir-team/mir/trunk |
Diff against target: |
402 lines (+49/-46) 22 files modified
examples/demo-inprocess-surface-client/inprocess_egl_client.cpp (+2/-2) include/server/mir/graphics/internal_client.h (+7/-1) include/server/mir/graphics/platform.h (+1/-1) include/test/mir_test_doubles/stub_platform.h (+1/-1) src/server/graphics/android/android_platform.cpp (+2/-3) src/server/graphics/android/android_platform.h (+1/-1) src/server/graphics/android/internal_client.cpp (+10/-5) src/server/graphics/android/internal_client.h (+2/-2) src/server/graphics/gbm/gbm_platform.cpp (+2/-3) src/server/graphics/gbm/gbm_platform.h (+1/-1) src/server/graphics/gbm/internal_client.cpp (+3/-5) src/server/graphics/gbm/internal_client.h (+2/-4) tests/integration-tests/graphics/android/test_internal_client.cpp (+2/-2) tests/integration-tests/graphics/gbm/test_buffer_integration.cpp (+1/-1) tests/integration-tests/test_display_info.cpp (+1/-1) tests/integration-tests/test_drm_auth_magic.cpp (+1/-1) tests/integration-tests/test_surfaceloop.cpp (+2/-2) tests/mir_test_framework/testing_server_options.cpp (+1/-1) tests/unit-tests/frontend/test_session_mediator_gbm.cpp (+1/-1) tests/unit-tests/graphics/android/test_internal_client.cpp (+3/-3) tests/unit-tests/graphics/gbm/test_gbm_platform.cpp (+1/-3) tests/unit-tests/graphics/gbm/test_internal_client.cpp (+2/-2) |
To merge this branch: | bzr merge lp:~robertcarr/mir/emancipate-egl-native-display-from-surface |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Kevin DuBois (community) | Approve | ||
Review via email: mp+163775@code.launchpad.net |
Commit message
Allow access to the internal egl native display without usage of a surface.
Description of the change
Allow access to the internal egl native display without usage of a surface.
To post a comment you must log in.
PASSED: Continuous integration, rev:685 jenkins. qa.ubuntu. com/job/ mir-ci/ 584/ jenkins. qa.ubuntu. com/job/ mir-android- raring- i386-build/ 689 jenkins. qa.ubuntu. com/job/ mir-clang- raring- amd64-build/ 572 jenkins. qa.ubuntu. com/job/ mir-raring- amd64-ci/ 68 jenkins. qa.ubuntu. com/job/ mir-raring- amd64-ci/ 68/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-vm- ci-build/ ./distribution= precise, flavor= amd64/313
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ mir-ci/ 584/rebuild
http://