Merge lp:~albaguirre/mir/fix-not-compositing-client-last-posted-buffer-trunk into lp:mir/0.1

[Alberto Aguirre]

Fix not compositing the client's last posted buffer (LP: #1294048, LP: #1294051, LP: #1294053, LP: #1290306, LP: #1293896)

In single-display cases the number of ready buffers decreases after a buffer is acquired by the rendering operator.
Determine if there will be uncomposited buffers before acquiring a buffer so it works for single and multi display use cases.

Fix not compositing the client's last posted buffer (LP: #1294048, LP: #1294051, LP: #1294053, LP: #1290306, LP: #1293896)

In single-display cases the number of ready buffers decreases after a buffer is acquired by the rendering operator.
Determine if there will be uncomposited buffers before acquiring a buffer so it works for single and multi display use cases.

[kevin gunn (kgunn72)]

Did you test your feature/code change/bug fix ? what device(s) ?
yes - nexus4

Did you break mir server API or ABI and have the relevant bumps to .so and debian docs been made ?
No breaks

Did you break mir client API or ABI and have you followed up with the known clients & announced on mir-devel mailing list ?
no breaks

[kevin gunn (kgunn72)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1181
http://jenkins.qa.ubuntu.com/job/mir-ci/1649/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/47/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1649/rebuild

review: Approve (continuous-integration)

=== modified file 'src/server/compositor/rendering_operator.cpp'
--- src/server/compositor/rendering_operator.cpp	2014-03-17 07:35:22 +0000
+++ src/server/compositor/rendering_operator.cpp	2014-03-18 18:29:36 +0000
@@ -36,8 +36,8 @@
 
 void mc::RenderingOperator::operator()(graphics::Renderable const& renderable)
 {
+    uncomposited_buffers |= renderable.buffers_ready_for_compositor() > 1;
     auto compositor_buffer = renderable.buffer(frameno);
     renderer.render(renderable, *compositor_buffer);
     save_resource(compositor_buffer);
-    uncomposited_buffers |= renderable.buffers_ready_for_compositor() > 1;
 }