Merge lp:~vanvugt/qtmir/fix-buffers_ready_for_compositor into lp:qtmir/devel-mir-next

[Daniel van Vugt]

QtMir changes required to support the Mir branch of the same name. Landing soon.

[lp:~vanvugt/qtmir/fix-buffers_ready_for_compositor]

317. By Daniel van Vugt on 2015-02-04

No change. Ping, Jenkins.

318. By Daniel van Vugt on 2015-02-04

camelCase

319. By Daniel van Vugt on 2015-02-04

Merge latest from parent branch.

320. By Daniel van Vugt on 2015-02-04

Merge more from latest parent branch

Unmerged revisions

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
--- src/modules/Unity/Application/mirsurfaceitem.cpp	2015-01-14 09:07:41 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.cpp	2015-02-03 17:10:22 +0000
@@ -440,10 +440,11 @@
     ensureProvider();
     bool textureUpdated = false;
 
+    const void* const user_id = (void*)123;
     std::unique_ptr<mg::Renderable> renderable =
-        m_surface->compositor_snapshot((void*)123/*user_id*/);
+        m_surface->compositor_snapshot(user_id);
 
-    if (renderable->buffers_ready_for_compositor() > 0) {
+    if (m_surface->buffers_ready_for_compositor(user_id) > 0) {
         if (!m_textureProvider->t) {
             m_textureProvider->t = new MirBufferSGTexture(renderable->buffer());
         } else {
@@ -455,7 +456,7 @@
         textureUpdated = true;
     }
 
-    if (renderable->buffers_ready_for_compositor() > 0) {
+    if (m_surface->buffers_ready_for_compositor(user_id) > 0) {
         QTimer::singleShot(0, this, SLOT(update()));
         // restart the frame dropper so that we have enough time to render the next frame.
         m_frameDropperTimer.start();
@@ -747,18 +748,17 @@
 {
     QMutexLocker locker(&m_mutex);
 
-    std::unique_ptr<mg::Renderable> renderable =
-        m_surface->compositor_snapshot((void*)123/*user_id*/);
+    const void* const user_id = (void*)123;  // TODO: Multimonitor support
 
-    while (renderable->buffers_ready_for_compositor() > 0) {
+    while (m_surface->buffers_ready_for_compositor(user_id) > 0) {
         // The line below looks like an innocent, effect-less, getter. But as this
         // method returns a unique_pointer, not holding its reference causes the
         // buffer to be destroyed/released straight away.
-        m_surface->compositor_snapshot((void*)123/*user_id*/)->buffer();
+        m_surface->compositor_snapshot(user_id)->buffer();
         qCDebug(QTMIR_SURFACES) << "MirSurfaceItem::dropPendingBuffers()"
             << "surface =" << this
             << "buffer dropped."
-            << renderable->buffers_ready_for_compositor()
+            << m_surface->buffers_ready_for_compositor(user_id)
             << "left.";
     }
 }

=== modified file 'tests/modules/common/mock_renderable.h'
--- tests/modules/common/mock_renderable.h	2014-09-11 16:18:40 +0000
+++ tests/modules/common/mock_renderable.h	2015-02-03 17:10:22 +0000
@@ -34,9 +34,7 @@
     MOCK_CONST_METHOD0(screen_position, geometry::Rectangle());
     MOCK_CONST_METHOD0(alpha, float() );
     MOCK_CONST_METHOD0(transformation, glm::mat4());
-    MOCK_CONST_METHOD0(visible, bool());
     MOCK_CONST_METHOD0(shaped, bool());
-    MOCK_CONST_METHOD0(buffers_ready_for_compositor, int());
 };
 
 } // namespace graphics

=== modified file 'tests/modules/common/mock_surface.h'
--- tests/modules/common/mock_surface.h	2015-02-03 17:10:22 +0000
+++ tests/modules/common/mock_surface.h	2015-02-03 17:10:22 +0000
@@ -65,6 +65,7 @@
     MOCK_CONST_METHOD0(input_channel, std::shared_ptr<input::InputChannel>());
     MOCK_METHOD1(set_reception_mode, void(input::InputReceptionMode mode));
     MOCK_METHOD0(request_client_surface_close, void());
+    MOCK_CONST_METHOD1(buffers_ready_for_compositor, int(void const*));
 
     // from mir::input::surface
     MOCK_CONST_METHOD1(input_area_contains, bool(geometry::Point const& point));