Merge lp://qastaging/~alan-griffiths/mir/fix-1535894-alt into lp://qastaging/mir
Status: | Rejected |
---|---|
Rejected by: | Alan Griffiths |
Proposed branch: | lp://qastaging/~alan-griffiths/mir/fix-1535894-alt |
Merge into: | lp://qastaging/mir |
Diff against target: |
984 lines (+181/-263) 26 files modified
examples/render_surfaces.cpp (+3/-2) examples/server_example_adorning_compositor.cpp (+12/-1) examples/server_example_adorning_compositor.h (+1/-1) include/server/mir/compositor/display_buffer_compositor.h (+1/-1) include/server/mir/compositor/scene.h (+0/-10) include/server/mir/compositor/scene_element.h (+1/-0) include/test/mir/test/doubles/null_display_buffer_compositor_factory.h (+2/-1) playground/demo-shell/demo_compositor.cpp (+13/-1) playground/demo-shell/demo_compositor.h (+1/-1) src/server/compositor/default_display_buffer_compositor.cpp (+43/-46) src/server/compositor/default_display_buffer_compositor.h (+1/-1) src/server/compositor/multi_threaded_compositor.cpp (+3/-11) src/server/scene/rendering_tracker.cpp (+9/-0) src/server/scene/rendering_tracker.h (+1/-0) src/server/scene/surface_stack.cpp (+10/-24) src/server/scene/surface_stack.h (+0/-1) tests/acceptance-tests/test_buffer_stream_arrangement.cpp (+2/-2) tests/acceptance-tests/test_client_scaling.cpp (+2/-1) tests/acceptance-tests/test_render_override.cpp (+3/-1) tests/include/mir/test/doubles/stub_scene.h (+0/-4) tests/include/mir/test/doubles/stub_scene_element.h (+5/-0) tests/integration-tests/test_server_shutdown.cpp (+1/-1) tests/unit-tests/compositor/test_compositing_screencast.cpp (+4/-3) tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+44/-10) tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+19/-22) tests/unit-tests/scene/test_surface_stack.cpp (+0/-118) |
To merge this branch: | bzr merge lp://qastaging/~alan-griffiths/mir/fix-1535894-alt |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Mir CI Bot | continuous-integration | Approve | |
Daniel van Vugt | Needs Fixing | ||
Review via email:
|
Commit message
compositor, scene: Use the DisplayBufferCo
Description of the change
compositor, scene: Use the DisplayBufferCo
This doesn't include logic that allows -c 3274 to be reverted, but if this approach is favoured, then I'll rework that to put the DisplayBufferCo
Unmerged revisions
- 3303. By Alan Griffiths
-
Remove some unused headers
- 3302. By Alan Griffiths
-
Reinstate FIXME comment
- 3301. By Alan Griffiths
-
merge lp:mir
- 3300. By Alan Griffiths
-
Cleaner code in examples
- 3299. By Alan Griffiths
-
Cleaner code (that also passes StaleFrames.* tests)
- 3298. By Alan Griffiths
-
Add corresponding DefaultDisplayB
ufferCompositor tests - 3297. By Alan Griffiths
-
Remove unnecessary Scene::
frames_ pending( ) - 3296. By Alan Griffiths
-
Fixup broken test
- 3295. By Alan Griffiths
-
First pass at pending buffer count
FAILED: Continuous integration, rev:3300 /mir-jenkins. ubuntu. com/job/ mir-ci/ 253/ /mir-jenkins. ubuntu. com/job/ build/41/ console /mir-jenkins. ubuntu. com/job/ build-0- fetch/47 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 43 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 43 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- advanced/ arch=amd64, compiler= gcc,platform= mesa,release= xenial/ 43/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- advanced/ arch=cross- armhf,compiler= gcc,platform= android, release= vivid+overlay/ 43 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- advanced/ arch=cross- armhf,compiler= gcc,platform= android, release= vivid+overlay/ 43/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- advanced/ arch=i386, compiler= gcc,platform= android, release= vivid+overlay/ 43 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- advanced/ arch=i386, compiler= gcc,platform= android, release= vivid+overlay/ 43/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- advanced/ arch=i386, compiler= gcc,platform= mesa,release= xenial/ 43/console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 253/rebuild
https:/