Merge lp://staging/~vanvugt/mir/neg 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: | 2226 | ||||
Proposed branch: | lp://staging/~vanvugt/mir/neg | ||||
Merge into: | lp://staging/mir | ||||
Diff against target: |
530 lines (+163/-75) 10 files modified
doc/demo_shell_controls.md (+2/-0) playground/demo-shell/demo_compositor.cpp (+5/-0) playground/demo-shell/demo_compositor.h (+2/-0) playground/demo-shell/demo_renderer.cpp (+48/-1) playground/demo-shell/demo_renderer.h (+25/-7) playground/demo-shell/window_manager.cpp (+21/-0) playground/demo-shell/window_manager.h (+4/-0) src/include/server/mir/compositor/gl_renderer.h (+12/-3) src/server/compositor/gl_renderer.cpp (+34/-63) src/server/symbols.map (+10/-1) |
||||
To merge this branch: | bzr merge lp://staging/~vanvugt/mir/neg | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cemil Azizoglu (community) | Approve | ||
Andreas Pokorny (community) | Abstain | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Kevin DuBois (community) | Needs Information | ||
Review via email: mp+246057@code.staging.launchpad.net |
Commit message
First attempts at adding custom shaders in shells. As an example, this
introduces negative (Super+N) and high contrast (Super+C) modes to the
demo shell (mir_proving_
I also took the opportunity to clean up and eliminate the ugly vector
of programs approach.
To post a comment you must log in.
FAILED: Continuous integration, rev:2224 jenkins. qa.ubuntu. com/job/ mir-ci/ 2611/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/790 jenkins. qa.ubuntu. com/job/ mir-clang- vivid-amd64- build/790 jenkins. qa.ubuntu. com/job/ mir-mediumtests -vivid- touch/752 jenkins. qa.ubuntu. com/job/ mir-vivid- amd64-ci/ 608/console jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 752 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 752/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/3881 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 16983
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ci/2611/ rebuild
http://