Merge lp://qastaging/~kdub/mir/fix-1373698 into lp://qastaging/mir
Proposed by
Kevin DuBois
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Daniel van Vugt | ||||
Proposed branch: | lp://qastaging/~kdub/mir/fix-1373698 | ||||
Merge into: | lp://qastaging/mir | ||||
Diff against target: |
134 lines (+47/-4) 7 files modified
include/platform/mir/graphics/renderable.h (+3/-0) platform-ABI-sha1sums (+1/-1) server-ABI-sha1sums (+1/-1) src/server/compositor/gl_renderer.cpp (+1/-1) src/server/input/touchspot_controller.cpp (+1/-1) tests/unit-tests/compositor/test_gl_renderer.cpp (+24/-0) tests/unit-tests/input/test_touchspot_controller.cpp (+16/-0) |
||||
To merge this branch: | bzr merge lp://qastaging/~kdub/mir/fix-1373698 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Disapprove | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email:
|
Commit message
Make sure that touchspots have their alpha blending enabled. Also have the GLRenderer disable alpha blending for renderables that have blending enabled.
LP: #1373698
Description of the change
Make sure that touchspots have their alpha blending enabled. Also have the GLRenderer disable alpha blending for renderables that have blending enabled.
LP: #1373698
To post a comment you must log in.
Unmerged revisions
- 1944. By Kevin DuBois
-
update sha1sums (no ABI break, just updating comment)
- 1943. By Kevin DuBois
-
update comment in header
- 1942. By Kevin DuBois
-
test to pass
- 1941. By Kevin DuBois
-
add a failing test that checks that the renderable has alpha_enabled
- 1940. By Kevin DuBois
-
test to pass
- 1939. By Kevin DuBois
-
add a failing test so that the GLRenderer will disable blending if alpha_enabled is not set
FAILED: Continuous integration, rev:1944 jenkins. qa.ubuntu. com/job/ mir-0.8- ci/10/ jenkins. qa.ubuntu. com/job/ mir-0.8- utopic- amd64-ci/ 10/console jenkins. qa.ubuntu. com/job/ mir-android- utopic- i386-build/ 1914 jenkins. qa.ubuntu. com/job/ mir-clang- utopic- amd64-build/ 1921/console jenkins. qa.ubuntu. com/job/ mir-mediumtests -utopic- touch/1876/ console jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- utopic- armhf/813/ console
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- 0.8-ci/ 10/rebuild
http://