Merge lp://staging/~vanvugt/mir/fix-buffers_ready_for_compositor 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: | 2289 |
Proposed branch: | lp://staging/~vanvugt/mir/fix-buffers_ready_for_compositor |
Merge into: | lp://staging/mir |
Diff against target: |
874 lines (+297/-63) 34 files modified
examples/render_overlays.cpp (+0/-5) include/platform/mir/graphics/renderable.h (+0/-1) include/server/mir/compositor/scene.h (+10/-0) include/server/mir/scene/surface.h (+1/-0) platform-ABI-sha1sums (+1/-1) server-ABI-sha1sums (+3/-3) src/include/server/mir/compositor/buffer_stream.h (+1/-1) src/server/compositor/buffer_bundle.h (+1/-1) src/server/compositor/buffer_queue.cpp (+10/-6) src/server/compositor/buffer_queue.h (+1/-1) src/server/compositor/buffer_stream_surfaces.cpp (+2/-2) src/server/compositor/buffer_stream_surfaces.h (+1/-1) src/server/compositor/multi_threaded_compositor.cpp (+12/-1) src/server/graphics/software_cursor.cpp (+0/-5) src/server/input/touchspot_controller.cpp (+0/-5) src/server/scene/basic_surface.cpp (+12/-4) src/server/scene/basic_surface.h (+1/-0) src/server/scene/surface_stack.cpp (+31/-2) src/server/scene/surface_stack.h (+2/-0) src/server/symbols.map (+1/-0) tests/include/mir_test_doubles/fake_renderable.h (+0/-5) tests/include/mir_test_doubles/mock_buffer_bundle.h (+1/-1) tests/include/mir_test_doubles/mock_buffer_stream.h (+3/-3) tests/include/mir_test_doubles/mock_renderable.h (+0/-3) tests/include/mir_test_doubles/mock_scene.h (+3/-0) tests/include/mir_test_doubles/stub_buffer_stream.h (+4/-1) tests/include/mir_test_doubles/stub_renderable.h (+0/-5) tests/include/mir_test_doubles/stub_scene.h (+5/-1) tests/include/mir_test_doubles/stub_scene_surface.h (+1/-0) tests/integration-tests/test_exchange_buffer.cpp (+1/-1) tests/integration-tests/test_surface_stack_with_compositor.cpp (+5/-4) tests/unit-tests/compositor/test_buffer_queue.cpp (+66/-0) tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+85/-0) tests/unit-tests/scene/test_surface_stack.cpp (+33/-0) |
To merge this branch: | bzr merge lp://staging/~vanvugt/mir/fix-buffers_ready_for_compositor |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Kevin DuBois (community) | Approve | ||
Alan Griffiths | Abstain | ||
Alberto Aguirre (community) | Approve | ||
Review via email:
|
Commit message
Fix dangerous underestimate of buffers_
an immediate problem when you start experimenting with double buffers,
and see occasional random freezes. (LP: #1395581)
It could also possibly affect the current triple buffering used for
multimonitor and bypass/overlays.
To post a comment you must log in.
FAILED: Continuous integration, rev:2133 jenkins. qa.ubuntu. com/job/ mir-ci/ 2773/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/1007/ console jenkins. qa.ubuntu. com/job/ mir-clang- vivid-amd64- build/1006 jenkins. qa.ubuntu. com/job/ mir-mediumtests -vivid- touch/968 jenkins. qa.ubuntu. com/job/ mir-vivid- amd64-ci/ 770 jenkins. qa.ubuntu. com/job/ mir-vivid- amd64-ci/ 770/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 968 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 968/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/4055 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 17351
http://
Executed test runs:
FAILURE: 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/2773/ rebuild
http://