Merge lp:~kdub/mir/connect-fallback-to-hwc-device into lp:mir

[Kevin DuBois]

make the HwcDevice call the render() function on the fallback gl program (l253), instead of calling a std::function that isn't hooked up to anything.

make the HwcDevice call the render() function on the fallback gl program (l253), instead of calling a std::function that isn't hooked up to anything.

note:
In trunk now, the fallback rendering function is just a stub. This MP leaves it stubbed, but will be do something once lp:~kdub/mir/overlay-gl-program lands. The code is currently just used in the overlays demo.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1587
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1448/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1771
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/1341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/1180
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/1180/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/1185
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/1185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/1344
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/1344/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1237
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6581/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/1448/rebuild

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

LGTM

review: Approve

[Alberto Aguirre (albaguirre)]

OK.

the OverlayGLProgram and overlay_gl_compositor.h will change names in the other branch https://code.launchpad.net/~kdub/mir/overlay-gl-program

Shouldn't this branch or the other list a pre-requisite?

review: Approve

[Alan Griffiths (alan-griffiths)]

Just nits:

747 +#include "mir_test_doubles/stub_renderable_list_compositor.h"

Unused.

~~~~

773 + EXPECT_CALL(mock_compositor, render(Ref(renderlist),_))
774 + .InSequence(seq)
775 + .WillOnce(Invoke([](mg::RenderableList const&, mga::SwappingGLContext const& cont)
776 + {cont.swap_buffers();}));

The lambda body should be further indented than the surrounding .WillOnce call. (Or on the same line.)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1590
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1506/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/38
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1302
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6743

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/1506/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Alan's concerns have been addressed, so approving.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/628/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/50/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/51
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/51/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/12
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/12/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-autolanding/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/57/console

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> Alan's concerns have been addressed, so approving.

Yep

review: Approve

[Alan Griffiths (alan-griffiths)]

/mir/tests/unit-tests/graphics/android/test_hwc_device.cpp: In member function 'virtual void HwcDevice_resets_composition_type_with_prepare_Test::TestBody()':
/mir/tests/unit-tests/graphics/android/test_hwc_device.cpp:586:12: error: 'class mir::graphics::android::HwcDevice' has no member named 'render_gl_and_overlays'
     device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
            ^
/mir/tests/unit-tests/graphics/android/test_hwc_device.cpp:587:12: error: 'class mir::graphics::android::HwcDevice' has no member named 'render_gl_and_overlays'
     device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});

Rebase required

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1592
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1594/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/113
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/111
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/111/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/354
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/354/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1410
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7069

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/1594/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

rebase done, re-top-approving

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'include/test/mir_test_doubles/mock_display_device.h'
--- include/test/mir_test_doubles/mock_display_device.h	2014-03-26 05:48:59 +0000
+++ include/test/mir_test_doubles/mock_display_device.h	2014-05-12 18:27:14 +0000
@@ -22,6 +22,7 @@
 #include "mir/graphics/buffer.h"
 #include "src/platform/graphics/android/display_device.h"
 #include "src/platform/graphics/android/gl_context.h"
+#include "src/platform/graphics/android/overlay_gl_compositor.h"
 #include <gmock/gmock.h>
 
 namespace mir
@@ -36,10 +37,10 @@
     ~MockDisplayDevice() noexcept {}
     MOCK_METHOD1(mode, void(MirPowerMode));
     MOCK_METHOD1(render_gl, void(graphics::android::SwappingGLContext const&));
-    MOCK_METHOD3(render_gl_and_overlays, void(
+    MOCK_METHOD3(prepare_overlays, void(
         graphics::android::SwappingGLContext const&,
         graphics::RenderableList const&,
-        std::function<void(graphics::Renderable const&)> const&));
+        graphics::android::RenderableListCompositor const&));
     MOCK_METHOD1(post, void(graphics::Buffer const&));
     MOCK_CONST_METHOD1(apply_orientation, bool(MirOrientation));
 };

=== added file 'include/test/mir_test_doubles/mock_renderable_list_compositor.h'
--- include/test/mir_test_doubles/mock_renderable_list_compositor.h	1970-01-01 00:00:00 +0000
+++ include/test/mir_test_doubles/mock_renderable_list_compositor.h	2014-05-12 18:27:14 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_TEST_DOUBLES_MOCK_RENDERABLE_LIST_COMPOSITOR_H_
+#define MIR_TEST_DOUBLES_MOCK_RENDERABLE_LIST_COMPOSITOR_H_
+
+#include "src/platform/graphics/android/overlay_gl_compositor.h"
+#include <gmock/gmock.h>
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+
+struct MockRenderableListCompositor : public graphics::android::RenderableListCompositor
+{
+    MOCK_CONST_METHOD2(render,
+        void(graphics::RenderableList const&, graphics::android::SwappingGLContext const&));
+};
+
+}
+}
+}
+#endif // MIR_TEST_DOUBLES_MOCK_RENDERABLE_LIST_COMPOSITOR_H_

=== added file 'include/test/mir_test_doubles/stub_renderable_list_compositor.h'
--- include/test/mir_test_doubles/stub_renderable_list_compositor.h	1970-01-01 00:00:00 +0000
+++ include/test/mir_test_doubles/stub_renderable_list_compositor.h	2014-05-12 18:27:14 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_TEST_DOUBLES_STUB_RENDERABLE_LIST_COMPOSITOR_H_
+#define MIR_TEST_DOUBLES_STUB_RENDERABLE_LIST_COMPOSITOR_H_
+
+#include "src/platform/graphics/android/overlay_gl_compositor.h"
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+
+struct StubRenderableListCompositor : public graphics::android::RenderableListCompositor
+{
+    void render(graphics::RenderableList const&, graphics::android::SwappingGLContext const&) const
+    {
+    }
+};
+
+}
+}
+}
+#endif // MIR_TEST_DOUBLES_STUB_RENDERABLE_LIST_COMPOSITOR_H_

=== modified file 'src/platform/graphics/android/display_buffer.cpp'
--- src/platform/graphics/android/display_buffer.cpp	2014-05-01 07:13:02 +0000
+++ src/platform/graphics/android/display_buffer.cpp	2014-05-12 18:27:14 +0000
@@ -88,7 +88,7 @@
 
 void mga::DisplayBuffer::render_and_post_update(
     RenderableList const& renderlist,
-    std::function<void(Renderable const&)> const& render_fn)
+    std::function<void(Renderable const&)> const&)
 {
     if (renderlist.empty())
     {
@@ -96,7 +96,7 @@
     }
     else
     {
-        display_device->render_gl_and_overlays(gl_context, renderlist, render_fn);
+        display_device->prepare_overlays(gl_context, renderlist, overlay_program);
     }
 
     post();

=== modified file 'src/platform/graphics/android/display_device.h'
--- src/platform/graphics/android/display_device.h	2014-03-26 05:48:59 +0000
+++ src/platform/graphics/android/display_device.h	2014-05-12 18:27:14 +0000
@@ -22,7 +22,6 @@
 #include "mir/graphics/renderable.h"
 #include "mir_toolkit/common.h"
 #include <EGL/egl.h>
-#include <list>
 
 namespace mir
 {
@@ -33,6 +32,7 @@
 
 namespace android
 {
+class RenderableListCompositor;
 class SwappingGLContext;
 
 class DisplayDevice
@@ -42,10 +42,10 @@
 
     virtual void mode(MirPowerMode mode) = 0;
     virtual void render_gl(SwappingGLContext const& context) = 0;
-    virtual void render_gl_and_overlays(
+    virtual void prepare_overlays(
         SwappingGLContext const& context,
         RenderableList const& list,
-        std::function<void(Renderable const&)> const& render_fn) = 0;
+        RenderableListCompositor const& list_compositor) = 0;
     virtual void post(Buffer const& buffer) = 0;
     virtual bool apply_orientation(MirOrientation orientation) const = 0;
 

=== modified file 'src/platform/graphics/android/fb_device.cpp'
--- src/platform/graphics/android/fb_device.cpp	2014-03-26 05:48:59 +0000
+++ src/platform/graphics/android/fb_device.cpp	2014-05-12 18:27:14 +0000
@@ -24,6 +24,7 @@
 #include "fb_device.h"
 #include "framebuffer_bundle.h"
 #include "buffer.h"
+#include "overlay_gl_compositor.h"
 
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
@@ -49,15 +50,12 @@
     context.swap_buffers();
 }
 
-void mga::FBDevice::render_gl_and_overlays(
+void mga::FBDevice::prepare_overlays(
     SwappingGLContext const& context,
-    RenderableList const& renderables,
-    std::function<void(Renderable const&)> const& render_fn) 
+    RenderableList const& list,
+    RenderableListCompositor const& compositor)
 {
-    for(auto const& renderable : renderables)
-        render_fn(*renderable);
-
-    context.swap_buffers();
+    compositor.render(list, context);
 }
 
 void mga::FBDevice::post(mg::Buffer const& buffer)

=== modified file 'src/platform/graphics/android/fb_device.h'
--- src/platform/graphics/android/fb_device.h	2014-03-26 05:48:59 +0000
+++ src/platform/graphics/android/fb_device.h	2014-05-12 18:27:14 +0000
@@ -38,10 +38,10 @@
     bool apply_orientation(MirOrientation orientation) const;
     void mode(MirPowerMode mode);
     virtual void render_gl(SwappingGLContext const& context);
-    virtual void render_gl_and_overlays(
+    virtual void prepare_overlays(
         SwappingGLContext const& context,
         RenderableList const& list,
-        std::function<void(Renderable const&)> const& render_fn);
+        RenderableListCompositor const& list_compositor);
     void post(Buffer const& buffer);
 
 private:

=== modified file 'src/platform/graphics/android/hwc_device.cpp'
--- src/platform/graphics/android/hwc_device.cpp	2014-03-26 05:48:59 +0000
+++ src/platform/graphics/android/hwc_device.cpp	2014-05-12 18:27:14 +0000
@@ -24,7 +24,7 @@
 #include "hwc_wrapper.h"
 #include "framebuffer_bundle.h"
 #include "buffer.h"
-#include "mir/graphics/buffer.h"
+#include "overlay_gl_compositor.h"
 
 namespace mg = mir::graphics;
 namespace mga=mir::graphics::android;
@@ -88,10 +88,10 @@
     context.swap_buffers();
 }
 
-void mga::HwcDevice::render_gl_and_overlays(
+void mga::HwcDevice::prepare_overlays(
     SwappingGLContext const& context,
     RenderableList const& renderables,
-    std::function<void(Renderable const&)> const& render_fn)
+    RenderableListCompositor const& list_compositor)
 {
     if (!(list_needs_commit = hwc_list.update_list_and_check_if_changed(renderables, fbtarget_size)))
         return;
@@ -99,25 +99,18 @@
 
     hwc_wrapper->prepare(*hwc_list.native_list().lock());
 
-    //draw layers that the HWC did not accept for overlays here
-    bool needs_swapbuffers = false;
+    mg::RenderableList rejected_renderables;
+
     auto layers_it = hwc_list.begin();
     for(auto const& renderable : renderables)
     {
-        //prepare all layers for draw. 
         layers_it->prepare_for_draw();
-
-        //trigger GL on the layers that are not overlays
         if (layers_it->needs_gl_render())
-        {
-            render_fn(*renderable);
-            needs_swapbuffers = true;
-        }
+            rejected_renderables.push_back(renderable);
         layers_it++;
     }
 
-    if (needs_swapbuffers)
-        context.swap_buffers();
+    list_compositor.render(rejected_renderables, context);
 }
 
 void mga::HwcDevice::post(mg::Buffer const& buffer)

=== modified file 'src/platform/graphics/android/hwc_device.h'
--- src/platform/graphics/android/hwc_device.h	2014-03-26 05:48:59 +0000
+++ src/platform/graphics/android/hwc_device.h	2014-05-12 18:27:14 +0000
@@ -48,10 +48,10 @@
               std::shared_ptr<SyncFileOps> const& sync_ops);
 
     virtual void render_gl(SwappingGLContext const& context);
-    virtual void render_gl_and_overlays(
+    virtual void prepare_overlays(
         SwappingGLContext const& context,
         RenderableList const& list,
-        std::function<void(Renderable const&)> const& render_fn);
+        RenderableListCompositor const& list_compositor);
     void post(Buffer const& buffer);
 
 private:

=== modified file 'src/platform/graphics/android/hwc_fb_device.cpp'
--- src/platform/graphics/android/hwc_fb_device.cpp	2014-03-26 05:48:59 +0000
+++ src/platform/graphics/android/hwc_fb_device.cpp	2014-05-12 18:27:14 +0000
@@ -22,8 +22,10 @@
 #include "framebuffer_bundle.h"
 #include "android_format_conversion-inl.h"
 #include "hwc_wrapper.h"
+#include "overlay_gl_compositor.h"
 #include "mir/graphics/buffer.h"
 #include "mir/graphics/android/native_buffer.h"
+#include "gl_context.h"
 
 #include <boost/throw_exception.hpp>
 #include <sstream>
@@ -33,6 +35,24 @@
 namespace mga = mir::graphics::android;
 namespace geom = mir::geometry;
 
+namespace 
+{
+class HWC10Context : public mga::SwappingGLContext
+{
+public:
+    HWC10Context(std::function<void()> const& swapping_fn)
+        : swapping_fn(std::move(swapping_fn))
+    {
+    }
+    void swap_buffers() const override
+    {
+        swapping_fn();
+    }
+private:
+    std::function<void()> const swapping_fn;
+};
+}
+
 mga::HwcFbDevice::HwcFbDevice(std::shared_ptr<hwc_composer_device_1> const& hwc_device,
                               std::shared_ptr<HwcWrapper> const& hwc_wrapper,
                               std::shared_ptr<framebuffer_device_t> const& fb_device,
@@ -84,16 +104,15 @@
     gpu_render();
 }
 
-void mga::HwcFbDevice::render_gl_and_overlays(
+void mga::HwcFbDevice::prepare_overlays(
     SwappingGLContext const&,
-    RenderableList const& renderables,
-    std::function<void(Renderable const&)> const& render_fn)
+    RenderableList const& list,
+    RenderableListCompositor const& compositor)
 {
     prepare();
-    //TODO: filter this list based on the results of the preparation
-    for(auto const& renderable : renderables)
-        render_fn(*renderable);
-    gpu_render();
+    //hwc 1.0 is weird in that the driver gets to call eglSwapBuffers.
+    HWC10Context context(std::bind(&HwcFbDevice::gpu_render, this));
+    compositor.render(list, context);
 }
 
 void mga::HwcFbDevice::post(mg::Buffer const& buffer)

=== modified file 'src/platform/graphics/android/hwc_fb_device.h'
--- src/platform/graphics/android/hwc_fb_device.h	2014-03-26 05:48:59 +0000
+++ src/platform/graphics/android/hwc_fb_device.h	2014-05-12 18:27:14 +0000
@@ -41,10 +41,10 @@
                 std::shared_ptr<HWCVsyncCoordinator> const& coordinator);
 
     virtual void render_gl(SwappingGLContext const& context);
-    virtual void render_gl_and_overlays(
+    virtual void prepare_overlays(
         SwappingGLContext const& context,
         RenderableList const& list,
-        std::function<void(Renderable const&)> const& render_fn);
+        RenderableListCompositor const& list_compositor);
     void post(Buffer const& buffer);
 
 private:

=== modified file 'src/platform/graphics/android/overlay_gl_compositor.cpp'
--- src/platform/graphics/android/overlay_gl_compositor.cpp	2014-04-17 23:10:31 +0000
+++ src/platform/graphics/android/overlay_gl_compositor.cpp	2014-05-12 18:27:14 +0000
@@ -47,3 +47,7 @@
     overlay_program = factory.create_gl_program(vertex_shader, fragment_shader);
     context.release_current();
 }
+
+void mga::OverlayGLProgram::render(RenderableList const&, SwappingGLContext const&) const
+{
+}

=== modified file 'src/platform/graphics/android/overlay_gl_compositor.h'
--- src/platform/graphics/android/overlay_gl_compositor.h	2014-04-17 22:20:59 +0000
+++ src/platform/graphics/android/overlay_gl_compositor.h	2014-05-12 18:27:14 +0000
@@ -20,6 +20,7 @@
 #define MIR_GRAPHICS_ANDROID_OVERLAY_GL_PROGRAM_H_
 
 #include "mir/graphics/gl_program.h"
+#include "mir/graphics/renderable.h"
 #include <memory>
 
 namespace mir
@@ -31,11 +32,26 @@
 
 namespace android
 {
-
-class OverlayGLProgram
+class SwappingGLContext;
+
+class RenderableListCompositor
+{
+public:
+    virtual ~RenderableListCompositor() = default;
+    virtual void render(RenderableList const&, SwappingGLContext const&) const = 0;
+protected:
+    RenderableListCompositor() = default;
+private:
+    RenderableListCompositor(RenderableListCompositor const&) = delete;
+    RenderableListCompositor& operator=(RenderableListCompositor const&) = delete;
+};
+
+class OverlayGLProgram : public RenderableListCompositor
 {
 public:
     OverlayGLProgram(GLProgramFactory const& program_factory, graphics::GLContext const& gl_context);
+
+    void render(RenderableList const&, SwappingGLContext const&) const;
 private:
     std::unique_ptr<graphics::GLProgram> overlay_program;
 };

=== modified file 'tests/unit-tests/graphics/android/test_fb_device.cpp'
--- tests/unit-tests/graphics/android/test_fb_device.cpp	2014-03-11 13:44:57 +0000
+++ tests/unit-tests/graphics/android/test_fb_device.cpp	2014-05-12 18:27:14 +0000
@@ -19,6 +19,7 @@
 #include "mir_test_doubles/mock_fb_hal_device.h"
 #include "mir_test_doubles/mock_buffer.h"
 #include "src/platform/graphics/android/fb_device.h"
+#include "src/platform/graphics/android/overlay_gl_compositor.h"
 #include "mir_test_doubles/mock_framebuffer_bundle.h"
 #include "mir_test_doubles/mock_android_hw.h"
 #include "mir_test_doubles/mock_egl.h"
@@ -27,6 +28,8 @@
 #include "mir_test_doubles/mock_android_native_buffer.h"
 #include "mir_test_doubles/mock_render_function.h"
 #include "mir_test_doubles/mock_swapping_gl_context.h"
+#include "mir_test_doubles/stub_renderable_list_compositor.h"
+#include "mir_test_doubles/mock_renderable_list_compositor.h"
 
 #include <gtest/gtest.h>
 #include <stdexcept>
@@ -63,7 +66,7 @@
     mtd::MockSwappingGLContext mock_context;
 };
 
-TEST_F(FBDevice, render_overlays_via_gl)
+TEST_F(FBDevice, prepares_overlays_by_rendering)
 {
     auto renderable1 = std::make_shared<mtd::StubRenderable>();
     auto renderable2 = std::make_shared<mtd::StubRenderable>();
@@ -73,20 +76,11 @@
         renderable2
     };
 
-    mtd::MockRenderFunction mock_call_counter;
-    testing::Sequence seq;
-    EXPECT_CALL(mock_call_counter, called(testing::Ref(*renderable1)))
-        .InSequence(seq);
-    EXPECT_CALL(mock_call_counter, called(testing::Ref(*renderable2)))
-        .InSequence(seq);
-    EXPECT_CALL(mock_context, swap_buffers())
-        .InSequence(seq);
-
+    mtd::MockRenderableListCompositor mock_compositor;
+    EXPECT_CALL(mock_compositor, render(testing::Ref(renderlist),testing::_))
+        .Times(1);
     mga::FBDevice fbdev(fb_hal_mock);
-    fbdev.render_gl_and_overlays(mock_context, renderlist, [&](mg::Renderable const& renderable)
-    {
-        mock_call_counter.called(renderable);
-    });
+    fbdev.prepare_overlays(mock_context, renderlist, mock_compositor);
 }
 
 TEST_F(FBDevice, commits_frame_via_post)

=== modified file 'tests/unit-tests/graphics/android/test_hwc_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc_device.cpp	2014-05-05 03:36:45 +0000
+++ tests/unit-tests/graphics/android/test_hwc_device.cpp	2014-05-12 18:27:14 +0000
@@ -34,6 +34,8 @@
 #include "mir_test_doubles/mock_render_function.h"
 #include "mir_test_doubles/mock_swapping_gl_context.h"
 #include "mir_test_doubles/stub_swapping_gl_context.h"
+#include "mir_test_doubles/stub_renderable_list_compositor.h"
+#include "mir_test_doubles/mock_renderable_list_compositor.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <stdexcept>
@@ -230,6 +232,7 @@
     testing::NiceMock<mtd::MockBuffer> mock_buffer;
     mtd::MockSwappingGLContext mock_context;
     mtd::StubSwappingGLContext stub_context;
+    mtd::StubRenderableListCompositor stub_compositor;
 };
 
 
@@ -249,125 +252,62 @@
     device.render_gl(stub_context);
 }
 
-TEST_F(HwcDevice, calls_render_fn_and_swap_when_all_overlays_are_rejected)
-{
-    using namespace testing;
-    mtd::MockRenderFunction mock_render_fn;
-    auto render_fn = [&](mg::Renderable const& renderable)
-    {
-        mock_render_fn.called(renderable);
-    };
-
-    std::list<std::shared_ptr<mg::Renderable>> updated_list({
-        stub_renderable1,
-        stub_renderable2
-    });
-
-    std::list<hwc_layer_1_t*> expected_list
-    {
-        &comp_layer,
-        &comp_layer,
-        &target_layer
-    };
-
-    Sequence seq;
-    EXPECT_CALL(*mock_hwc_device_wrapper, prepare(MatchesList(expected_list)))
-        .InSequence(seq)
-        .WillOnce(Invoke([&](hwc_display_contents_1_t& contents)
-        {
-            ASSERT_EQ(contents.numHwLayers, 3);
-            contents.hwLayers[0].compositionType = HWC_FRAMEBUFFER;
-            contents.hwLayers[1].compositionType = HWC_FRAMEBUFFER;
-            contents.hwLayers[2].compositionType = HWC_FRAMEBUFFER_TARGET;
-        }));
-    EXPECT_CALL(mock_render_fn, called(Ref(*stub_renderable1)))
-        .InSequence(seq);
-    EXPECT_CALL(mock_render_fn, called(Ref(*stub_renderable2)))
-        .InSequence(seq);
-    EXPECT_CALL(mock_context, swap_buffers())
-        .InSequence(seq);
-
-    mga::HwcDevice device(mock_device, mock_hwc_device_wrapper, mock_vsync, mock_file_ops);
-    device.render_gl_and_overlays(mock_context, updated_list, render_fn);
-}
-
-TEST_F(HwcDevice, calls_render_and_swap_when_some_overlays_are_rejected)
-{
-    using namespace testing;
-    mtd::MockRenderFunction mock_render_fn;
-    auto render_fn = [&](mg::Renderable const& renderable)
-    {
-        mock_render_fn.called(renderable);
-    };
-
-    std::list<std::shared_ptr<mg::Renderable>> updated_list({
-        stub_renderable1,
-        stub_renderable2
-    });
-
-    std::list<hwc_layer_1_t*> expected_list
-    {
-        &comp_layer,
-        &comp_layer,
-        &target_layer
-    };
-
-    Sequence seq;
-    EXPECT_CALL(*mock_hwc_device_wrapper, prepare(MatchesList(expected_list)))
-        .InSequence(seq)
-        .WillOnce(Invoke([&](hwc_display_contents_1_t& contents)
-        {
-            ASSERT_EQ(contents.numHwLayers, 3);
-            contents.hwLayers[0].compositionType = HWC_OVERLAY;
-            contents.hwLayers[1].compositionType = HWC_FRAMEBUFFER;
-            contents.hwLayers[2].compositionType = HWC_FRAMEBUFFER_TARGET;
-        }));
-    EXPECT_CALL(mock_render_fn, called(Ref(*stub_renderable2)))
-        .InSequence(seq);
-    EXPECT_CALL(mock_context, swap_buffers())
-        .InSequence(seq);
-
-    mga::HwcDevice device(mock_device, mock_hwc_device_wrapper, mock_vsync, mock_file_ops);
-    device.render_gl_and_overlays(mock_context, updated_list, render_fn);
-}
-
-TEST_F(HwcDevice, does_not_call_render_or_swap_when_all_overlays_accepted)
-{
-    using namespace testing;
-    mtd::MockRenderFunction mock_render_fn;
-    auto render_fn = [&](mg::Renderable const& renderable)
-    {
-        mock_render_fn.called(renderable);
-    };
-
-    std::list<std::shared_ptr<mg::Renderable>> updated_list({
-        stub_renderable1,
-        stub_renderable2
-    });
-
-    std::list<hwc_layer_1_t*> expected_list
-    {
-        &comp_layer,
-        &comp_layer,
-        &target_layer
-    };
-
-    EXPECT_CALL(*mock_hwc_device_wrapper, prepare(MatchesList(expected_list)))
-        .Times(1)
-        .WillOnce(Invoke([&](hwc_display_contents_1_t& contents)
-        {
-            ASSERT_EQ(contents.numHwLayers, 3);
-            contents.hwLayers[0].compositionType = HWC_OVERLAY;
-            contents.hwLayers[1].compositionType = HWC_OVERLAY;
-            contents.hwLayers[2].compositionType = HWC_FRAMEBUFFER_TARGET;
-        }));
-    EXPECT_CALL(mock_render_fn, called(_))
-        .Times(0);
-    EXPECT_CALL(mock_context, swap_buffers())
-        .Times(0);
-
-    mga::HwcDevice device(mock_device, mock_hwc_device_wrapper, mock_vsync, mock_file_ops);
-    device.render_gl_and_overlays(mock_context, updated_list, render_fn);
+namespace
+{
+MATCHER_P(MatchesRenderableList, value, std::string(""))
+{
+    if (value.size() != arg.size())
+        return false;
+
+    bool match{true};
+    auto it = value.begin();
+    for(auto const& a : arg)
+    {
+        if (a != *it)
+            match = false;
+        it++;
+    }
+    return match; 
+}
+
+}
+
+TEST_F(HwcDevice, calls_render_with_list_of_rejected_overlays)
+{
+    using namespace testing;
+    mtd::MockRenderableListCompositor mock_compositor;
+
+    std::list<std::shared_ptr<mg::Renderable>> updated_list({
+        stub_renderable1,
+        stub_renderable2
+    });
+    std::list<std::shared_ptr<mg::Renderable>> expected_renderable_list({
+        stub_renderable2
+    });
+
+    std::list<hwc_layer_1_t*> expected_prepare_list
+    {
+        &comp_layer,
+        &comp_layer,
+        &target_layer
+    };
+
+    Sequence seq;
+    EXPECT_CALL(*mock_hwc_device_wrapper, prepare(MatchesList(expected_prepare_list)))
+        .InSequence(seq)
+        .WillOnce(Invoke([&](hwc_display_contents_1_t& contents)
+        {
+            ASSERT_EQ(contents.numHwLayers, 3);
+            contents.hwLayers[0].compositionType = HWC_OVERLAY;
+            contents.hwLayers[1].compositionType = HWC_FRAMEBUFFER;
+            contents.hwLayers[2].compositionType = HWC_FRAMEBUFFER_TARGET;
+        }));
+
+    EXPECT_CALL(mock_compositor, render(MatchesRenderableList(expected_renderable_list),Ref(mock_context)))
+        .InSequence(seq);
+
+    mga::HwcDevice device(mock_device, mock_hwc_device_wrapper, mock_vsync, mock_file_ops);
+    device.prepare_overlays(mock_context, updated_list, mock_compositor);
 }
 
 TEST_F(HwcDevice, resets_layers_when_prepare_gl_called)
@@ -398,7 +338,7 @@
         stub_renderable2
     });
 
-    device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
+    device.prepare_overlays(stub_context, updated_list, stub_compositor);
     device.render_gl(stub_context);
 }
 
@@ -544,7 +484,7 @@
     EXPECT_CALL(*native_handle_3, update_fence(release_fence3))
         .InSequence(seq);
 
-    device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
+    device.prepare_overlays(stub_context, updated_list, stub_compositor);
     device.post(mock_buffer);
 }
 
@@ -570,9 +510,9 @@
     EXPECT_CALL(*mock_hwc_device_wrapper, set(_))
         .Times(1);
 
-    device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
+    device.prepare_overlays(stub_context, updated_list, stub_compositor);
     device.post(mock_buffer);
-    device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
+    device.prepare_overlays(stub_context, updated_list, stub_compositor);
     device.post(mock_buffer);
 }
 
@@ -598,9 +538,9 @@
     EXPECT_CALL(*mock_hwc_device_wrapper, set(_))
         .Times(2);
 
-    device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
+    device.prepare_overlays(stub_context, updated_list, stub_compositor);
     device.post(mock_buffer);
-    device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
+    device.prepare_overlays(stub_context, updated_list, stub_compositor);
     device.post(mock_buffer);
 }
 
@@ -643,7 +583,7 @@
             EXPECT_EQ(HWC_FRAMEBUFFER, contents.hwLayers[0].compositionType);
         }));
 
-    device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
-    device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
+    device.prepare_overlays(stub_context, updated_list, stub_compositor);
+    device.prepare_overlays(stub_context, updated_list, stub_compositor);
     device.post(mock_buffer);
 }

=== modified file 'tests/unit-tests/graphics/android/test_hwc_display.cpp'
--- tests/unit-tests/graphics/android/test_hwc_display.cpp	2014-05-01 07:13:02 +0000
+++ tests/unit-tests/graphics/android/test_hwc_display.cpp	2014-05-12 18:27:14 +0000
@@ -133,7 +133,7 @@
     std::function<void(mg::Renderable const&)> render_fn;
 
     InSequence seq;
-    EXPECT_CALL(*mock_display_device, render_gl_and_overlays(_, Ref(renderlist), Ref(render_fn)))
+    EXPECT_CALL(*mock_display_device, prepare_overlays(_, Ref(renderlist), _))
         .Times(1);
     EXPECT_CALL(*mock_fb_bundle, last_rendered_buffer())
         .Times(1)

=== modified file 'tests/unit-tests/graphics/android/test_hwc_fb_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc_fb_device.cpp	2014-03-26 05:48:59 +0000
+++ tests/unit-tests/graphics/android/test_hwc_fb_device.cpp	2014-05-12 18:27:14 +0000
@@ -29,6 +29,8 @@
 #include "mir_test_doubles/stub_swapping_gl_context.h"
 #include "mir_test_doubles/mock_egl.h"
 #include "mir_test_doubles/mock_hwc_device_wrapper.h"
+#include "mir_test_doubles/mock_renderable_list_compositor.h"
+#include "src/platform/graphics/android/overlay_gl_compositor.h"
 #include "hwc_struct_helpers.h"
 #include <gtest/gtest.h>
 #include <stdexcept>
@@ -111,6 +113,7 @@
 TEST_F(HwcFbDevice, hwc10_prepare_with_renderables)
 {
     using namespace testing;
+    mtd::MockRenderableListCompositor mock_compositor;
     std::list<hwc_layer_1_t*> expected_list{&skip_layer};
     auto renderable1 = std::make_shared<mtd::StubRenderable>();
     auto renderable2 = std::make_shared<mtd::StubRenderable>();
@@ -120,14 +123,15 @@
         renderable2
     };
 
-    mtd::MockRenderFunction mock_call_counter;
     testing::Sequence seq;
     EXPECT_CALL(*mock_hwc_device_wrapper, prepare(MatchesList(expected_list)))
         .InSequence(seq);
-    EXPECT_CALL(mock_call_counter, called(testing::Ref(*renderable1)))
-        .InSequence(seq);
-    EXPECT_CALL(mock_call_counter, called(testing::Ref(*renderable2)))
-        .InSequence(seq);
+    EXPECT_CALL(mock_compositor, render(Ref(renderlist),_))
+        .InSequence(seq)
+        .WillOnce(Invoke([](mg::RenderableList const&, mga::SwappingGLContext const& cont)
+        {
+            cont.swap_buffers();
+        }));
     EXPECT_CALL(mock_egl, eglGetCurrentDisplay())
         .InSequence(seq)
         .WillOnce(Return(dpy));
@@ -138,11 +142,7 @@
         .InSequence(seq);
 
     mga::HwcFbDevice device(mock_hwc_device, mock_hwc_device_wrapper, mock_fb_device, mock_vsync);
-
-    device.render_gl_and_overlays(stub_context, renderlist, [&](mg::Renderable const& renderable)
-    {
-        mock_call_counter.called(renderable);
-    });
+    device.prepare_overlays(stub_context, renderlist, mock_compositor);
 }
 
 TEST_F(HwcFbDevice, hwc10_post)