Merge lp:~afrantzis/mir/fix-1454201-usc-crash into lp:mir
Proposed by
Alexandros Frantzis
Status: | Merged |
---|---|
Approved by: | Alan Griffiths |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2578 |
Proposed branch: | lp:~afrantzis/mir/fix-1454201-usc-crash |
Merge into: | lp:mir |
Diff against target: |
128 lines (+59/-0) 5 files modified
src/server/compositor/gl_program_family.cpp (+5/-0) tests/unit-tests/compositor/CMakeLists.txt (+1/-0) tests/unit-tests/compositor/test_gl_program_family.cpp (+49/-0) tests/unit-tests/compositor/test_gl_renderer.cpp (+2/-0) tests/unit-tests/examples/test_demo_renderer.cpp (+2/-0) |
To merge this branch: | bzr merge lp:~afrantzis/mir/fix-1454201-usc-crash |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Alan Griffiths | Approve | ||
Alberto Aguirre (community) | Approve | ||
Kevin DuBois (community) | Approve | ||
Review via email: mp+259086@code.launchpad.net |
Commit message
compositor: Release current GL context before deleting shader objects to avoid crash (LP: #1454201)
Description of the change
compositor: Release current GL context before deleting shader objects to avoid crash (LP: #1454201)
This shouldn't be needed. We need to investigate more deeply to figure out if this is a driver issue or we are overlooking something.
(This fix has already been proposed and merged in 0.13, since it was blocking the release)
To post a comment you must log in.
PASSED: Continuous integration, rev:2570 jenkins. qa.ubuntu. com/job/ mir-ci/ 3835/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/2479 jenkins. qa.ubuntu. com/job/ mir-clang- vivid-amd64- build/2478 jenkins. qa.ubuntu. com/job/ mir-mediumtests -vivid- touch/2427 jenkins. qa.ubuntu. com/job/ mir-vivid- amd64-ci/ 1832 jenkins. qa.ubuntu. com/job/ mir-vivid- amd64-ci/ 1832/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 2427 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 2427/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/5303 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 20489
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ci/3835/ rebuild
http://