Mir

Merge lp:~kdub/mir/refix-1517205 into lp:mir

refix-1517205
Merge into development-branch

Proposed by Kevin DuBois on 2016-01-25

Status:

Merged

Approved by:

Daniel van Vugt on 2016-02-09

Approved revision:

3284

Merged at revision:

3297

Proposed branch:

lp:~kdub/mir/refix-1517205

Merge into:

lp:mir

Diff against target:

2060 lines (+730/-149)

71 files modified

include/renderers/gl/mir/renderer/gl/texture_source.h (+10/-0)
src/gl/recently_used_cache.cpp (+8/-7)
src/include/platform/mir/graphics/egl_extensions.h (+0/-8)
src/platform/graphics/CMakeLists.txt (+0/-1)
src/platform/graphics/egl_extensions.cpp (+0/-12)
src/platforms/android/client/CMakeLists.txt (+1/-0)
src/platforms/android/client/gralloc_registrar.cpp (+4/-2)
src/platforms/android/common/CMakeLists.txt (+2/-0)
src/platforms/android/common/android_native_buffer.cpp (+18/-4)
src/platforms/android/common/egl_sync_extensions.cpp (+35/-0)
src/platforms/android/common/egl_sync_fence.cpp (+1/-1)
src/platforms/android/include/android/native_window.h (+21/-0)
src/platforms/android/include/android_native_buffer.h (+6/-0)
src/platforms/android/include/command_stream_sync.h (+51/-0)
src/platforms/android/include/egl_sync_extensions.h (+48/-0)
src/platforms/android/include/egl_sync_fence.h (+2/-21)
src/platforms/android/include/native_buffer.h (+3/-0)
src/platforms/android/server/CMakeLists.txt (+1/-0)
src/platforms/android/server/android_alloc_adaptor.cpp (+12/-5)
src/platforms/android/server/android_alloc_adaptor.h (+6/-2)
src/platforms/android/server/android_buffer_allocator.cpp (+10/-4)
src/platforms/android/server/android_graphic_buffer_allocator.h (+5/-1)
src/platforms/android/server/buffer.cpp (+23/-4)
src/platforms/android/server/buffer.h (+6/-0)
src/platforms/android/server/cmdstream_sync_factory.h (+48/-0)
src/platforms/android/server/device_quirks.cpp (+6/-0)
src/platforms/android/server/device_quirks.h (+1/-0)
src/platforms/android/server/display_buffer.cpp (+3/-0)
src/platforms/android/server/display_component_factory.h (+2/-0)
src/platforms/android/server/display_device.h (+2/-0)
src/platforms/android/server/egl_sync_factory.cpp (+35/-0)
src/platforms/android/server/fb_device.cpp (+5/-2)
src/platforms/android/server/fb_device.h (+1/-0)
src/platforms/android/server/hal_component_factory.cpp (+20/-1)
src/platforms/android/server/hal_component_factory.h (+4/-1)
src/platforms/android/server/hwc_device.cpp (+11/-6)
src/platforms/android/server/hwc_device.h (+1/-0)
src/platforms/android/server/hwc_fb_device.cpp (+5/-0)
src/platforms/android/server/hwc_fb_device.h (+1/-0)
src/platforms/android/server/ipc_operations.cpp (+1/-0)
src/platforms/android/server/platform.cpp (+10/-4)
src/platforms/android/server/platform.h (+3/-0)
src/platforms/mesa/server/common/gbm_buffer.cpp (+9/-0)
src/platforms/mesa/server/common/gbm_buffer.h (+2/-0)
src/platforms/mesa/server/common/shm_buffer.cpp (+9/-0)
src/platforms/mesa/server/common/shm_buffer.h (+2/-0)
tests/include/mir/test/doubles/mock_android_native_buffer.h (+2/-0)
tests/include/mir/test/doubles/mock_buffer.h (+1/-0)
tests/include/mir/test/doubles/mock_display_device.h (+3/-0)
tests/include/mir/test/doubles/mock_gl_buffer.h (+2/-0)
tests/include/mir/test/doubles/stub_android_native_buffer.h (+3/-0)
tests/include/mir/test/doubles/stub_cmdstream_sync_factory.h (+41/-0)
tests/include/mir/test/doubles/stub_display_builder.h (+5/-0)
tests/include/mir/test/doubles/stub_gl_buffer.h (+2/-0)
tests/integration-tests/graphics/mesa/test_buffer_integration.cpp (+3/-0)
tests/unit-tests/gl/test_gl_texture_cache.cpp (+3/-1)
tests/unit-tests/gl/test_program_factory.cpp (+1/-1)
tests/unit-tests/graphics/android/CMakeLists.txt (+1/-0)
tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp (+6/-3)
tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp (+6/-2)
tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp (+13/-1)
tests/unit-tests/graphics/android/test_display_buffer.cpp (+15/-0)
tests/unit-tests/graphics/android/test_display_hotplug.cpp (+5/-0)
tests/unit-tests/graphics/android/test_egl_sync_extensions.cpp (+75/-0)
tests/unit-tests/graphics/android/test_fb_device.cpp (+8/-0)
tests/unit-tests/graphics/android/test_hwc_device.cpp (+9/-8)
tests/unit-tests/graphics/android/test_hwc_fb_device.cpp (+6/-0)
tests/unit-tests/graphics/android/test_native_buffer.cpp (+50/-7)
tests/unit-tests/graphics/android/test_platform.cpp (+15/-4)
tests/unit-tests/graphics/test_egl_extensions.cpp (+0/-35)
tests/unit-tests/graphics/test_egl_sync_fence.cpp (+1/-1)

To merge this branch:

bzr merge lp:~kdub/mir/refix-1517205

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2016-02-08
Alexandros Frantzis (community)		2016-01-25	Approve on 2016-02-08
Mir CI Bot	continuous-integration		Approve on 2016-02-08
Alan Griffiths			Approve on 2016-02-08
Review via email: mp+283861@code.launchpad.net

Commit Message

repropose already landed branch introducing sync fences
(https://code.launchpad.net/~kdub/mir/egl-sync-fences/+merge/278181)
while avoiding the mx4/powervr regression that caused its reversion.

fixes: LP: #1517205

Description of the Change

repropose already landed branch introducing sync fences
(https://code.launchpad.net/~kdub/mir/egl-sync-fences/+merge/278181)
while avoiding the mx4/powervr regression that caused its reversion.

fixes: LP: #1517205

Tested against regression with MX4 with full unity stack.
The fixme in line 532 has a trello card to track: https://trello.com/c/XzFGfwlE

Mir CI Bot (mir-ci-bot) wrote on 2016-01-26:

FAILED: Continuous integration, rev:3273
https://mir-jenkins.ubuntu.com/job/mir-ci/161/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/160/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/161/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-26:

FAILED: Continuous integration, rev:3273
http://jenkins.qa.ubuntu.com/job/mir-ci/6129/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5696/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4603
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5652/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/453/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/453/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5649/console

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

review: Needs Fixing (continuous-integration)

lp:~kdub/mir/refix-1517205 updated on 2016-01-26

3274. By Kevin DuBois on 2016-01-26: add a missing stub file

Mir CI Bot (mir-ci-bot) wrote on 2016-01-26:

FAILED: Continuous integration, rev:3274
https://mir-jenkins.ubuntu.com/job/mir-ci/162/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/162/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/162/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-26:

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

review: Needs Fixing (continuous-integration)

lp:~kdub/mir/refix-1517205 updated on 2016-01-26

3275. By Kevin DuBois on 2016-01-26: merge in mir
3276. By Kevin DuBois on 2016-01-26: fix up a problem when building on android platform on mesa

Mir CI Bot (mir-ci-bot) wrote on 2016-01-26:

FAILED: Continuous integration, rev:3276
https://mir-jenkins.ubuntu.com/job/mir-ci/164/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/164/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/164/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-26:

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

review: Approve (continuous-integration)

lp:~kdub/mir/refix-1517205 updated on 2016-01-27

3277. By Kevin DuBois on 2016-01-27: merge in mir

Kevin DuBois (kdub) wrote on 2016-01-27:

failure was intermittent, nonrelated lp: #1537798

Mir CI Bot (mir-ci-bot) wrote on 2016-01-27:

FAILED: Continuous integration, rev:3277
https://mir-jenkins.ubuntu.com/job/mir-ci/169/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/169/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/169/rebuild

review: Needs Fixing (continuous-integration)

Alexandros Frantzis (afrantzis) wrote on 2016-01-27:

=> class TextureSource

The changes break TextureSource ABI, which is used by QtMir and others. We haven't really thought through all the details about how we handle such a case, but I guess we should at least ensure the ABI numbers of the platforms supporting GL (i.e. everything at the moment) are bumped.

+ mirplatform

mirplatform was used up to now for the server side of Mir. Do we want to use the same library for the client?

Looks discussion/fixing

review: Needs Information

PS Jenkins bot (ps-jenkins) wrote on 2016-01-27:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-28:

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

review: Approve (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2016-01-28:

> + mirplatform
>
> mirplatform was used up to now for the server side of Mir. Do we want to use
> the same library for the client?
>
> Looks discussion/fixing

IMO "mirplatform" is the wrong place for anything mirclient uses. Maybe the name is misleading, but it was intended to provide the types needed to specify the mirserver requirements on a platform module.

Types needed by both server and client should be in mircommon. (I am aware there are some currently in mirclient - because of some coupling in the implementation that no-one has spent time unpicking.)

[aside] With our thoughts about removing reliance on EGL, perhaps we need a new miregl library that client and server "platform" modules could use?

review: Needs Information

lp:~kdub/mir/refix-1517205 updated on 2016-01-28

3278. By Kevin DuBois on 2016-01-28: merge in mir
3279. By Kevin DuBois on 2016-01-28: internalize the egl sync extensions because the android platform is the only one using them
3280. By Kevin DuBois on 2016-01-28: bump the server ABI for 0.20

Kevin DuBois (kdub) wrote on 2016-01-28:

I'm wasn't too flummoxed by mirplatform being used by the client, but OTOH, may as well not link to it if we can help it.

I sidestepped the problem by pulling the new code from mirplatform to src/platforms/android/common. (a directory for common-to-client-and-server android code).

I also bumped server ABI for the 0.20 series, as we have indeed broken the server abi (but not api) for those using mg::Buffer's

Mir CI Bot (mir-ci-bot) wrote on 2016-01-28:

FAILED: Continuous integration, rev:3280
https://mir-jenkins.ubuntu.com/job/mir-ci/180/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/180/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/180/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-28:

FAILED: Continuous integration, rev:3280
http://jenkins.qa.ubuntu.com/job/mir-ci/6151/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5722/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4629/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5678/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/475/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/475/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5675/console

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-28:

FAILED: Continuous integration, rev:3280
http://jenkins.qa.ubuntu.com/job/mir-ci/6154/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5725/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4632/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5681/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/478/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/478/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5678/console

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-28:

FAILED: Continuous integration, rev:3280
http://jenkins.qa.ubuntu.com/job/mir-ci/6155/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5726/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4633/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5682/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/479/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/479/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5679/console

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

review: Needs Fixing (continuous-integration)

lp:~kdub/mir/refix-1517205 updated on 2016-01-29

3281. By Kevin DuBois on 2016-01-29: correct build problems. might be a temporary fix

Mir CI Bot (mir-ci-bot) wrote on 2016-01-29:

PASSED: Continuous integration, rev:3281
https://mir-jenkins.ubuntu.com/job/mir-ci/188/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/189/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/188/rebuild

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-29:

FAILED: Continuous integration, rev:3281
http://jenkins.qa.ubuntu.com/job/mir-ci/6161/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5739/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4646
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5695/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/485
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/485/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/485
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/485/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5692/console

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

review: Needs Fixing (continuous-integration)

lp:~kdub/mir/refix-1517205 updated on 2016-02-02

3282. By Kevin DuBois on 2016-02-02: merge in miri
3283. By Kevin DuBois on 2016-02-02: fix up build error. local build must have had unit tests off

Mir CI Bot (mir-ci-bot) wrote on 2016-02-02:

PASSED: Continuous integration, rev:3283
https://mir-jenkins.ubuntu.com/job/mir-ci/210/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/210/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/210/rebuild

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-03:

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

review: Approve (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2016-02-03:

I'm not sure what's going on with the move of mir::graphics::Foo headers to src/platforms/android/include/

Are these types specific to android platforms? If so, do they belong in namespace mir::graphics?

review: Needs Information

Kevin DuBois (kdub) wrote on 2016-02-05:

They are only used by the android platform at the moment (so that mirplatform remains server-side only), but they are not android-specific, so graphics seems appropriate.

Alan Griffiths (alan-griffiths) wrote on 2016-02-08:

*Note to reviewers:* the lp diff is wrong (stale?)

Otherwise seems OK

review: Approve

Alexandros Frantzis (afrantzis) wrote on 2016-02-08:

We also need to update the ABI of all our platforms (since they support TextureSource).

review: Needs Fixing

Mir CI Bot (mir-ci-bot) wrote on 2016-02-08:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/251/rebuild

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-08:

FAILED: Continuous integration, rev:3285
http://jenkins.qa.ubuntu.com/job/mir-ci/6228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4734
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5783/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/552
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/552/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/552
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/552/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5780
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5780/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8185/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27386

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

review: Needs Fixing (continuous-integration)

Kevin DuBois (kdub) wrote on 2016-02-08:

^failure downloading packages from overlay... retriggering.

lp:~kdub/mir/refix-1517205 updated on 2016-02-08

3284. By Kevin DuBois on 2016-02-08: merge in mir

Alexandros Frantzis (afrantzis) wrote on 2016-02-08:

> We also need to update the ABI of all our platforms (since they support TextureSource).

Turns out MIR_SERVER_GRAPHICS_PLATFORM_ABI has already been bumped after 0.19, so we should be fine.

I don't think we need to bump libmirplatform ABI.

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2016-02-08:

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

review: Approve (continuous-integration)

Daniel van Vugt (vanvugt) wrote on 2016-02-09:

I'm excited to see this bug fixed. Haven't got to reviewing it myself but I'll top approve and see what happens.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Emanuele Antonio Faraone

Gerry Boland

Kevin DuBois

Mir development team

 === modified file 'include/renderers/gl/mir/renderer/gl/texture_source.h'
 --- include/renderers/gl/mir/renderer/gl/texture_source.h	2016-01-29 08:18:22 +0000
 +++ include/renderers/gl/mir/renderer/gl/texture_source.h	2016-02-08 17:34:18 +0000
@@ -26,12 +26,22 @@
  namespace gl
+ {
++//FIXME: (kdub) we're not hiding the differences in texture upload approaches between our platforms
++//       very well with this interface.
  class TextureSource
+ {
  public:
      virtual ~TextureSource() = default;
++    // \warning deprecated, provided for convenience and legacy transition.
++    //will call bind() and then secure_for_render()
      virtual void gl_bind_to_texture() = 0;
++    //Uploads texture.
++    virtual void bind() = 0;
++    //add synchronization points to the command stream to ensure resources
++    //are present during the draw. Will not upload texture.
++    //should be called if an already uploaded texture is reused.
++    virtual void secure_for_render() = 0;
  protected:
      TextureSource() = default;
 === modified file 'src/gl/recently_used_cache.cpp'
 --- src/gl/recently_used_cache.cpp	2016-01-29 08:18:22 +0000
 +++ src/gl/recently_used_cache.cpp	2016-02-08 17:34:18 +0000
@@ -27,6 +27,7 @@
  namespace mg = mir::graphics;
  namespace mgl = mir::gl;
  namespace geom = mir::geometry;
++namespace mrgl = mir::renderer::gl;
  std::shared_ptr<mgl::Texture> mgl::RecentlyUsedCache::load(mg::Renderable const& renderable)
+ {
@@ -35,18 +36,18 @@
      auto& texture = textures[renderable.id()];
      texture.texture->bind();
++    auto const texture_source = dynamic_cast<mrgl::TextureSource*>(buffer->native_buffer_base());
++    if (!texture_source)
++        BOOST_THROW_EXCEPTION(std::logic_error("Buffer does not support GL rendering"));
++
      if ((texture.last_bound_buffer != buffer_id) || (!texture.valid_binding))
+     {
--        auto const texture_source =
--            dynamic_cast<mir::renderer::gl::TextureSource*>(
--                    buffer->native_buffer_base());
--        if (!texture_source)
--            BOOST_THROW_EXCEPTION(std::logic_error("Buffer does not support GL rendering"));
--
--        texture_source->gl_bind_to_texture();
++        texture_source->bind();
          texture.resource = buffer;
          texture.last_bound_buffer = buffer_id;
+     }
++    texture_source->secure_for_render();
++
      texture.valid_binding = true;
      texture.used = true;
 === modified file 'src/include/platform/mir/graphics/egl_extensions.h'
 --- src/include/platform/mir/graphics/egl_extensions.h	2016-01-29 08:18:22 +0000
 +++ src/include/platform/mir/graphics/egl_extensions.h	2016-02-08 17:34:18 +0000
@@ -38,14 +38,6 @@
      PFNGLEGLIMAGETARGETTEXTURE2DOESPROC const glEGLImageTargetTexture2DOES;
  };
--struct EGLSyncExtensions
--{
--    EGLSyncExtensions();
--    PFNEGLCREATESYNCKHRPROC const eglCreateSyncKHR;
--    PFNEGLDESTROYIMAGEKHRPROC const eglDestroySyncKHR;
--    PFNEGLCLIENTWAITSYNCKHRPROC const eglClientWaitSyncKHR;
--};
--
+ }
+ }
 === modified file 'src/platform/graphics/CMakeLists.txt'
 --- src/platform/graphics/CMakeLists.txt	2016-01-29 08:18:22 +0000
 +++ src/platform/graphics/CMakeLists.txt	2016-02-08 17:34:18 +0000
@@ -6,7 +6,6 @@
    egl_extensions.cpp
    egl_resources.cpp
    egl_error.cpp
--  egl_sync_fence.cpp
    display_configuration.cpp
    buffer_basic.cpp
    pixel_format_utils.cpp
 === modified file 'src/platform/graphics/egl_extensions.cpp'
 --- src/platform/graphics/egl_extensions.cpp	2016-01-29 08:18:22 +0000
 +++ src/platform/graphics/egl_extensions.cpp	2016-02-08 17:34:18 +0000
@@ -37,15 +37,3 @@
      if (!glEGLImageTargetTexture2DOES)
          BOOST_THROW_EXCEPTION(std::runtime_error("GLES2 implementation doesn't support updating a texture from an EGLImage"));
+ }
--
--mg::EGLSyncExtensions::EGLSyncExtensions() :
--    eglCreateSyncKHR{
--        reinterpret_cast<PFNEGLCREATESYNCKHRPROC>(eglGetProcAddress("eglCreateSyncKHR"))},
--    eglDestroySyncKHR{
--        reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(eglGetProcAddress("eglDestroySyncKHR"))},
--    eglClientWaitSyncKHR{
--        reinterpret_cast<PFNEGLCLIENTWAITSYNCKHRPROC>(eglGetProcAddress("eglClientWaitSyncKHR"))}
--{
--    if (!eglCreateSyncKHR || !eglDestroySyncKHR || !eglClientWaitSyncKHR)
--        BOOST_THROW_EXCEPTION(std::runtime_error("EGL doesn't support the KHR_reusable_sync extension"));
--}
 === modified file 'src/platforms/android/client/CMakeLists.txt'
 --- src/platforms/android/client/CMakeLists.txt	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/client/CMakeLists.txt	2016-02-08 17:34:18 +0000
@@ -36,6 +36,7 @@
    client_platform_common
    mirsharedandroid-static
    ${LIBHARDWARE_LIBRARIES}
++  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
+ )
  install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${MIR_CLIENT_PLATFORM_PATH})
 === modified file 'src/platforms/android/client/gralloc_registrar.cpp'
 --- src/platforms/android/client/gralloc_registrar.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/client/gralloc_registrar.cpp	2016-02-08 17:34:18 +0000
@@ -13,9 +13,10 @@
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
-- * Authored by: Kevin DuBois<kevin.dubois@canonical.com>
++ * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
   */
++#include "egl_sync_fence.h"
  #include "android_native_buffer.h"
  #include "sync_fence.h"
  #include "gralloc_registrar.h"
@@ -82,7 +83,8 @@
      anwb->usage = GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER;
      anwb->handle = handle.get();
--    return std::make_shared<mga::AndroidNativeBuffer>(anwb, fence, mga::BufferAccess::read);
++    auto sync = std::make_shared<mg::NullCommandSync>(); //no need for eglsync client side
++    return std::make_shared<mga::AndroidNativeBuffer>(anwb, sync, fence, mga::BufferAccess::read);
+ }
+ }
  std::shared_ptr<mg::NativeBuffer> mcla::GrallocRegistrar::register_buffer(
 === modified file 'src/platforms/android/common/CMakeLists.txt'
 --- src/platforms/android/common/CMakeLists.txt	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/common/CMakeLists.txt	2016-02-08 17:34:18 +0000
@@ -12,4 +12,6 @@
    refcounted_buffer.cpp
    android_native_buffer.cpp
    syncfence.cpp
++  egl_sync_fence.cpp
++  egl_sync_extensions.cpp
+ )
 === modified file 'src/platforms/android/common/android_native_buffer.cpp'
 --- src/platforms/android/common/android_native_buffer.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/common/android_native_buffer.cpp	2016-02-08 17:34:18 +0000
@@ -16,17 +16,20 @@
   * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
   */
++#include "command_stream_sync.h"
  #include "android_native_buffer.h"
  namespace mga=mir::graphics::android;
  mga::AndroidNativeBuffer::AndroidNativeBuffer(
      std::shared_ptr<ANativeWindowBuffer> const& anwb,
++    std::shared_ptr<CommandStreamSync> const& cmdstream_sync,
      std::shared_ptr<Fence> const& fence,
--    BufferAccess access)
--    : fence(fence),
--      access(access),
--      native_window_buffer(anwb)
++    BufferAccess access) :
++    cmdstream_sync(cmdstream_sync),
++    fence(fence),
++    access(access),
++    native_window_buffer(anwb)
+ {
+ }
@@ -58,3 +61,14 @@
+ {
      return fence->copy_native_handle();
+ }
++
++void mga::AndroidNativeBuffer::lock_for_gpu()
++{
++    cmdstream_sync->raise();
++}
++
++void mga::AndroidNativeBuffer::wait_for_unlock_by_gpu()
++{
++    using namespace std::chrono;
++    cmdstream_sync->wait_for(duration_cast<nanoseconds>(seconds(2)));
++}
 === added file 'src/platforms/android/common/egl_sync_extensions.cpp'
 --- src/platforms/android/common/egl_sync_extensions.cpp	1970-01-01 00:00:00 +0000
 +++ src/platforms/android/common/egl_sync_extensions.cpp	2016-02-08 17:34:18 +0000
@@ -0,0 +1,35 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser 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 Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
++ */
++
++#include "egl_sync_extensions.h"
++#include <boost/throw_exception.hpp>
++#include <stdexcept>
++
++namespace mg=mir::graphics;
++
++mg::EGLSyncExtensions::EGLSyncExtensions() :
++    eglCreateSyncKHR{
++        reinterpret_cast<PFNEGLCREATESYNCKHRPROC>(eglGetProcAddress("eglCreateSyncKHR"))},
++    eglDestroySyncKHR{
++        reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(eglGetProcAddress("eglDestroySyncKHR"))},
++    eglClientWaitSyncKHR{
++        reinterpret_cast<PFNEGLCLIENTWAITSYNCKHRPROC>(eglGetProcAddress("eglClientWaitSyncKHR"))}
++{
++    if (!eglCreateSyncKHR || !eglDestroySyncKHR || !eglClientWaitSyncKHR)
++        BOOST_THROW_EXCEPTION(std::runtime_error("EGL doesn't support the KHR_reusable_sync extension"));
++}
 === renamed file 'src/platform/graphics/egl_sync_fence.cpp' => 'src/platforms/android/common/egl_sync_fence.cpp'
 --- src/platform/graphics/egl_sync_fence.cpp	2015-11-19 17:42:47 +0000
 +++ src/platforms/android/common/egl_sync_fence.cpp	2016-02-08 17:34:18 +0000
@@ -16,7 +16,7 @@
   * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
   */
--#include "mir/graphics/egl_sync_fence.h"
++#include "egl_sync_fence.h"
  #include <boost/throw_exception.hpp>
  namespace mg = mir::graphics;
 === added directory 'src/platforms/android/include/android'
 === added file 'src/platforms/android/include/android/native_window.h'
 --- src/platforms/android/include/android/native_window.h	1970-01-01 00:00:00 +0000
 +++ src/platforms/android/include/android/native_window.h	2016-02-08 17:34:18 +0000
@@ -0,0 +1,21 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser 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 Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
++ */
++
++//NOTE: this file exists to workaround a xenial packaging issue
++//described in LP: #1539571
++#include "system/window.h"
 === modified file 'src/platforms/android/include/android_native_buffer.h'
 --- src/platforms/android/include/android_native_buffer.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/include/android_native_buffer.h	2016-02-08 17:34:18 +0000
@@ -27,6 +27,7 @@
+ {
  namespace graphics
+ {
++class CommandStreamSync;
  namespace android
+ {
  class Fence;
@@ -35,6 +36,7 @@
+ {
      AndroidNativeBuffer(
          std::shared_ptr<ANativeWindowBuffer> const& handle,
++        std::shared_ptr<CommandStreamSync> const& cmdstream_sync,
          std::shared_ptr<Fence> const& fence,
          BufferAccess fence_access);
@@ -45,7 +47,11 @@
      void ensure_available_for(BufferAccess);
      void update_usage(NativeFence& merge_fd, BufferAccess);
++    void lock_for_gpu();
++    void wait_for_unlock_by_gpu();
++
  private:
++    std::shared_ptr<CommandStreamSync> cmdstream_sync;
      std::shared_ptr<Fence> fence;
      BufferAccess access;
      std::shared_ptr<ANativeWindowBuffer> native_window_buffer;
 === added file 'src/platforms/android/include/command_stream_sync.h'
 --- src/platforms/android/include/command_stream_sync.h	1970-01-01 00:00:00 +0000
 +++ src/platforms/android/include/command_stream_sync.h	2016-02-08 17:34:18 +0000
@@ -0,0 +1,51 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser 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 Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
++ */
++
++#ifndef MIR_GRAPHICS_COMMAND_STREAM_SYNC_H_
++#define MIR_GRAPHICS_COMMAND_STREAM_SYNC_H_
++
++#include <chrono>
++
++namespace mir
++{
++namespace graphics
++{
++class CommandStreamSync
++{
++public:
++    //insert a sync object into the GL command stream of the current context.
++    // \warning the calling thread should have a current egl context and display
++    virtual void raise() = 0;
++    // remove fence without waiting.
++    virtual void reset() = 0;
++    //wait for fence.
++    // \ param [in] ns  The amount of time to wait for the fence to become signalled
++    // \ returns        true if the fence was signalled, false if timeout
++    virtual bool wait_for(std::chrono::nanoseconds ns) = 0;
++
++    virtual ~CommandStreamSync() = default;
++    CommandStreamSync() = default;
++    CommandStreamSync(CommandStreamSync const&) = delete;
++    CommandStreamSync& operator=(CommandStreamSync const&) = delete;
++};
++
++
++}
++}
++
++#endif /* MIR_GRAPHICS_COMMAND_STREAM_SYNC_H_ */
 === added file 'src/platforms/android/include/egl_sync_extensions.h'
 --- src/platforms/android/include/egl_sync_extensions.h	1970-01-01 00:00:00 +0000
 +++ src/platforms/android/include/egl_sync_extensions.h	2016-02-08 17:34:18 +0000
@@ -0,0 +1,48 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser 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 Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * authored by: Kevin DuBois <kevin.dubois@canonical.com>
++ */
++
++#ifndef MIR_GRAPHICS_EGL_SYNC_EXTENSIONS_H_
++#define MIR_GRAPHICS_EGL_SYNC_EXTENSIONS_H_
++
++#define GL_GLEXT_PROTOTYPES
++#define EGL_EGLEXT_PROTOTYPES
++
++//Xenial egl has started needing a header (android/native_window.h)
++//That we don't have in the android-headers package yet.
++#include <EGL/egl.h>
++#include <EGL/eglext.h>
++#include <GLES2/gl2.h>
++#include <GLES2/gl2ext.h>
++
++namespace mir
++{
++namespace graphics
++{
++
++struct EGLSyncExtensions
++{
++    EGLSyncExtensions();
++    PFNEGLCREATESYNCKHRPROC const eglCreateSyncKHR;
++    PFNEGLDESTROYIMAGEKHRPROC const eglDestroySyncKHR;
++    PFNEGLCLIENTWAITSYNCKHRPROC const eglClientWaitSyncKHR;
++};
++
++}
++}
++
++#endif /* MIR_GRAPHICS_EGL_SYNC_EXTENSIONS_H_ */
 === renamed file 'src/include/platform/mir/graphics/egl_sync_fence.h' => 'src/platforms/android/include/egl_sync_fence.h'
 --- src/include/platform/mir/graphics/egl_sync_fence.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/include/egl_sync_fence.h	2016-02-08 17:34:18 +0000
@@ -19,34 +19,15 @@
  #ifndef MIR_GRAPHICS_EGL_SYNC_FENCE_H_
  #define MIR_GRAPHICS_EGL_SYNC_FENCE_H_
--#include "egl_extensions.h"
++#include "egl_sync_extensions.h"
++#include "command_stream_sync.h"
  #include <memory>
--#include <chrono>
  #include <mutex>
  namespace mir
+ {
  namespace graphics
+ {
--class CommandStreamSync
--{
--public:
--    //insert a sync object into the GL command stream of the current context.
--    // \warning the calling thread should have a current egl context and display
--    virtual void raise() = 0;
--    // remove fence without waiting.
--    virtual void reset() = 0;
--    //wait for fence.
--    // \ param [in] ns  The amount of time to wait for the fence to become signalled
--    // \ returns        true if the fence was signalled, false if timeout
--    virtual bool wait_for(std::chrono::nanoseconds ns) = 0;
--
--    virtual ~CommandStreamSync() = default;
--    CommandStreamSync() = default;
--    CommandStreamSync(CommandStreamSync const&) = delete;
--    CommandStreamSync& operator=(CommandStreamSync const&) = delete;
--};
--
  class NullCommandSync : public CommandStreamSync
+ {
      void raise() override;
 === modified file 'src/platforms/android/include/native_buffer.h'
 --- src/platforms/android/include/native_buffer.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/include/native_buffer.h	2016-02-08 17:34:18 +0000
@@ -53,6 +53,9 @@
      virtual void ensure_available_for(android::BufferAccess intent) = 0;
      virtual void update_usage(android::NativeFence& fence, android::BufferAccess current_usage) = 0;
++    virtual void lock_for_gpu() = 0;
++    virtual void wait_for_unlock_by_gpu() = 0;
++
  protected:
      NativeBuffer() = default;
      NativeBuffer(NativeBuffer const&) = delete;
 === modified file 'src/platforms/android/server/CMakeLists.txt'
 --- src/platforms/android/server/CMakeLists.txt	2016-02-01 22:53:06 +0000
 +++ src/platforms/android/server/CMakeLists.txt	2016-02-08 17:34:18 +0000
@@ -37,6 +37,7 @@
    hwc_fallback_gl_renderer.cpp
    ipc_operations.cpp
    hwc_blanking_control.cpp
++  egl_sync_factory.cpp
    virtual_output.cpp
+ )
 === modified file 'src/platforms/android/server/android_alloc_adaptor.cpp'
 --- src/platforms/android/server/android_alloc_adaptor.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/android_alloc_adaptor.cpp	2016-02-08 17:34:18 +0000
@@ -17,11 +17,13 @@
   *   Kevin DuBois <kevin.dubois@canonical.com>
   */
++#include "egl_sync_fence.h"
  #include "android_native_buffer.h"
  #include "sync_fence.h"
  #include "android_format_conversion-inl.h"
  #include "android_alloc_adaptor.h"
  #include "device_quirks.h"
++#include "cmdstream_sync_factory.h"
  #include <boost/throw_exception.hpp>
  #include <boost/exception/errinfo_errno.hpp>
@@ -48,10 +50,13 @@
  };
+ }
--mga::AndroidAllocAdaptor::AndroidAllocAdaptor(std::shared_ptr<struct alloc_device_t> const& alloc_device,
--    std::shared_ptr<DeviceQuirks> const& quirks)
--    : alloc_dev(alloc_device),
--      quirks(quirks)
++mga::AndroidAllocAdaptor::AndroidAllocAdaptor(
++    std::shared_ptr<struct alloc_device_t> const& alloc_device,
++    std::shared_ptr<CommandStreamSyncFactory> const& sync_factory,
++    std::shared_ptr<DeviceQuirks> const& quirks) :
++    alloc_dev(alloc_device),
++    sync_factory(sync_factory),
++    quirks(quirks)
+ {
+ }
@@ -94,7 +99,9 @@
      anwb->format = format;
      anwb->usage = usage_flag;
--    return std::make_shared<mga::AndroidNativeBuffer>(anwb, fence, mga::BufferAccess::read);
++    return std::make_shared<mga::AndroidNativeBuffer>(anwb,
++        sync_factory->create_command_stream_sync(),
++        fence, mga::BufferAccess::read);
+ }
  int mga::AndroidAllocAdaptor::convert_to_android_usage(BufferUsage usage)
 === modified file 'src/platforms/android/server/android_alloc_adaptor.h'
 --- src/platforms/android/server/android_alloc_adaptor.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/android_alloc_adaptor.h	2016-02-08 17:34:18 +0000
@@ -31,12 +31,15 @@
  namespace android
+ {
  class DeviceQuirks;
++class CommandStreamSyncFactory;
  class AndroidAllocAdaptor : public GraphicAllocAdaptor
+ {
  public:
--    explicit AndroidAllocAdaptor(std::shared_ptr<struct alloc_device_t> const& alloc_device,
--                                 std::shared_ptr<DeviceQuirks> const& quirks);
++    explicit AndroidAllocAdaptor(
++        std::shared_ptr<struct alloc_device_t> const& alloc_device,
++        std::shared_ptr<CommandStreamSyncFactory> const& cmdstream_sync_factory,
++        std::shared_ptr<DeviceQuirks> const& quirks);
      std::shared_ptr<NativeBuffer> alloc_buffer(geometry::Size,
              MirPixelFormat, BufferUsage usage);
@@ -44,6 +47,7 @@
  private:
      std::shared_ptr<struct alloc_device_t> alloc_dev;
++    std::shared_ptr<CommandStreamSyncFactory> const sync_factory;
      std::shared_ptr<DeviceQuirks> const quirks;
      int convert_to_android_usage(BufferUsage usage);
  };
 === modified file 'src/platforms/android/server/android_buffer_allocator.cpp'
 --- src/platforms/android/server/android_buffer_allocator.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/android_buffer_allocator.cpp	2016-02-08 17:34:18 +0000
@@ -20,12 +20,14 @@
  #include "mir/graphics/platform.h"
  #include "mir/graphics/egl_extensions.h"
  #include "mir/graphics/buffer_properties.h"
++#include "cmdstream_sync_factory.h"
  #include "sync_fence.h"
  #include "android_native_buffer.h"
  #include "android_graphic_buffer_allocator.h"
  #include "android_alloc_adaptor.h"
  #include "buffer.h"
  #include "device_quirks.h"
++#include "egl_sync_fence.h"
  #include <boost/throw_exception.hpp>
@@ -50,8 +52,11 @@
+ }
--mga::AndroidGraphicBufferAllocator::AndroidGraphicBufferAllocator(std::shared_ptr<DeviceQuirks> const& quirks)
--    : egl_extensions(std::make_shared<mg::EGLExtensions>())
++mga::AndroidGraphicBufferAllocator::AndroidGraphicBufferAllocator(
++    std::shared_ptr<CommandStreamSyncFactory> const& cmdstream_sync_factory,
++    std::shared_ptr<DeviceQuirks> const& quirks)
++    : egl_extensions(std::make_shared<mg::EGLExtensions>()),
++    cmdstream_sync_factory(cmdstream_sync_factory)
+ {
      int err;
@@ -70,7 +75,7 @@
      std::shared_ptr<struct alloc_device_t> alloc_dev_ptr(
          alloc_dev,
          quirks->gralloc_cannot_be_closed_safely() ? null_alloc_dev_deleter : alloc_dev_deleter);
--    alloc_device = std::shared_ptr<mga::GraphicAllocAdaptor>(new AndroidAllocAdaptor(alloc_dev_ptr, quirks));
++    alloc_device = std::shared_ptr<mga::GraphicAllocAdaptor>(new AndroidAllocAdaptor(alloc_dev_ptr, cmdstream_sync_factory, quirks));
+ }
  std::shared_ptr<mg::Buffer> mga::AndroidGraphicBufferAllocator::alloc_buffer(
@@ -89,9 +94,10 @@
          [](ANativeWindowBuffer* buffer){ buffer->common.decRef(&buffer->common); });
      anwb->common.incRef(&anwb->common);
++    //TODO: we should have an android platform function for accessing the fence.
      auto native_handle = std::make_shared<mga::AndroidNativeBuffer>(
          native_window_buffer,
--        //TODO: we should have an android platform function for accessing the fence.
++        cmdstream_sync_factory->create_command_stream_sync(),
          std::make_shared<mga::SyncFence>(std::make_shared<mga::RealSyncFileOps>(), mir::Fd()),
          mga::BufferAccess::read);
      return std::make_unique<Buffer>(
 === modified file 'src/platforms/android/server/android_graphic_buffer_allocator.h'
 --- src/platforms/android/server/android_graphic_buffer_allocator.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/android_graphic_buffer_allocator.h	2016-02-08 17:34:18 +0000
@@ -39,11 +39,14 @@
  class GraphicAllocAdaptor;
  class DeviceQuirks;
++class CommandStreamSyncFactory;
  class AndroidGraphicBufferAllocator: public GraphicBufferAllocator, public graphics::GraphicBufferAllocator
+ {
  public:
--    AndroidGraphicBufferAllocator(std::shared_ptr<DeviceQuirks> const& quirks);
++    AndroidGraphicBufferAllocator(
++        std::shared_ptr<CommandStreamSyncFactory> const& cmdstream_sync_factory,
++        std::shared_ptr<DeviceQuirks> const& quirks);
      std::shared_ptr<graphics::Buffer> alloc_buffer(
          graphics::BufferProperties const& buffer_properties) override;
@@ -61,6 +64,7 @@
      const hw_module_t    *hw_module;
      std::shared_ptr<GraphicAllocAdaptor> alloc_device;
      std::shared_ptr<EGLExtensions> const egl_extensions;
++    std::shared_ptr<CommandStreamSyncFactory> const cmdstream_sync_factory;
  };
+ }
 === modified file 'src/platforms/android/server/buffer.cpp'
 --- src/platforms/android/server/buffer.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/buffer.cpp	2016-02-08 17:34:18 +0000
@@ -74,6 +74,18 @@
  void mga::Buffer::gl_bind_to_texture()
+ {
      std::unique_lock<std::mutex> lk(content_lock);
++    bind(lk);
++    secure_for_render(lk);
++}
++
++void mga::Buffer::bind()
++{
++    std::unique_lock<std::mutex> lk(content_lock);
++    bind(lk);
++}
++
++void mga::Buffer::bind(std::unique_lock<std::mutex> const&)
++{
      native_buffer->ensure_available_for(mga::BufferAccess::read);
      DispContextPair current
@@ -113,10 +125,6 @@
+     }
      egl_extensions->glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image);
--
--    //TODO: we should make use of the android egl fence extension here to update the fence.
--    //      if the extension is not available, we should pass out a token that the user
--    //      will have to keep until the completion of the gl draw
+ }
  std::shared_ptr<mg::NativeBuffer> mga::Buffer::native_buffer_handle() const
@@ -196,3 +204,14 @@
+ {
      return this;
+ }
++
++void mga::Buffer::secure_for_render()
++{
++    std::unique_lock<std::mutex> lk(content_lock);
++    secure_for_render(lk);
++}
++
++void mga::Buffer::secure_for_render(std::unique_lock<std::mutex> const&)
++{
++    native_buffer->lock_for_gpu();
++}
 === modified file 'src/platforms/android/server/buffer.h'
 --- src/platforms/android/server/buffer.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/buffer.h	2016-02-08 17:34:18 +0000
@@ -56,6 +56,10 @@
      geometry::Stride stride() const override;
      MirPixelFormat pixel_format() const override;
      void gl_bind_to_texture() override;
++    void bind() override;
++    void secure_for_render() override;
++
++
      //note, you will get the native representation of an android buffer, including
      //the fences associated with the buffer. You must close these fences
      std::shared_ptr<NativeBuffer> native_buffer_handle() const override;
@@ -66,6 +70,8 @@
      NativeBufferBase* native_buffer_base() override;
  private:
++    void bind(std::unique_lock<std::mutex> const&);
++    void secure_for_render(std::unique_lock<std::mutex> const&);
      gralloc_module_t const* hw_module;
      typedef std::pair<EGLDisplay, EGLContext> DispContextPair;
 === added file 'src/platforms/android/server/cmdstream_sync_factory.h'
 --- src/platforms/android/server/cmdstream_sync_factory.h	1970-01-01 00:00:00 +0000
 +++ src/platforms/android/server/cmdstream_sync_factory.h	2016-02-08 17:34:18 +0000
@@ -0,0 +1,48 @@
++/*
++ * Copyright © 2015 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser 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 Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
++ */
++
++#ifndef MIR_GRAPHICS_ANDROID_CMDSTREAM_SYNC_FACTORY_H_
++#define MIR_GRAPHICS_ANDROID_CMDSTREAM_SYNC_FACTORY_H_
++
++#include <memory>
++namespace mir
++{
++namespace graphics
++{
++class CommandStreamSync;
++namespace android
++{
++class CommandStreamSyncFactory
++{
++public:
++    virtual ~CommandStreamSyncFactory() = default;
++    virtual std::unique_ptr<CommandStreamSync> create_command_stream_sync() = 0;
++protected:
++    CommandStreamSyncFactory() = default;
++    CommandStreamSyncFactory(CommandStreamSyncFactory const&) = delete;
++    CommandStreamSyncFactory& operator=(CommandStreamSyncFactory const&) = delete;
++};
++
++class EGLSyncFactory : public CommandStreamSyncFactory
++{
++    std::unique_ptr<CommandStreamSync> create_command_stream_sync() override;
++};
++}
++}
++}
++#endif /* MIR_GRAPHICS_ANDROID_CMDSTREAM_SYNC_FACTORY_H_ */
 === modified file 'src/platforms/android/server/device_quirks.cpp'
 --- src/platforms/android/server/device_quirks.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/device_quirks.cpp	2016-02-08 17:34:18 +0000
@@ -123,6 +123,12 @@
      return GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE;
+ }
++bool mga::DeviceQuirks::working_egl_sync() const
++{
++    //FIXME: this really should be all powervr devices.
++    return device_name != "mx4";
++}
++
  void mga::DeviceQuirks::add_options(boost::program_options::options_description& config)
+ {
      config.add_options()
 === modified file 'src/platforms/android/server/device_quirks.h'
 --- src/platforms/android/server/device_quirks.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/device_quirks.h	2016-02-08 17:34:18 +0000
@@ -65,6 +65,7 @@
      int aligned_width(int width) const;
      bool clear_fb_context_fence() const;
      int fb_gralloc_bits() const;
++    bool working_egl_sync() const;
      static void add_options(boost::program_options::options_description& config);
 === modified file 'src/platforms/android/server/display_buffer.cpp'
 --- src/platforms/android/server/display_buffer.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/display_buffer.cpp	2016-02-08 17:34:18 +0000
@@ -98,6 +98,9 @@
  void mga::DisplayBuffer::swap_buffers()
+ {
      layer_list->update_list({}, offset_from_origin);
++    //HWC 1.0 cannot call eglSwapBuffers() on the display context
++    if (display_device->can_swap_buffers())
++        gl_context.swap_buffers();
+ }
  MirOrientation mga::DisplayBuffer::orientation() const
 === modified file 'src/platforms/android/server/display_component_factory.h'
 --- src/platforms/android/server/display_component_factory.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/display_component_factory.h	2016-02-08 17:34:18 +0000
@@ -19,6 +19,7 @@
  #ifndef MIR_GRAPHICS_ANDROID_DISPLAY_COMPONENT_FACTORY_H_
  #define MIR_GRAPHICS_ANDROID_DISPLAY_COMPONENT_FACTORY_H_
++#include "egl_sync_fence.h"
  #include "display_device.h"
  #include "framebuffer_bundle.h"
  #include <memory>
@@ -28,6 +29,7 @@
  namespace graphics
+ {
  class DisplayConfigurationOutput;
++class CommandStreamSync;
  namespace android
+ {
  class HwcConfiguration;
 === modified file 'src/platforms/android/server/display_device.h'
 --- src/platforms/android/server/display_device.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/display_device.h	2016-02-08 17:34:18 +0000
@@ -69,6 +69,8 @@
      virtual std::chrono::milliseconds recommended_sleep() const = 0;
++    virtual bool can_swap_buffers() const = 0;
++
  protected:
      DisplayDevice() = default;
      DisplayDevice& operator=(DisplayDevice const&) = delete;
 === added file 'src/platforms/android/server/egl_sync_factory.cpp'
 --- src/platforms/android/server/egl_sync_factory.cpp	1970-01-01 00:00:00 +0000
 +++ src/platforms/android/server/egl_sync_factory.cpp	2016-02-08 17:34:18 +0000
@@ -0,0 +1,35 @@
++/*
++ * Copyright © 2015 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser 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 Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
++ */
++
++#include "cmdstream_sync_factory.h"
++#include "egl_sync_fence.h"
++
++namespace mg = mir::graphics;
++namespace mga = mir::graphics::android;
++
++std::unique_ptr<mg::CommandStreamSync> mga::EGLSyncFactory::create_command_stream_sync()
++{
++    try
++    {
++        return std::make_unique<EGLSyncFence>(std::make_shared<mg::EGLSyncExtensions>());
++    }
++    catch (std::runtime_error&)
++    {
++        return std::make_unique<NullCommandSync>();
++    }
++}
 === modified file 'src/platforms/android/server/fb_device.cpp'
 --- src/platforms/android/server/fb_device.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/fb_device.cpp	2016-02-08 17:34:18 +0000
@@ -99,8 +99,6 @@
      });
      if (primary_contents == contents.end()) return;
      auto& context = primary_contents->context;
--
--    context.swap_buffers();
      auto const& buffer = context.last_rendered_buffer();
      auto native_buffer = buffer->native_buffer_handle();
      native_buffer->ensure_available_for(mga::BufferAccess::read);
@@ -123,3 +121,8 @@
+ {
      return std::chrono::milliseconds::zero();
+ }
++
++bool mga::FBDevice::can_swap_buffers() const
++{
++    return true;
++}
 === modified file 'src/platforms/android/server/fb_device.h'
 --- src/platforms/android/server/fb_device.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/fb_device.h	2016-02-08 17:34:18 +0000
@@ -52,6 +52,7 @@
      bool compatible_renderlist(RenderableList const& renderlist) override;
      void commit(std::list<DisplayContents> const& contents) override;
      std::chrono::milliseconds recommended_sleep() const override;
++    bool can_swap_buffers() const override;
  private:
      std::shared_ptr<framebuffer_device_t> const fb_device;
 === modified file 'src/platforms/android/server/hal_component_factory.cpp'
 --- src/platforms/android/server/hal_component_factory.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/hal_component_factory.cpp	2016-02-08 17:34:18 +0000
@@ -46,7 +46,8 @@
        res_factory(res_factory),
        hwc_report(hwc_report),
        force_backup_display(false),
--      num_framebuffers{quirks->num_framebuffers()}
++      num_framebuffers{quirks->num_framebuffers()},
++      working_egl_sync(quirks->working_egl_sync())
+ {
      try
+     {
@@ -65,6 +66,24 @@
+     }
+ }
++std::unique_ptr<mg::CommandStreamSync> mga::HalComponentFactory::create_command_stream_sync()
++{
++    if (hwc_version == mga::HwcVersion::hwc10)
++        return std::make_unique<NullCommandSync>();
++
++    if (!working_egl_sync)
++        return std::make_unique<NullCommandSync>();
++
++    try
++    {
++        return std::make_unique<EGLSyncFence>(std::make_shared<mg::EGLSyncExtensions>());
++    }
++    catch (std::runtime_error&)
++    {
++        return std::make_unique<NullCommandSync>();
++    }
++}
++
  std::unique_ptr<mga::FramebufferBundle> mga::HalComponentFactory::create_framebuffers(mg::DisplayConfigurationOutput const& config)
+ {
      return std::unique_ptr<mga::FramebufferBundle>(new mga::Framebuffers(
 === modified file 'src/platforms/android/server/hal_component_factory.h'
 --- src/platforms/android/server/hal_component_factory.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/hal_component_factory.h	2016-02-08 17:34:18 +0000
@@ -19,6 +19,7 @@
  #ifndef MIR_GRAPHICS_ANDROID_HAL_COMPONENT_FACTORY_H_
  #define MIR_GRAPHICS_ANDROID_HAL_COMPONENT_FACTORY_H_
++#include "cmdstream_sync_factory.h"
  #include "display_component_factory.h"
  #include "display_resource_factory.h"
@@ -39,7 +40,7 @@
  //NOTE: this should be the only class that inspects the HWC version and assembles
  //the components accordingly
--class HalComponentFactory : public DisplayComponentFactory
++class HalComponentFactory : public DisplayComponentFactory, public CommandStreamSyncFactory
+ {
  public:
      HalComponentFactory(
@@ -48,6 +49,7 @@
          std::shared_ptr<HwcReport> const& hwc_report,
          std::shared_ptr<DeviceQuirks> const& quirks);
++    std::unique_ptr<CommandStreamSync> create_command_stream_sync() override;
      std::unique_ptr<FramebufferBundle> create_framebuffers(DisplayConfigurationOutput const&) override;
      std::unique_ptr<DisplayDevice> create_display_device() override;
      std::unique_ptr<HwcConfiguration> create_hwc_configuration() override;
@@ -61,6 +63,7 @@
      std::shared_ptr<FramebufferBundle> framebuffers;
      bool force_backup_display;
      size_t num_framebuffers;
++    bool working_egl_sync;
      std::shared_ptr<HwcWrapper> hwc_wrapper;
      std::shared_ptr<framebuffer_device_t> fb_native;
 === modified file 'src/platforms/android/server/hwc_device.cpp'
 --- src/platforms/android/server/hwc_device.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/hwc_device.cpp	2016-02-08 17:34:18 +0000
@@ -106,13 +106,13 @@
          if (content.list.needs_swapbuffers())
+         {
              auto rejected_renderables = content.list.rejected_renderables();
--            auto current_context = mir::raii::paired_calls(
--                [&]{ content.context.make_current(); },
--                [&]{ content.context.release_current(); });
--            if (rejected_renderables.empty())
--                content.context.swap_buffers();
--            else
++            if (!rejected_renderables.empty())
++            {
++                auto current_context = mir::raii::paired_calls(
++                    [&]{ content.context.make_current(); },
++                    [&]{ content.context.release_current(); });
                  content.compositor.render(std::move(rejected_renderables), content.list_offset, content.context);
++            }
              content.list.setup_fb(content.context.last_rendered_buffer());
              content.list.swap_occurred();
              purely_overlays = false;
@@ -161,3 +161,8 @@
+ {
      onscreen_overlay_buffers.clear();
+ }
++
++bool mga::HwcDevice::can_swap_buffers() const
++{
++    return true;
++}
 === modified file 'src/platforms/android/server/hwc_device.h'
 --- src/platforms/android/server/hwc_device.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/hwc_device.h	2016-02-08 17:34:18 +0000
@@ -47,6 +47,7 @@
      void commit(std::list<DisplayContents> const& contents) override;
      void content_cleared() override;
      std::chrono::milliseconds recommended_sleep() const override;
++    bool can_swap_buffers() const override;
  private:
      bool buffer_is_onscreen(Buffer const&) const;
 === modified file 'src/platforms/android/server/hwc_fb_device.cpp'
 --- src/platforms/android/server/hwc_fb_device.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/hwc_fb_device.cpp	2016-02-08 17:34:18 +0000
@@ -118,3 +118,8 @@
+ {
      return std::chrono::milliseconds::zero();
+ }
++
++bool mga::HwcFbDevice::can_swap_buffers() const
++{
++    return false;
++}
 === modified file 'src/platforms/android/server/hwc_fb_device.h'
 --- src/platforms/android/server/hwc_fb_device.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/hwc_fb_device.h	2016-02-08 17:34:18 +0000
@@ -44,6 +44,7 @@
      bool compatible_renderlist(RenderableList const& renderlist) override;
      void commit(std::list<DisplayContents> const& contents) override;
      std::chrono::milliseconds recommended_sleep() const override;
++    bool can_swap_buffers() const override;
  private:
      void content_cleared() override;
 === modified file 'src/platforms/android/server/ipc_operations.cpp'
 --- src/platforms/android/server/ipc_operations.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/ipc_operations.cpp	2016-02-08 17:34:18 +0000
@@ -36,6 +36,7 @@
+ {
      auto native_buffer = buffer.native_buffer_handle();
++    native_buffer->wait_for_unlock_by_gpu();
      mir::Fd fence_fd(native_buffer->copy_fence());
      if (fence_fd != mir::Fd::invalid)
+     {
 === modified file 'src/platforms/android/server/platform.cpp'
 --- src/platforms/android/server/platform.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/platform.cpp	2016-02-08 17:34:18 +0000
@@ -86,11 +86,13 @@
  mga::Platform::Platform(
      std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator,
      std::shared_ptr<mga::DisplayComponentFactory> const& display_buffer_builder,
++    std::shared_ptr<CommandStreamSyncFactory> const& sync_factory,
      std::shared_ptr<mg::DisplayReport> const& display_report,
      mga::OverlayOptimization overlay_option,
      std::shared_ptr<mga::DeviceQuirks> const& quirks) :
      buffer_allocator(buffer_allocator),
      display_buffer_builder(display_buffer_builder),
++    sync_factory(sync_factory),
      display_report(display_report),
      quirks(quirks),
      overlay_option(overlay_option)
@@ -154,10 +156,13 @@
      auto overlay_option = should_use_overlay_optimization(*options);
      hwc_report->report_overlay_optimization(overlay_option);
      auto display_resource_factory = std::make_shared<mga::ResourceFactory>();
--    auto buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(quirks);
++    auto sync_factory = std::make_shared<mga::EGLSyncFactory>();
++    auto buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(sync_factory, quirks);
      auto component_factory = std::make_shared<mga::HalComponentFactory>(
          buffer_allocator, display_resource_factory, hwc_report, quirks);
--    return mir::make_module_ptr<mga::Platform>(buffer_allocator, component_factory, display_report, overlay_option, quirks);
++
++    return mir::make_module_ptr<mga::Platform>(
++        buffer_allocator, component_factory, component_factory, display_report, overlay_option, quirks);
+ }
  mir::UniqueModulePtr<mg::Platform> create_guest_platform(
@@ -167,10 +172,11 @@
      mir::assert_entry_point_signature<mg::CreateGuestPlatform>(&create_guest_platform);
      //TODO: actually allow disabling quirks for guest platform
      auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{});
++    auto sync_factory = std::make_shared<mga::EGLSyncFactory>();
      //TODO: remove nullptr parameter once platform classes are sorted.
      //      mg::NativePlatform cannot create a display anyways, so it doesnt need a  display builder
--    auto const buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(quirks);
--    return mir::make_module_ptr<mga::Platform>(buffer_allocator, nullptr, display_report, mga::OverlayOptimization::disabled, quirks);
++    auto const buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(sync_factory, quirks);
++    return mir::make_module_ptr<mga::Platform>(buffer_allocator, nullptr, sync_factory, display_report, mga::OverlayOptimization::disabled, quirks);
+ }
  void add_graphics_platform_options(
 === modified file 'src/platforms/android/server/platform.h'
 --- src/platforms/android/server/platform.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/android/server/platform.h	2016-02-08 17:34:18 +0000
@@ -33,6 +33,7 @@
  class GraphicBufferAllocator;
  class FramebufferFactory;
  class DisplayComponentFactory;
++class CommandStreamSyncFactory;
  class Platform : public graphics::Platform
+ {
@@ -40,6 +41,7 @@
      Platform(
          std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator,
          std::shared_ptr<DisplayComponentFactory> const& display_buffer_builder,
++        std::shared_ptr<CommandStreamSyncFactory> const& sync_factory,
          std::shared_ptr<DisplayReport> const& display_report,
          OverlayOptimization overlay_option,
          std::shared_ptr<DeviceQuirks> const& quirks);
@@ -55,6 +57,7 @@
  private:
      std::shared_ptr<graphics::GraphicBufferAllocator> const buffer_allocator;
      std::shared_ptr<DisplayComponentFactory> const display_buffer_builder;
++    std::shared_ptr<CommandStreamSyncFactory> const sync_factory;
      std::shared_ptr<DisplayReport> const display_report;
      std::shared_ptr<PlatformIpcOperations> const ipc_operations;
      std::shared_ptr<DeviceQuirks> const quirks;
 === modified file 'src/platforms/mesa/server/common/gbm_buffer.cpp'
 --- src/platforms/mesa/server/common/gbm_buffer.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/mesa/server/common/gbm_buffer.cpp	2016-02-08 17:34:18 +0000
@@ -197,3 +197,12 @@
+ {
      return this;
+ }
++
++void mgm::GBMBuffer::secure_for_render()
++{
++}
++
++void mgm::GBMBuffer::bind()
++{
++    gl_bind_to_texture();
++}
 === modified file 'src/platforms/mesa/server/common/gbm_buffer.h'
 --- src/platforms/mesa/server/common/gbm_buffer.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/mesa/server/common/gbm_buffer.h	2016-02-08 17:34:18 +0000
@@ -67,6 +67,8 @@
      virtual std::shared_ptr<MirNativeBuffer> native_buffer_handle() const override;
      virtual void gl_bind_to_texture() override;
++    virtual void bind() override;
++    virtual void secure_for_render() override;
      void write(unsigned char const* pixels, size_t size) override;
      void read(std::function<void(unsigned char const*)> const& do_with_pixels) override;
 === modified file 'src/platforms/mesa/server/common/shm_buffer.cpp'
 --- src/platforms/mesa/server/common/shm_buffer.cpp	2016-01-29 08:18:22 +0000
 +++ src/platforms/mesa/server/common/shm_buffer.cpp	2016-02-08 17:34:18 +0000
@@ -176,3 +176,12 @@
+ {
      return this;
+ }
++
++void mgm::ShmBuffer::bind()
++{
++    gl_bind_to_texture();
++}
++
++void mgm::ShmBuffer::secure_for_render()
++{
++}
 === modified file 'src/platforms/mesa/server/common/shm_buffer.h'
 --- src/platforms/mesa/server/common/shm_buffer.h	2016-01-29 08:18:22 +0000
 +++ src/platforms/mesa/server/common/shm_buffer.h	2016-02-08 17:34:18 +0000
@@ -51,6 +51,8 @@
      MirPixelFormat pixel_format() const override;
      std::shared_ptr<MirNativeBuffer> native_buffer_handle() const override;
      void gl_bind_to_texture() override;
++    void bind() override;
++    void secure_for_render() override;
      void write(unsigned char const* data, size_t size) override;
      void read(std::function<void(unsigned char const*)> const& do_with_pixels) override;
      NativeBufferBase* native_buffer_base() override;
 === modified file 'tests/include/mir/test/doubles/mock_android_native_buffer.h'
 --- tests/include/mir/test/doubles/mock_android_native_buffer.h	2016-01-29 08:18:22 +0000
 +++ tests/include/mir/test/doubles/mock_android_native_buffer.h	2016-02-08 17:34:18 +0000
@@ -57,6 +57,8 @@
      MOCK_METHOD1(ensure_available_for, void(graphics::android::BufferAccess));
      MOCK_METHOD2(update_usage, void(graphics::android::NativeFence&, graphics::android::BufferAccess));
++    MOCK_METHOD0(lock_for_gpu, void());
++    MOCK_METHOD0(wait_for_unlock_by_gpu, void());
      ANativeWindowBuffer stub_anwb;
      native_handle_t native_handle;
  };
 === modified file 'tests/include/mir/test/doubles/mock_buffer.h'
 --- tests/include/mir/test/doubles/mock_buffer.h	2016-01-29 08:18:22 +0000
 +++ tests/include/mir/test/doubles/mock_buffer.h	2016-02-08 17:34:18 +0000
@@ -72,6 +72,7 @@
      MOCK_METHOD2(write, void(unsigned char const*, size_t));
      MOCK_METHOD1(read, void(std::function<void(unsigned char const*)> const&));
      MOCK_METHOD0(native_buffer_base, graphics::NativeBufferBase*());
++    MOCK_METHOD0(used_as_texture, void());
  };
+ }
 === modified file 'tests/include/mir/test/doubles/mock_display_device.h'
 --- tests/include/mir/test/doubles/mock_display_device.h	2016-01-29 08:18:22 +0000
 +++ tests/include/mir/test/doubles/mock_display_device.h	2016-02-08 17:34:18 +0000
@@ -39,6 +39,8 @@
+     {
          ON_CALL(*this, compatible_renderlist(testing::_))
              .WillByDefault(testing::Return(true));
++        ON_CALL(*this, can_swap_buffers())
++            .WillByDefault(testing::Return(true));
+     }
      ~MockDisplayDevice() noexcept {}
      MOCK_METHOD0(content_cleared, void());
@@ -46,6 +48,7 @@
      MOCK_METHOD1(compatible_renderlist, bool(
          graphics::RenderableList const&));
      MOCK_CONST_METHOD0(recommended_sleep, std::chrono::milliseconds());
++    MOCK_CONST_METHOD0(can_swap_buffers, bool());
  };
+ }
+ }
 === modified file 'tests/include/mir/test/doubles/mock_gl_buffer.h'
 --- tests/include/mir/test/doubles/mock_gl_buffer.h	2016-01-29 08:18:22 +0000
 +++ tests/include/mir/test/doubles/mock_gl_buffer.h	2016-02-08 17:34:18 +0000
@@ -36,6 +36,8 @@
      using MockBuffer::MockBuffer;
      MOCK_METHOD0(gl_bind_to_texture, void());
++    MOCK_METHOD0(secure_for_render, void());
++    MOCK_METHOD0(bind, void());
  };
+ }
 === modified file 'tests/include/mir/test/doubles/stub_android_native_buffer.h'
 --- tests/include/mir/test/doubles/stub_android_native_buffer.h	2016-01-29 08:18:22 +0000
 +++ tests/include/mir/test/doubles/stub_android_native_buffer.h	2016-02-08 17:34:18 +0000
@@ -47,6 +47,9 @@
      void ensure_available_for(graphics::android::BufferAccess) {}
      void update_usage(graphics::android::NativeFence&, graphics::android::BufferAccess) {}
++    void lock_for_gpu() {};
++    void wait_for_unlock_by_gpu() {};
++
      ANativeWindowBuffer stub_anwb;
      native_handle_t native_handle;
  };
 === added file 'tests/include/mir/test/doubles/stub_cmdstream_sync_factory.h'
 --- tests/include/mir/test/doubles/stub_cmdstream_sync_factory.h	1970-01-01 00:00:00 +0000
 +++ tests/include/mir/test/doubles/stub_cmdstream_sync_factory.h	2016-02-08 17:34:18 +0000
@@ -0,0 +1,41 @@
++/*
++ * Copyright © 2015 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 <kevin.dubois@canonical.com>
++ */
++
++#ifndef MIR_TEST_DOUBLES_STUB_CMDSTREAM_SYNC_FACTORY_H_
++#define MIR_TEST_DOUBLES_STUB_CMDSTREAM_SYNC_FACTORY_H_
++
++#include "src/platforms/android/server/cmdstream_sync_factory.h"
++
++namespace mir
++{
++namespace test
++{
++namespace doubles
++{
++struct StubCmdStreamSyncFactory : graphics::android::CommandStreamSyncFactory
++{
++    std::unique_ptr<graphics::CommandStreamSync> create_command_stream_sync() override
++    {
++        return std::make_unique<graphics::NullCommandSync>();
++    }
++};
++}
++}
++}
++
++#endif /* MIR_TEST_DOUBLES_STUB_CMDSTREAM_SYNC_FACTORY_H_ */
 === modified file 'tests/include/mir/test/doubles/stub_display_builder.h'
 --- tests/include/mir/test/doubles/stub_display_builder.h	2016-01-29 08:18:22 +0000
 +++ tests/include/mir/test/doubles/stub_display_builder.h	2016-02-08 17:34:18 +0000
@@ -126,6 +126,11 @@
          config = std::move(mock_config);
+     }
++    std::unique_ptr<graphics::CommandStreamSync> create_command_stream_sync()
++    {
++        return std::make_unique<graphics::NullCommandSync>();
++    }
++
      geometry::Size sz;
      std::unique_ptr<graphics::android::HwcConfiguration> config;
  };
 === modified file 'tests/include/mir/test/doubles/stub_gl_buffer.h'
 --- tests/include/mir/test/doubles/stub_gl_buffer.h	2016-01-29 08:18:22 +0000
 +++ tests/include/mir/test/doubles/stub_gl_buffer.h	2016-02-08 17:34:18 +0000
@@ -36,6 +36,8 @@
      using StubBuffer::StubBuffer;
      void gl_bind_to_texture() {}
++    void bind() {}
++    void secure_for_render() {}
  };
+ }
 === modified file 'tests/integration-tests/graphics/mesa/test_buffer_integration.cpp'
 --- tests/integration-tests/graphics/mesa/test_buffer_integration.cpp	2016-01-29 08:18:22 +0000
 +++ tests/integration-tests/graphics/mesa/test_buffer_integration.cpp	2016-02-08 17:34:18 +0000
@@ -77,6 +77,9 @@
+         }
+     }
++    void bind() override { gl_bind_to_texture(); }
++    void secure_for_render() override {}
++
  private:
      std::thread::id creation_thread_id;
  };
 === modified file 'tests/unit-tests/gl/test_gl_texture_cache.cpp'
 --- tests/unit-tests/gl/test_gl_texture_cache.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/gl/test_gl_texture_cache.cpp	2016-02-08 17:34:18 +0000
@@ -17,7 +17,7 @@
   * Originally by: Daniel van Vugt <daniel.van.vugt@canonical.com>
   */
--#include "mir/gl/recently_used_cache.h"
++#include "src/gl/recently_used_cache.h"
  #include "mir/test/doubles/mock_gl_buffer.h"
  #include "mir/test/doubles/mock_renderable.h"
  #include "mir/test/doubles/mock_gl.h"
@@ -75,6 +75,7 @@
      EXPECT_CALL(mock_gl, glBindTexture(GL_TEXTURE_2D, stub_texture));
      EXPECT_CALL(*mock_buffer,gl_bind_to_texture())
          .Times(0);
++    EXPECT_CALL(*mock_buffer, used_as_texture());
      // Frame 3: Texture found in cache but refreshed with new buffer
      EXPECT_CALL(*mock_buffer, id())
@@ -92,6 +93,7 @@
      EXPECT_CALL(*mock_buffer, id())
          .WillOnce(Return(mg::BufferID(456)));
      EXPECT_CALL(mock_gl, glBindTexture(GL_TEXTURE_2D, stub_texture));
++    EXPECT_CALL(*mock_buffer, used_as_texture());
      EXPECT_CALL(mock_gl, glDeleteTextures(1, Pointee(stub_texture)));
 === modified file 'tests/unit-tests/gl/test_program_factory.cpp'
 --- tests/unit-tests/gl/test_program_factory.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/gl/test_program_factory.cpp	2016-02-08 17:34:18 +0000
@@ -24,7 +24,7 @@
  #include <gtest/gtest.h>
  #include <gmock/gmock.h>
  #include <mir/geometry/rectangle.h>
--#include "src/gl/default_program_factory.h"
++#include "mir/gl/default_program_factory.h"
  #include <mir/test/fake_shared.h>
  #include <mir/test/doubles/mock_buffer.h>
  #include <mir/test/doubles/mock_renderable.h>
 === modified file 'tests/unit-tests/graphics/android/CMakeLists.txt'
 --- tests/unit-tests/graphics/android/CMakeLists.txt	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/graphics/android/CMakeLists.txt	2016-02-08 17:34:18 +0000
@@ -31,6 +31,7 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/test_hwc_fallback_gl_renderer.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_hwc_configuration.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_display_hotplug.cpp
++  ${CMAKE_CURRENT_SOURCE_DIR}/test_egl_sync_extensions.cpp
    $<TARGET_OBJECTS:mirplatformgraphicsandroidobjects>
+ )
 === modified file 'tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp'
 --- tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp	2016-02-08 17:34:18 +0000
@@ -18,11 +18,13 @@
  #include "src/platforms/android/server/android_alloc_adaptor.h"
  #include "src/platforms/android/server/device_quirks.h"
++#include "src/platforms/android/server/cmdstream_sync_factory.h"
  #include "mir/options/program_option.h"
  #include "native_buffer.h"
  #include "mir/test/doubles/mock_android_alloc_device.h"
  #include "mir/test/doubles/mock_alloc_adaptor.h"
++#include "mir/test/doubles/mock_egl.h"
  #include <gtest/gtest.h>
  #include <gmock/gmock.h>
@@ -33,7 +35,6 @@
  namespace geom = mir::geometry;
  namespace mtd = mir::test::doubles;
--
  class AdaptorICSTest : public ::testing::Test
+ {
  public:
@@ -47,13 +48,15 @@
          mock_alloc_device = std::make_shared<NiceMock<mtd::MockAllocDevice>>();
          auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{});
--        alloc_adaptor = std::make_shared<mga::AndroidAllocAdaptor>(mock_alloc_device, quirks);
++        alloc_adaptor = std::make_shared<mga::AndroidAllocAdaptor>(mock_alloc_device, sync_factory, quirks);
          pf = mir_pixel_format_abgr_8888;
          size = geom::Size{300, 200};
          usage = mga::BufferUsage::use_hardware;
+     }
++    mtd::MockEGL mock_egl;
++    std::shared_ptr<mga::CommandStreamSyncFactory> sync_factory{std::make_shared<mga::EGLSyncFactory>()};
      std::shared_ptr<mtd::MockAllocDevice> mock_alloc_device;
      std::shared_ptr<mga::AndroidAllocAdaptor> alloc_adaptor;
@@ -198,7 +201,7 @@
      options.parse_arguments(description, args.size(), args.data());
      auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}, options);
--    alloc_adaptor = std::make_shared<mga::AndroidAllocAdaptor>(mock_alloc_device, quirks);
++    alloc_adaptor = std::make_shared<mga::AndroidAllocAdaptor>(mock_alloc_device, sync_factory, quirks);
      EXPECT_CALL(*mock_alloc_device, alloc_interface(_,_,_,_,fb_usage_flags_broken_device,_,_));
      EXPECT_CALL(*mock_alloc_device, free_interface(_,_));
 === modified file 'tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp'
 --- tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp	2016-02-08 17:34:18 +0000
@@ -23,6 +23,8 @@
  #include "mir/graphics/buffer.h"
  #include "native_buffer.h"
++#include "mir/test/doubles/stub_display_builder.h"
++#include "mir/test/doubles/stub_cmdstream_sync_factory.h"
  #include "mir/test/doubles/mock_egl.h"
  #include <hardware/gralloc.h>
@@ -43,7 +45,9 @@
      testing::NiceMock<mtd::HardwareAccessMock> hw_access_mock;
      testing::NiceMock<mtd::MockEGL> mock_egl;
--    mga::AndroidGraphicBufferAllocator allocator{std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{})};
++    mga::AndroidGraphicBufferAllocator allocator{
++        std::make_shared<mtd::StubCmdStreamSyncFactory>(),
++        std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{})};
  };
  TEST_F(AndroidGraphicBufferAllocatorTest, allocator_accesses_gralloc_module)
@@ -54,7 +58,7 @@
          .Times(1);
      auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{});
--    mga::AndroidGraphicBufferAllocator allocator{quirks};
++    mga::AndroidGraphicBufferAllocator allocator{std::make_shared<mtd::StubCmdStreamSyncFactory>(), quirks};
+ }
  TEST_F(AndroidGraphicBufferAllocatorTest, supported_pixel_formats_contain_common_formats)
 === modified file 'tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp'
 --- tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp	2016-02-08 17:34:18 +0000
@@ -289,7 +289,7 @@
  /* binding tests */
--TEST_F(AndroidBufferBinding, buffer_calls_binding_extension)
++TEST_F(AndroidBufferBinding, buffer_calls_binding_extension_and_notes_gpu_usage)
+ {
      using namespace testing;
      EXPECT_CALL(mock_egl, glEGLImageTargetTexture2DOES(_, _))
@@ -298,11 +298,23 @@
      buffer.gl_bind_to_texture();
+ }
++TEST_F(AndroidBufferBinding, notes_gpu_usage_when_explicity_told)
++{
++    using namespace testing;
++    EXPECT_CALL(mock_egl, glEGLImageTargetTexture2DOES(_, _))
++        .Times(0);
++    EXPECT_CALL(*mock_native_buffer, lock_for_gpu());
++    mga::Buffer buffer(gralloc, mock_native_buffer, extensions);
++    buffer.secure_for_render();
++}
++
  TEST_F(AndroidBufferBinding, buffer_calls_binding_extension_every_time)
+ {
      using namespace testing;
      EXPECT_CALL(mock_egl, glEGLImageTargetTexture2DOES(_, _))
          .Times(Exactly(3));
++    EXPECT_CALL(*mock_native_buffer, lock_for_gpu())
++        .Times(Exactly(3));
      mga::Buffer buffer(gralloc, mock_native_buffer, extensions);
      buffer.gl_bind_to_texture();
 === modified file 'tests/unit-tests/graphics/android/test_display_buffer.cpp'
 --- tests/unit-tests/graphics/android/test_display_buffer.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/graphics/android/test_display_buffer.cpp	2016-02-08 17:34:18 +0000
@@ -235,6 +235,21 @@
      db.release_current();
+ }
++//In HWC 1.0 notably we cannot eglSwapBuffers on the fb context.
++TEST_F(DisplayBuffer, swaps_when_allowed)
++{
++    using namespace testing;
++    EXPECT_CALL(*mock_display_device, can_swap_buffers())
++        .Times(2)
++        .WillOnce(Return(true))
++        .WillOnce(Return(false));
++    EXPECT_CALL(mock_egl, eglSwapBuffers(dummy_display, mock_egl.fake_egl_surface))
++        .Times(1);
++
++    db.swap_buffers();
++    db.swap_buffers();
++}
++
  TEST_F(DisplayBuffer, notifies_list_that_content_is_cleared)
+ {
      EXPECT_CALL(*mock_display_device, content_cleared())
 === modified file 'tests/unit-tests/graphics/android/test_display_hotplug.cpp'
 --- tests/unit-tests/graphics/android/test_display_hotplug.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/graphics/android/test_display_hotplug.cpp	2016-02-08 17:34:18 +0000
@@ -103,6 +103,11 @@
                  new mga::LayerList(std::make_shared<mga::IntegerSourceCrop>(), {}, geom::Displacement{}));
+         }
++        std::unique_ptr<mg::CommandStreamSync> create_command_stream_sync()
++        {
++            return nullptr;
++        }
++
          StubHwcConfig stub_config;
      };
 === added file 'tests/unit-tests/graphics/android/test_egl_sync_extensions.cpp'
 --- tests/unit-tests/graphics/android/test_egl_sync_extensions.cpp	1970-01-01 00:00:00 +0000
 +++ tests/unit-tests/graphics/android/test_egl_sync_extensions.cpp	2016-02-08 17:34:18 +0000
@@ -0,0 +1,75 @@
++/*
++ * Copyright © 2013 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 <kevin.dubois@canonical.com>
++ */
++
++#include "egl_sync_extensions.h"
++#include "mir/test/doubles/mock_egl.h"
++#include <stdexcept>
++
++#include <gtest/gtest.h>
++#include <gmock/gmock.h>
++
++namespace mg = mir::graphics;
++namespace mtd = mir::test::doubles;
++using namespace testing;
++
++typedef mtd::MockEGL::generic_function_pointer_t func_ptr_t;
++class EGLSyncExtensions  : public ::testing::Test
++{
++protected:
++    virtual void SetUp()
++    {
++    }
++
++    testing::NiceMock<mtd::MockEGL> mock_egl;
++};
++
++TEST_F(EGLSyncExtensions, constructor_throws_if_egl_create_sync_not_supported)
++{
++    ON_CALL(mock_egl, eglGetProcAddress(StrEq("eglCreateSyncKHR")))
++        .WillByDefault(Return(reinterpret_cast<func_ptr_t>(0)));
++    EXPECT_THROW({
++        mg::EGLSyncExtensions extensions;
++    }, std::runtime_error);
++}
++
++TEST_F(EGLSyncExtensions, constructor_throws_if_egl_destroy_sync_not_supported)
++{
++    ON_CALL(mock_egl, eglGetProcAddress(StrEq("eglDestroySyncKHR")))
++        .WillByDefault(Return(reinterpret_cast<func_ptr_t>(0)));
++    EXPECT_THROW({
++        mg::EGLSyncExtensions extensions;
++    }, std::runtime_error);
++}
++
++TEST_F(EGLSyncExtensions, constructor_throws_if_egl_wait_sync_not_supported)
++{
++    ON_CALL(mock_egl, eglGetProcAddress(StrEq("eglClientWaitSyncKHR")))
++        .WillByDefault(Return(reinterpret_cast<func_ptr_t>(0)));
++    EXPECT_THROW({
++        mg::EGLSyncExtensions extensions;
++    }, std::runtime_error);
++}
++
++TEST_F(EGLSyncExtensions, sync_success_has_sane_function_hooks)
++{
++    mg::EGLSyncExtensions extensions;
++    EXPECT_NE(nullptr, extensions.eglCreateSyncKHR);
++    EXPECT_NE(nullptr, extensions.eglDestroySyncKHR);
++    EXPECT_NE(nullptr, extensions.eglClientWaitSyncKHR);
++}
 === modified file 'tests/unit-tests/graphics/android/test_fb_device.cpp'
 --- tests/unit-tests/graphics/android/test_fb_device.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/graphics/android/test_fb_device.cpp	2016-02-08 17:34:18 +0000
@@ -72,6 +72,12 @@
      mga::DisplayName primary{mga::DisplayName::primary};
  };
++TEST_F(FBDevice, reports_it_can_swap)
++{
++    mga::FBDevice fbdev(fb_hal_mock);
++    EXPECT_TRUE(fbdev.can_swap_buffers());
++}
++
  TEST_F(FBDevice, rejects_renderables)
+ {
      mg::RenderableList renderlist
@@ -92,6 +98,8 @@
          .WillOnce(Return(-1))
          .WillOnce(Return(0));
++    EXPECT_CALL(mock_context, swap_buffers())
++        .Times(0);
      mga::FBDevice fbdev(fb_hal_mock);
      mga::DisplayContents content{primary, list, geom::Displacement{}, mock_context, stub_compositor};
 === modified file 'tests/unit-tests/graphics/android/test_hwc_device.cpp'
 --- tests/unit-tests/graphics/android/test_hwc_device.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/graphics/android/test_hwc_device.cpp	2016-02-08 17:34:18 +0000
@@ -120,6 +120,12 @@
  };
+ }
++TEST_F(HwcDevice, reports_it_can_swap)
++{
++    mga::HwcDevice device(mock_device);
++    EXPECT_TRUE(device.can_swap_buffers());
++}
++
  TEST_F(HwcDevice, prepares_a_skip_and_target_layer_by_default)
+ {
      using namespace testing;
@@ -174,7 +180,7 @@
      device.commit({content});
+ }
--TEST_F(HwcDevice, swaps_buffers_directly_when_no_renderables)
++TEST_F(HwcDevice, does_not_swap_buffers_when_no_renderables)
+ {
      using namespace testing;
      mtd::MockRenderableListCompositor mock_compositor;
@@ -184,7 +190,8 @@
      EXPECT_CALL(mock_compositor, render(_,_,_))
          .Times(0);
--    EXPECT_CALL(mock_context, swap_buffers());
++    EXPECT_CALL(mock_context, swap_buffers())
++        .Times(0);
      mga::LayerList list(layer_adapter, {}, geom::Displacement{});
      mga::DisplayContents content{primary, list, offset, mock_context, mock_compositor};
@@ -465,8 +472,6 @@
      NiceMock<mtd::MockSwappingGLContext> mock_context;
      ON_CALL(mock_context, last_rendered_buffer())
          .WillByDefault(Return(stub_fb_buffer));
--    EXPECT_CALL(mock_context, swap_buffers())
--        .Times(AtLeast(5));
      mga::LayerList list(layer_adapter, {}, geom::Displacement{});
      mtd::MockRenderableListCompositor mock_compositor;
@@ -844,10 +849,6 @@
      InSequence seq;
      EXPECT_CALL(*mock_device, prepare(MatchesLists(expected_list, expected_list)));
--    EXPECT_CALL(mock_context1, make_current());
--    EXPECT_CALL(mock_context1, release_current());
--    EXPECT_CALL(mock_context2, make_current());
--    EXPECT_CALL(mock_context2, release_current());
      EXPECT_CALL(*mock_device, set(MatchesLists(expected_list, expected_list)));
      mga::LayerList primary_list(layer_adapter, {}, geom::Displacement{});
 === modified file 'tests/unit-tests/graphics/android/test_hwc_fb_device.cpp'
 --- tests/unit-tests/graphics/android/test_hwc_fb_device.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/graphics/android/test_hwc_fb_device.cpp	2016-02-08 17:34:18 +0000
@@ -104,6 +104,12 @@
  };
+ }
++TEST_F(HwcFbDevice, reports_it_cannot_swap)
++{
++    mga::HwcFbDevice device(mock_hwc_device_wrapper, mock_fb_device);
++    EXPECT_FALSE(device.can_swap_buffers());
++}
++
  TEST_F(HwcFbDevice, hwc10_subscribes_to_vsync_events)
+ {
      using namespace testing;
 === modified file 'tests/unit-tests/graphics/android/test_native_buffer.cpp'
 --- tests/unit-tests/graphics/android/test_native_buffer.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/graphics/android/test_native_buffer.cpp	2016-02-08 17:34:18 +0000
@@ -17,25 +17,41 @@
   */
  #include "android_native_buffer.h"
++#include "egl_sync_fence.h"
  #include "mir/test/doubles/mock_fence.h"
  #include <memory>
  #include <gtest/gtest.h>
  namespace mtd=mir::test::doubles;
  namespace mga=mir::graphics::android;
++using namespace testing;
++
++namespace
++{
++struct MockCommandStreamSync : public mir::graphics::CommandStreamSync
++{
++    MOCK_METHOD0(raise, void());
++    MOCK_METHOD0(reset, void());
++    MOCK_METHOD1(wait_for, bool(std::chrono::nanoseconds));
++};
++}
  struct NativeBuffer : public testing::Test
+ {
      NativeBuffer() :
          a_native_window_buffer(std::make_shared<ANativeWindowBuffer>()),
          mock_fence(std::make_shared<testing::NiceMock<mtd::MockFence>>()),
--        fake_fd{48484}
++        fake_fd{48484},
++        timeout{std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::seconds(2))},
++        mock_cmdstream_sync{std::make_shared<MockCommandStreamSync>()}
+     {
+     }
      std::shared_ptr<ANativeWindowBuffer> a_native_window_buffer;
      std::shared_ptr<mtd::MockFence> mock_fence;
      int fake_fd;
++    std::chrono::nanoseconds timeout;
++    std::shared_ptr<MockCommandStreamSync> mock_cmdstream_sync;
  };
  TEST_F(NativeBuffer, extends_lifetime_when_driver_calls_external_refcount_hooks)
@@ -88,7 +104,7 @@
+ {
      EXPECT_CALL(*mock_fence, wait())
          .Times(0);
--    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_fence, mga::BufferAccess::read);
++    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read);
      buffer.ensure_available_for(mga::BufferAccess::read);
+ }
@@ -96,7 +112,7 @@
+ {
      EXPECT_CALL(*mock_fence, wait())
          .Times(1);
--    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_fence, mga::BufferAccess::write);
++    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::write);
      buffer.ensure_available_for(mga::BufferAccess::read);
+ }
@@ -104,7 +120,7 @@
+ {
      EXPECT_CALL(*mock_fence, wait())
          .Times(1);
--    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_fence, mga::BufferAccess::read);
++    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read);
      buffer.ensure_available_for(mga::BufferAccess::write);
+ }
@@ -112,7 +128,7 @@
+ {
      EXPECT_CALL(*mock_fence, wait())
          .Times(1);
--    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_fence, mga::BufferAccess::write);
++    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::write);
      buffer.ensure_available_for(mga::BufferAccess::write);
+ }
@@ -120,7 +136,7 @@
+ {
      EXPECT_CALL(*mock_fence, merge_with(fake_fd))
          .Times(1);
--    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_fence, mga::BufferAccess::read);
++    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read);
      buffer.update_usage(fake_fd, mga::BufferAccess::write);
+ }
@@ -129,7 +145,7 @@
      EXPECT_CALL(*mock_fence, wait())
          .Times(3);
--    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_fence, mga::BufferAccess::read);
++    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read);
      buffer.ensure_available_for(mga::BufferAccess::write);
      buffer.ensure_available_for(mga::BufferAccess::read);
@@ -137,3 +153,30 @@
      buffer.ensure_available_for(mga::BufferAccess::write);
      buffer.ensure_available_for(mga::BufferAccess::read);
+ }
++
++TEST_F(NativeBuffer, raises_egl_fence)
++{
++    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read);
++
++    EXPECT_CALL(*mock_cmdstream_sync, raise());
++    buffer.lock_for_gpu();
++}
++
++TEST_F(NativeBuffer, clears_egl_fence_successfully)
++{
++    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read);
++    EXPECT_CALL(*mock_cmdstream_sync, wait_for(timeout))
++        .Times(1)
++        .WillOnce(Return(true));
++    buffer.wait_for_unlock_by_gpu();
++}
++
++//not really helpful to throw if the timeout fails
++TEST_F(NativeBuffer, ignores_clears_egl_fence_failure)
++{
++    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read);
++    EXPECT_CALL(*mock_cmdstream_sync, wait_for(timeout))
++        .Times(1)
++        .WillOnce(Return(false));
++    buffer.wait_for_unlock_by_gpu();
++}
 === modified file 'tests/unit-tests/graphics/android/test_platform.cpp'
 --- tests/unit-tests/graphics/android/test_platform.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/graphics/android/test_platform.cpp	2016-02-08 17:34:18 +0000
@@ -26,6 +26,7 @@
  #include "mir/test/doubles/mock_display_report.h"
  #include "mir/test/doubles/mock_egl.h"
  #include "mir/test/doubles/stub_display_builder.h"
++#include "mir/test/doubles/stub_cmdstream_sync_factory.h"
  #include "mir/test/doubles/fd_matcher.h"
  #include "mir/test/fake_shared.h"
  #include "mir/test/doubles/mock_android_native_buffer.h"
@@ -54,6 +55,7 @@
          using namespace testing;
          stub_display_builder = std::make_shared<mtd::StubDisplayBuilder>();
++        stub_sync_factory = std::make_shared<mtd::StubCmdStreamSyncFactory>();
          stub_display_report = mr::null_display_report();
          stride = geom::Stride(300*4);
@@ -86,6 +88,7 @@
      std::shared_ptr<mtd::MockAndroidNativeBuffer> native_buffer;
      std::shared_ptr<mtd::StubBufferAllocator> stub_buffer_allocator;
      std::shared_ptr<mtd::StubDisplayBuilder> stub_display_builder;
++    std::shared_ptr<mtd::StubCmdStreamSyncFactory> stub_sync_factory;
      std::shared_ptr<mtd::MockBuffer> mock_buffer;
      std::shared_ptr<native_handle_t> native_buffer_handle;
      std::shared_ptr<mg::DisplayReport> stub_display_report;
@@ -99,10 +102,12 @@
+ {
      using namespace ::testing;
      int fake_fence{333};
++    EXPECT_CALL(*native_buffer, wait_for_unlock_by_gpu());
      EXPECT_CALL(*native_buffer, copy_fence())
          .WillOnce(Return(fake_fence));
--    mga::Platform platform(stub_buffer_allocator, stub_display_builder, stub_display_report, mga::OverlayOptimization::enabled, quirks);
++    mga::Platform platform(stub_buffer_allocator, stub_display_builder,
++        stub_sync_factory, stub_display_report, mga::OverlayOptimization::enabled, quirks);
      mtd::MockBufferIpcMessage mock_ipc_msg;
      int offset = 0;
@@ -130,10 +135,12 @@
  TEST_F(PlatformBufferIPCPackaging, test_ipc_data_packed_correctly_for_full_ipc_without_fence)
+ {
      using namespace ::testing;
++    EXPECT_CALL(*native_buffer, wait_for_unlock_by_gpu());
      EXPECT_CALL(*native_buffer, copy_fence())
          .WillOnce(Return(-1));
--    mga::Platform platform(stub_buffer_allocator, stub_display_builder, stub_display_report, mga::OverlayOptimization::enabled, quirks);
++    mga::Platform platform(stub_buffer_allocator, stub_display_builder,
++        stub_sync_factory, stub_display_report, mga::OverlayOptimization::enabled, quirks);
      mtd::MockBufferIpcMessage mock_ipc_msg;
      int offset = 0;
@@ -169,10 +176,12 @@
  TEST_F(PlatformBufferIPCPackaging, test_ipc_data_packed_correctly_for_nested)
+ {
      using namespace ::testing;
++    EXPECT_CALL(*native_buffer, wait_for_unlock_by_gpu());
      EXPECT_CALL(*native_buffer, copy_fence())
          .WillOnce(Return(-1));
--    mga::Platform platform(stub_buffer_allocator, stub_display_builder, stub_display_report, mga::OverlayOptimization::enabled, quirks);
++    mga::Platform platform(stub_buffer_allocator, stub_display_builder,
++        stub_sync_factory, stub_display_report, mga::OverlayOptimization::enabled, quirks);
      mtd::MockBufferIpcMessage mock_ipc_msg;
      int offset = 0;
@@ -207,7 +216,8 @@
      using namespace ::testing;
      int fake_fence{33};
--    mga::Platform platform(stub_buffer_allocator, stub_display_builder, stub_display_report, mga::OverlayOptimization::enabled, quirks);
++    mga::Platform platform(stub_buffer_allocator, stub_display_builder,
++        stub_sync_factory, stub_display_report, mga::OverlayOptimization::enabled, quirks);
      auto ipc_ops = platform.make_ipc_operations();
      mtd::MockBufferIpcMessage mock_ipc_msg;
@@ -234,6 +244,7 @@
      mga::Platform platform(
          std::make_shared<mtd::StubBufferAllocator>(),
          std::make_shared<mtd::StubDisplayBuilder>(),
++        std::make_shared<mtd::StubCmdStreamSyncFactory>(),
          mr::null_display_report(),
          mga::OverlayOptimization::enabled,
          std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}));
 === modified file 'tests/unit-tests/graphics/test_egl_extensions.cpp'
 --- tests/unit-tests/graphics/test_egl_extensions.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/graphics/test_egl_extensions.cpp	2016-02-08 17:34:18 +0000
@@ -68,38 +68,3 @@
      EXPECT_NE(nullptr, extensions.eglDestroyImageKHR);
      EXPECT_NE(nullptr, extensions.glEGLImageTargetTexture2DOES);
+ }
--
--TEST_F(EGLExtensions, constructor_throws_if_egl_create_sync_not_supported)
--{
--    ON_CALL(mock_egl, eglGetProcAddress(StrEq("eglCreateSyncKHR")))
--        .WillByDefault(Return(reinterpret_cast<func_ptr_t>(0)));
--    EXPECT_THROW({
--        mg::EGLSyncExtensions extensions;
--    }, std::runtime_error);
--}
--
--TEST_F(EGLExtensions, constructor_throws_if_egl_destroy_sync_not_supported)
--{
--    ON_CALL(mock_egl, eglGetProcAddress(StrEq("eglDestroySyncKHR")))
--        .WillByDefault(Return(reinterpret_cast<func_ptr_t>(0)));
--    EXPECT_THROW({
--        mg::EGLSyncExtensions extensions;
--    }, std::runtime_error);
--}
--
--TEST_F(EGLExtensions, constructor_throws_if_egl_wait_sync_not_supported)
--{
--    ON_CALL(mock_egl, eglGetProcAddress(StrEq("eglClientWaitSyncKHR")))
--        .WillByDefault(Return(reinterpret_cast<func_ptr_t>(0)));
--    EXPECT_THROW({
--        mg::EGLSyncExtensions extensions;
--    }, std::runtime_error);
--}
--
--TEST_F(EGLExtensions, sync_success_has_sane_function_hooks)
--{
--    mg::EGLSyncExtensions extensions;
--    EXPECT_NE(nullptr, extensions.eglCreateSyncKHR);
--    EXPECT_NE(nullptr, extensions.eglDestroySyncKHR);
--    EXPECT_NE(nullptr, extensions.eglClientWaitSyncKHR);
--}
 === modified file 'tests/unit-tests/graphics/test_egl_sync_fence.cpp'
 --- tests/unit-tests/graphics/test_egl_sync_fence.cpp	2015-11-19 17:42:47 +0000
 +++ tests/unit-tests/graphics/test_egl_sync_fence.cpp	2016-02-08 17:34:18 +0000
@@ -17,7 +17,7 @@
   */
  #include <mir/test/doubles/mock_egl.h>
--#include "mir/graphics/egl_sync_fence.h"
++#include "egl_sync_fence.h"
  #include <gtest/gtest.h>
  #include <gmock/gmock.h>
  #include <array>