Merge lp:~kdub/mir/n7-support into lp:mir

[Kevin DuBois]

graphics: android: support 'old aka 2012' nexus 7 hwc (nvidia tegra3 SoC) better.

graphics: android: support 'old aka 2012' nexus 7 hwc (nvidia tegra3 SoC) better.

improve hwc1.0 support to avert segfaulting on mir startup with hwc1.0 on tegra 3.
Mir demo clients seem to work well. Unity8 is still affected by lp:1238695

improve HWCLayerList class a bit as well. Before it was just made one layer on construction, now you can use an initializer list to have multiple layers.

These are hwc1.0 changes primarily, so I gave a basic sanity test to:
Galaxy Nexus (hwc1.0)
Nexus 7 (hwc1.0)
Nexus 4 (hwc1.1)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1219
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/364/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/93/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/93/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/364/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Seems to run fine on the N7. Although I don't see any change in performance compared to trunk. Should there be an improvement?

review: Approve (manual testing)

[Alexandros Frantzis (afrantzis)]

54 + layer_list({mga::CompositionLayer{true}}),

'true' is not very informative in this context. Perhaps use an enum?

491 + HWCLayer& operator=(HWCLayer const& layer)
492 + {
493 + memcpy(this, &layer, sizeof(HWCLayer));
494 + this->visibleRegionScreen = {1, &this->visible_rect};
495 + return *this;
496 + }
497 +
498 + HWCLayer(HWCLayer const& layer)
499 + {
500 + memcpy(this, &layer, sizeof(HWCLayer));
501 + this->visibleRegionScreen = {1, &this->visible_rect};
502 + }

Could (should) be in .cpp file.

review: Needs Fixing

[Kevin DuBois (kdub)]

> Seems to run fine on the N7. Although I don't see any change in performance
> compared to trunk. Should there be an improvement?

Stock images are missing hwcomposer.tegra3.so last I checked, so these changes won't really affect much until that library is returned to the build. I don't expect much performance change from this patch

[Kevin DuBois (kdub)]

> 'true' is not very informative in this context. Perhaps use an enum?
fair enough, used the existing enum from hwcomposer, HWC_SKIP_LAYER.

> Could (should) be in .cpp file.
moved to a cpp

[Daniel van Vugt (vanvugt)]

> Stock images are missing hwcomposer.tegra3.so last I checked, so these changes
> won't really affect much until that library is returned to the build. I don't
> expect much performance change from this patch

Is there a bug for that?

[Alexandros Frantzis (afrantzis)]

> 'true' is not very informative in this context. Perhaps use an enum?
> fair enough, used the existing enum from hwcomposer, HWC_SKIP_LAYER.

54 + layer_list({mga::CompositionLayer{true}}),

It's still there :)

[Alan Griffiths (alan-griffiths)]

> > 'true' is not very informative in this context. Perhaps use an enum?
> > fair enough, used the existing enum from hwcomposer, HWC_SKIP_LAYER.
>
> 54 + layer_list({mga::CompositionLayer{true}}),
>
> It's still there :)

"true" an unusual synonym for 1.

(Is there any good reason this constructor takes an int rather than an enum class?)

review: Needs Fixing

[Kevin DuBois (kdub)]

> "true" an unusual synonym for 1.
yeah, an oversight when I was updating. will fix.

> (Is there any good reason this constructor takes an int rather than an enum
> class?)

we're using a header from android for this enum, which is unamed
http://bazaar.launchpad.net/~mir-team/mir/trusty/view/head:/3rd_party/android-deps/hardware/hwcomposer_defs.h#L74

[Kevin DuBois (kdub)]

> Is there a bug for that?

not that I know of, I'll file one once this lands (less disruption that way)

[Alan Griffiths (alan-griffiths)]

OK I don't see anything I object too.

review: Approve

=== modified file 'include/test/mir_test_doubles/mock_hwc_composer_device_1.h'
--- include/test/mir_test_doubles/mock_hwc_composer_device_1.h	2013-04-24 05:22:20 +0000
+++ include/test/mir_test_doubles/mock_hwc_composer_device_1.h	2013-11-12 23:50:30 +0000
@@ -21,6 +21,8 @@
 
 #include <hardware/hwcomposer.h>
 #include <gmock/gmock.h>
+#include <vector>
+#include <memory>
 
 namespace mir
 {
@@ -59,10 +61,9 @@
 
         hwc_display_contents_1_t* primary_display = *in;
         memcpy(out, primary_display, sizeof(hwc_display_contents_1_t));
-
         return 0;
+    }
 
-    }
     int save_last_prepare_arguments(struct hwc_composer_device_1 *, size_t, hwc_display_contents_1_t** displays)
     {
         return save_args(&display0_prepare_content, displays);
@@ -70,6 +71,12 @@
 
     int save_last_set_arguments(struct hwc_composer_device_1 *, size_t, hwc_display_contents_1_t** displays)
     {
+        hwc_display_contents_1_t* display = *displays;
+        for(auto i = 0u; i < display->numHwLayers; i++)
+        {
+            set_layerlist.push_back(display->hwLayers[i]);
+            set_layerlist.back().visibleRegionScreen = {0, nullptr};
+        }
         return save_args(&display0_set_content, displays);
     }
 
@@ -120,6 +127,7 @@
     MOCK_METHOD5(getDisplayAttributes_interface, int(struct hwc_composer_device_1*, int, uint32_t, const uint32_t*, int32_t*));
 
     hwc_display_contents_1_t display0_set_content;
+    std::vector<hwc_layer_1> set_layerlist;
     hwc_display_contents_1_t display0_prepare_content;
 };
 

=== modified file 'src/server/graphics/android/hwc10_device.cpp'
--- src/server/graphics/android/hwc10_device.cpp	2013-10-25 16:39:50 +0000
+++ src/server/graphics/android/hwc10_device.cpp	2013-11-12 23:50:30 +0000
@@ -30,6 +30,7 @@
                               std::shared_ptr<DisplayDevice> const& fbdev,
                               std::shared_ptr<HWCVsyncCoordinator> const& coordinator)
     : HWCCommonDevice(hwc_device, coordinator),
+      layer_list({mga::CompositionLayer{HWC_SKIP_LAYER}}),
       fb_device(fbdev),
       wait_for_vsync(true)
 {
@@ -63,20 +64,17 @@
 {
     auto lg = lock_unblanked();
 
-    hwc_display_contents_1 display_contents;
-    display_contents.dpy = dpy;
-    display_contents.sur = sur;
-    display_contents.retireFenceFd = -1;
-    display_contents.flags = 0;
-    display_contents.numHwLayers = 0;
-    hwc_display_contents_1* contents = &display_contents;
+    auto display_list = layer_list.native_list();
+    display_list->dpy = dpy;
+    display_list->sur = sur;
 
-    auto rc = hwc_device->prepare(hwc_device.get(), 1, &contents);
+    auto rc = hwc_device->prepare(hwc_device.get(), 1, &display_list);
     if (rc != 0)
     {
         BOOST_THROW_EXCEPTION(std::runtime_error("error during hwc prepare()"));
     }
-    rc = hwc_device->set(hwc_device.get(), 1, &contents);
+
+    rc = hwc_device->set(hwc_device.get(), 1, &display_list);
     if (rc != 0)
     {
         BOOST_THROW_EXCEPTION(std::runtime_error("error during hwc set()"));

=== modified file 'src/server/graphics/android/hwc10_device.h'
--- src/server/graphics/android/hwc10_device.h	2013-10-25 16:39:50 +0000
+++ src/server/graphics/android/hwc10_device.h	2013-11-12 23:50:30 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_GRAPHICS_ANDROID_HWC10_DEVICE_H_
 #define MIR_GRAPHICS_ANDROID_HWC10_DEVICE_H_
 #include "hwc_common_device.h"
+#include "hwc_layerlist.h"
 
 namespace mir
 {
@@ -44,6 +45,8 @@
     void commit_frame(EGLDisplay dpy, EGLSurface sur);
 
 private:
+    LayerList layer_list;
+
     std::shared_ptr<DisplayDevice> const fb_device;
     bool wait_for_vsync;
 };

=== modified file 'src/server/graphics/android/hwc11_device.cpp'
--- src/server/graphics/android/hwc11_device.cpp	2013-10-31 16:37:35 +0000
+++ src/server/graphics/android/hwc11_device.cpp	2013-11-12 23:50:30 +0000
@@ -22,6 +22,8 @@
 #include "hwc_vsync_coordinator.h"
 #include "android_format_conversion-inl.h"
 #include "mir/graphics/android/sync_fence.h"
+#include "mir/graphics/android/native_buffer.h"
+#include "mir/graphics/buffer.h"
 
 #include <EGL/eglext.h>
 #include <boost/throw_exception.hpp>
@@ -70,12 +72,9 @@
 }
 
 mga::HWC11Device::HWC11Device(std::shared_ptr<hwc_composer_device_1> const& hwc_device,
-                              std::shared_ptr<HWCLayerList> const& layer_list,
-                              std::shared_ptr<DisplayDevice> const& fbdev,
                               std::shared_ptr<HWCVsyncCoordinator> const& coordinator)
     : HWCCommonDevice(hwc_device, coordinator),
-      layer_list(layer_list),
-      fb_device(fbdev), 
+      layer_list({mga::FramebufferLayer{}}),
       sync_ops(std::make_shared<mga::RealSyncFileOps>()),
       fb_format(determine_fb_format())
 {
@@ -118,16 +117,19 @@
 
 void mga::HWC11Device::set_next_frontbuffer(std::shared_ptr<mg::Buffer> const& buffer)
 {
-    layer_list->set_fb_target(buffer);
+    layer_list.set_fb_target(buffer->native_buffer_handle());
+    //TODO: wait for framebuffer render to complete here. Eventually, we want to pass the fence right
+    //      into hwc_device->set() and let that wait for the render to complete.
+    buffer->native_buffer_handle()->wait_for_content();
 }
 
 void mga::HWC11Device::commit_frame(EGLDisplay dpy, EGLSurface sur)
 {
     auto lg = lock_unblanked();
-
+  
     //note, although we only have a primary display right now,
     //      set the second display to nullptr, as exynos hwc always derefs displays[1]
-    hwc_display_contents_1_t* displays[HWC_NUM_DISPLAY_TYPES] {layer_list->native_list(), nullptr};
+    hwc_display_contents_1_t* displays[HWC_NUM_DISPLAY_TYPES] {layer_list.native_list(), nullptr};
 
     if (hwc_device->prepare(hwc_device.get(), 1, displays))
     {
@@ -135,7 +137,7 @@
     }
 
     /* note, swapbuffers will go around through the driver and call
-       set_next_frontbuffer, updating the fb target before committing */
+       set_next_frontbuffer, updating the fb in layerlist before committing */
     if (eglSwapBuffers(dpy, sur) == EGL_FALSE)
     {
         BOOST_THROW_EXCEPTION(std::runtime_error("error during eglSwapBuffers"));
@@ -145,7 +147,6 @@
     {
         BOOST_THROW_EXCEPTION(std::runtime_error("error during hwc set()"));
     }
-
     mga::SyncFence fence(sync_ops, displays[HWC_DISPLAY_PRIMARY]->retireFenceFd);
     fence.wait();
 }

=== modified file 'src/server/graphics/android/hwc11_device.h'
--- src/server/graphics/android/hwc11_device.h	2013-10-31 16:27:43 +0000
+++ src/server/graphics/android/hwc11_device.h	2013-11-12 23:50:30 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_GRAPHICS_ANDROID_HWC11_DEVICE_H_
 #define MIR_GRAPHICS_ANDROID_HWC11_DEVICE_H_
 #include "hwc_common_device.h"
+#include "hwc_layerlist.h"
 #include <memory>
 
 namespace mir
@@ -29,7 +30,6 @@
 
 namespace android
 {
-class HWCLayerList;
 class HWCVsyncCoordinator;
 class SyncFileOps;
 
@@ -37,8 +37,6 @@
 {
 public:
     HWC11Device(std::shared_ptr<hwc_composer_device_1> const& hwc_device,
-                std::shared_ptr<HWCLayerList> const& layer_list,
-                std::shared_ptr<DisplayDevice> const& fbdev,
                 std::shared_ptr<HWCVsyncCoordinator> const& coordinator);
     ~HWC11Device() noexcept;
 
@@ -51,8 +49,8 @@
     void commit_frame(EGLDisplay dpy, EGLSurface sur);
 
 private:
-    std::shared_ptr<HWCLayerList> const layer_list;
-    std::shared_ptr<DisplayDevice> const fb_device;
+    LayerList layer_list;
+
     std::shared_ptr<SyncFileOps> const sync_ops;
     unsigned int primary_display_config;
     geometry::PixelFormat fb_format;

=== modified file 'src/server/graphics/android/hwc_layerlist.cpp'
--- src/server/graphics/android/hwc_layerlist.cpp	2013-10-16 03:27:36 +0000
+++ src/server/graphics/android/hwc_layerlist.cpp	2013-11-12 23:50:30 +0000
@@ -19,7 +19,6 @@
 #include "mir/graphics/android/sync_fence.h"
 #include "mir/graphics/android/native_buffer.h"
 #include "hwc_layerlist.h"
-#include "buffer.h"
 
 #include <cstring>
 
@@ -27,112 +26,92 @@
 namespace mga=mir::graphics::android;
 namespace geom=mir::geometry;
 
-mga::HWCRect::HWCRect()
-    : self{0,0,0,0}
-{
-}
-
-mga::HWCRect::HWCRect(geom::Rectangle& rect)
-{
-    self.top = rect.top_left.y.as_uint32_t();
-    self.left = rect.top_left.x.as_uint32_t();
-    self.bottom= rect.size.height.as_uint32_t();
-    self.right = rect.size.width.as_uint32_t();
-}
-
-mga::HWCDefaultLayer::HWCDefaultLayer(std::initializer_list<mga::HWCRect> list)
-{
-    /* default values.*/
-    self.compositionType = HWC_FRAMEBUFFER_TARGET;
-    self.hints = 0;
-    self.flags = 0;
-    self.transform = 0;
-    self.blending = HWC_BLENDING_NONE;
-    self.acquireFenceFd = -1;
-    self.releaseFenceFd = -1;
-
-    HWCRect emptyrect;
-    self.sourceCrop = emptyrect;
-    self.displayFrame = emptyrect;
-    self.visibleRegionScreen.numRects=list.size();
-    self.visibleRegionScreen.rects=nullptr;
-    if (list.size() != 0)
-    {
-        auto rect_array = new hwc_rect_t[list.size()];
-        auto i = 0u;
-        for( auto& rect : list )
-        {
-            rect_array[i++] = rect; 
-        }
-        self.visibleRegionScreen.rects = rect_array;
-    }
-}
-
-mga::HWCDefaultLayer::~HWCDefaultLayer()
-{
-    if (self.visibleRegionScreen.rects)
-    {
-        delete[] self.visibleRegionScreen.rects;
-    }
-}
-
-mga::HWCFBLayer::HWCFBLayer(
-        buffer_handle_t native_handle,
-        HWCRect display_frame_rect)
-    : HWCDefaultLayer{display_frame_rect}
-{
-    self.compositionType = HWC_FRAMEBUFFER_TARGET;
-
-    self.handle = native_handle;
-    self.sourceCrop = display_frame_rect;
-    self.displayFrame = display_frame_rect;
-}
-
-mga::HWCFBLayer::HWCFBLayer()
-    : HWCFBLayer{nullptr, mga::HWCRect{}}
-{
-}
-
-mga::LayerList::LayerList()
-    : layer_list{std::make_shared<HWCFBLayer>()},
-      hwc_representation{std::make_shared<hwc_display_contents_1_t>()}
-{
-    memset(hwc_representation.get(), 0, sizeof(hwc_display_contents_1_t));
-    update_list();
-}
-
-void mga::LayerList::set_fb_target(std::shared_ptr<mg::Buffer> const& buffer)
-{
-    auto native_buffer = buffer->native_buffer_handle();
-    native_buffer->wait_for_content();
-
-    geom::Point pt{0, 0};
-    geom::Rectangle rect{pt, buffer->size()};
-    HWCRect display_rect(rect);
-
-    auto fb_layer = std::make_shared<HWCFBLayer>(native_buffer->handle(), display_rect);
-    layer_list[fb_position] = fb_layer;
-
-    update_list();
-} 
-
-void mga::LayerList::update_list()
-{
-    if (layer_list.size() != hwc_representation->numHwLayers)
-    {
-        auto struct_size = sizeof(hwc_display_contents_1_t) + sizeof(hwc_layer_1_t)*(layer_list.size());
-        hwc_representation = std::shared_ptr<hwc_display_contents_1_t>(
-            static_cast<hwc_display_contents_1_t*>( ::operator new(struct_size)));
-
-        hwc_representation->numHwLayers = layer_list.size();
-    }
+mga::HWCLayer& mga::HWCLayer::operator=(HWCLayer const& layer)
+{
+    memcpy(this, &layer, sizeof(HWCLayer)); 
+    this->visibleRegionScreen = {1, &this->visible_rect};
+    return *this;     
+}
+
+mga::HWCLayer::HWCLayer(HWCLayer const& layer)
+{
+    memcpy(this, &layer, sizeof(HWCLayer)); 
+    this->visibleRegionScreen = {1, &this->visible_rect};
+}
+
+mga::HWCLayer::HWCLayer(int type, buffer_handle_t buffer_handle, int width, int height, int layer_flags)
+{
+    compositionType = type;
+    hints = 0;
+    flags = layer_flags;
+    transform = 0;
+    blending = HWC_BLENDING_NONE;
+    //TODO: acquireFenceFd should be buffer.fence()
+    acquireFenceFd = -1;
+    releaseFenceFd = -1;
+
+    visible_rect.top = 0;
+    visible_rect.left = 0;
+    visible_rect.bottom = height;
+    visible_rect.right = width;
+    sourceCrop = visible_rect;
+    displayFrame = visible_rect;
+    visibleRegionScreen.numRects=1;
+    visibleRegionScreen.rects= &visible_rect;
+    handle = buffer_handle;
+}
+
+mga::FramebufferLayer::FramebufferLayer()
+    : HWCLayer(HWC_FRAMEBUFFER_TARGET, nullptr, 0, 0, 0)
+{
+}
+
+mga::FramebufferLayer::FramebufferLayer(mg::NativeBuffer const& buffer)
+    : HWCLayer(HWC_FRAMEBUFFER_TARGET, buffer.handle(),
+               buffer.anwb()->width, buffer.anwb()->height, 0)
+{
+}
+
+mga::CompositionLayer::CompositionLayer(int layer_flags)
+    : HWCLayer(HWC_FRAMEBUFFER, nullptr, 0, 0, layer_flags)
+{
+}
+
+mga::CompositionLayer::CompositionLayer(mg::NativeBuffer const& buffer, int layer_flags)
+    : HWCLayer(HWC_FRAMEBUFFER, buffer.handle(),
+               buffer.anwb()->width, buffer.anwb()->height, layer_flags)
+{
+}
+
+mga::LayerList::LayerList(std::initializer_list<HWCLayer> const& layer_list)
+{
+    auto struct_size = sizeof(hwc_display_contents_1_t) + sizeof(hwc_layer_1_t)*(layer_list.size());
+    hwc_representation = std::shared_ptr<hwc_display_contents_1_t>(
+        static_cast<hwc_display_contents_1_t*>( ::operator new(struct_size)));
 
     auto i = 0u;
-    for( auto& layer : layer_list)
+    for(auto& layer : layer_list)
     {
-        hwc_representation->hwLayers[i++] = *layer;
+        hwc_representation->hwLayers[i++] = layer;        
     }
+    hwc_representation->numHwLayers = layer_list.size();
     hwc_representation->retireFenceFd = -1;
+    hwc_representation->flags = HWC_GEOMETRY_CHANGED;
+
+    //aosp exynos hwc in particular, checks that these fields are non-null in hwc1.1, although
+    //these fields are deprecated in hwc1.1 and later.
+    hwc_representation->dpy = reinterpret_cast<void*>(0xDECAF);
+    hwc_representation->sur = reinterpret_cast<void*>(0xC0FFEE);
+    
+}
+
+void mga::LayerList::set_fb_target(std::shared_ptr<NativeBuffer> const& native_buffer)
+{
+    auto fb_position = hwc_representation->numHwLayers - 1;
+    if (hwc_representation->hwLayers[fb_position].compositionType == HWC_FRAMEBUFFER_TARGET)
+    {
+        hwc_representation->hwLayers[fb_position] = mga::FramebufferLayer(*native_buffer);
+    }
 }
 
 hwc_display_contents_1_t* mga::LayerList::native_list() const

=== modified file 'src/server/graphics/android/hwc_layerlist.h'
--- src/server/graphics/android/hwc_layerlist.h	2013-09-11 00:50:04 +0000
+++ src/server/graphics/android/hwc_layerlist.h	2013-11-12 23:50:30 +0000
@@ -24,76 +24,52 @@
 #include <memory>
 #include <vector>
 #include <initializer_list>
+
 namespace mir
 {
 namespace graphics
 {
+
+class NativeBuffer;
 class Buffer;
 
 namespace android
 {
- 
-struct HWCRect
-{
-    HWCRect(); 
-    HWCRect(geometry::Rectangle& rect);
-
-    operator hwc_rect_t const& () const { return self; }
-    operator hwc_rect_t& () { return self; }
-private:
-    hwc_rect_t self;
-};
-
-struct HWCDefaultLayer
-{
-    HWCDefaultLayer(std::initializer_list<HWCRect> list);
-    ~HWCDefaultLayer();
-
-    operator hwc_layer_1 const& () const { return self; }
-    operator hwc_layer_1& () { return self; }
-
-protected:
-    HWCDefaultLayer& operator=(HWCDefaultLayer const&) = delete;
-    HWCDefaultLayer(HWCDefaultLayer const&) = delete;
-
-    hwc_layer_1 self;
-};
-
-struct HWCFBLayer : public HWCDefaultLayer
-{
-    HWCFBLayer();
-    HWCFBLayer(buffer_handle_t native_buf,
-               HWCRect display_frame_rect);
-};
-
-class HWCLayerList
-{
-public:
-    virtual ~HWCLayerList() = default;
-
-    virtual hwc_display_contents_1_t* native_list() const = 0;
-    virtual void set_fb_target(std::shared_ptr<Buffer> const&) = 0;
-
-protected:
-    HWCLayerList() = default;
-    HWCLayerList& operator=(HWCLayerList const&) = delete;
-    HWCLayerList(HWCLayerList const&) = delete;
-
-};
-
-class LayerList : public HWCLayerList
-{
-public:
-    LayerList();
-
-    void set_fb_target(std::shared_ptr<Buffer> const&);
+
+struct HWCLayer : public hwc_layer_1
+{
+    virtual ~HWCLayer() = default;
+
+    HWCLayer& operator=(HWCLayer const& layer);
+    HWCLayer(HWCLayer const& layer);
+
+protected:
+    HWCLayer(int type, buffer_handle_t handle, int width, int height, int layer_flags);
+
+    hwc_rect_t visible_rect;
+};
+
+struct CompositionLayer : public HWCLayer
+{
+    CompositionLayer(int layer_flags);
+    CompositionLayer(NativeBuffer const&, int layer_flags);
+};
+
+struct FramebufferLayer : public HWCLayer
+{
+    FramebufferLayer();
+    FramebufferLayer(NativeBuffer const&);
+};
+
+class LayerList
+{
+public:
+    LayerList(std::initializer_list<HWCLayer> const& layers);
+
     hwc_display_contents_1_t* native_list() const;
+    void set_fb_target(std::shared_ptr<NativeBuffer> const&);
 
 private:
-    std::vector<std::shared_ptr<HWCDefaultLayer>> layer_list;
-    void update_list();
-
-    static size_t const fb_position = 0u;
     std::shared_ptr<hwc_display_contents_1_t> hwc_representation;
 };
 

=== modified file 'src/server/graphics/android/resource_factory.cpp'
--- src/server/graphics/android/resource_factory.cpp	2013-10-28 22:17:13 +0000
+++ src/server/graphics/android/resource_factory.cpp	2013-11-12 23:50:30 +0000
@@ -106,9 +106,8 @@
 std::shared_ptr<mga::DisplayDevice> mga::ResourceFactory::create_hwc11_device(
     std::shared_ptr<hwc_composer_device_1> const& hwc_native_device) const
 {
-    auto layer_list = std::make_shared<mga::LayerList>();
     auto syncer = std::make_shared<mga::HWCVsync>();
-    return std::make_shared<mga::HWC11Device>(hwc_native_device, layer_list, nullptr, syncer);
+    return std::make_shared<mga::HWC11Device>(hwc_native_device, syncer);
 }
 
 std::shared_ptr<mga::DisplayDevice> mga::ResourceFactory::create_hwc10_device(

=== modified file 'tests/unit-tests/graphics/android/test_hwc10_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc10_device.cpp	2013-10-25 16:39:50 +0000
+++ tests/unit-tests/graphics/android/test_hwc10_device.cpp	2013-11-12 23:50:30 +0000
@@ -86,14 +86,11 @@
     EXPECT_EQ(dpy, mock_device->display0_set_content.dpy);
     EXPECT_EQ(sur, mock_device->display0_set_content.sur);
     EXPECT_EQ(-1, mock_device->display0_set_content.retireFenceFd);
-    EXPECT_EQ(0u, mock_device->display0_set_content.flags);
-    EXPECT_EQ(0u, mock_device->display0_set_content.numHwLayers);
-
-    EXPECT_EQ(dpy, mock_device->display0_prepare_content.dpy);
-    EXPECT_EQ(sur, mock_device->display0_prepare_content.sur);
-    EXPECT_EQ(-1, mock_device->display0_prepare_content.retireFenceFd);
-    EXPECT_EQ(0u, mock_device->display0_prepare_content.flags);
-    EXPECT_EQ(0u, mock_device->display0_prepare_content.numHwLayers);
+    EXPECT_EQ(HWC_GEOMETRY_CHANGED, mock_device->display0_set_content.flags);
+    EXPECT_EQ(1u, mock_device->display0_set_content.numHwLayers);
+    ASSERT_NE(nullptr, mock_device->display0_set_content.hwLayers);
+    EXPECT_EQ(HWC_FRAMEBUFFER, mock_device->set_layerlist[0].compositionType);
+    EXPECT_EQ(HWC_SKIP_LAYER, mock_device->set_layerlist[0].flags);
 }
 
 TEST_F(HWC10Device, hwc10_commit_frame_async)

=== modified file 'tests/unit-tests/graphics/android/test_hwc11_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc11_device.cpp	2013-10-31 00:11:29 +0000
+++ tests/unit-tests/graphics/android/test_hwc11_device.cpp	2013-11-12 23:50:30 +0000
@@ -18,9 +18,7 @@
 
 #include "src/server/graphics/android/hwc11_device.h"
 #include "src/server/graphics/android/hwc_layerlist.h"
-#include "mir_test_doubles/mock_display_device.h"
 #include "mir_test_doubles/mock_hwc_composer_device_1.h"
-#include "mir_test_doubles/mock_hwc_layerlist.h"
 #include "mir_test_doubles/mock_buffer.h"
 #include "mir_test_doubles/mock_hwc_vsync_coordinator.h"
 #include "mir_test_doubles/mock_egl.h"
@@ -38,49 +36,27 @@
     virtual void SetUp()
     {
         mock_device = std::make_shared<testing::NiceMock<mtd::MockHWCComposerDevice1>>();
-        mock_display_device = std::make_shared<testing::NiceMock<mtd::MockDisplayDevice>>();
-        mock_hwc_layers = std::make_shared<testing::NiceMock<mtd::MockHWCLayerList>>();
         mock_vsync = std::make_shared<testing::NiceMock<mtd::MockVsyncCoordinator>>();
-        mock_egl.silence_uninteresting();
-
-        empty_list.numHwLayers = 0;
-        empty_list.retireFenceFd = -1;
-        ON_CALL(*mock_hwc_layers, native_list())
-            .WillByDefault(testing::Return(&empty_list));
     }
 
     std::shared_ptr<mtd::MockVsyncCoordinator> mock_vsync;
-    std::shared_ptr<mtd::MockHWCLayerList> mock_hwc_layers;
     std::shared_ptr<mtd::MockHWCComposerDevice1> mock_device;
-    std::shared_ptr<mtd::MockDisplayDevice> mock_display_device;
     EGLDisplay dpy;
     EGLSurface surf;
     testing::NiceMock<mtd::MockEGL> mock_egl;
-    hwc_display_contents_1_t empty_list;
-};
-
-namespace
-{
-struct HWCDummyLayer : public mga::HWCDefaultLayer
-{
-    HWCDummyLayer()
-     : HWCDefaultLayer({})
-    {
-    }
-};
-}
+};
 
 TEST_F(HWC11Device, test_hwc_gles_set_empty_layerlist)
 {
     using namespace testing;
 
-    mga::HWC11Device device(mock_device, mock_hwc_layers, mock_display_device, mock_vsync);
+    mga::HWC11Device device(mock_device, mock_vsync);
 
     EXPECT_CALL(*mock_device, set_interface(mock_device.get(), 1, _))
         .Times(1);
     device.commit_frame(dpy, surf);
 
-    EXPECT_EQ(empty_list.numHwLayers, mock_device->display0_set_content.numHwLayers);
+    EXPECT_EQ(1, mock_device->display0_set_content.numHwLayers);
     EXPECT_EQ(-1, mock_device->display0_set_content.retireFenceFd);
 }
 
@@ -88,7 +64,7 @@
 {
     using namespace testing;
 
-    mga::HWC11Device device(mock_device, mock_hwc_layers, mock_display_device, mock_vsync);
+    mga::HWC11Device device(mock_device, mock_vsync);
 
     EXPECT_CALL(*mock_device, set_interface(mock_device.get(), 1, _))
         .Times(1)
@@ -106,7 +82,7 @@
         .Times(1)
         .WillOnce(Return(EGL_FALSE));
 
-    mga::HWC11Device device(mock_device, mock_hwc_layers, mock_display_device, mock_vsync);
+    mga::HWC11Device device(mock_device, mock_vsync);
 
     EXPECT_THROW({
         device.commit_frame(dpy, surf);
@@ -117,13 +93,11 @@
 {
     using namespace testing;
 
-    mga::HWC11Device device(mock_device, mock_hwc_layers, mock_display_device, mock_vsync);
+    mga::HWC11Device device(mock_device, mock_vsync);
 
     //the order here is very important. eglSwapBuffers will alter the layerlist,
     //so it must come before assembling the data for set
     InSequence seq;
-    EXPECT_CALL(*mock_hwc_layers, native_list())
-        .Times(1);
     EXPECT_CALL(*mock_device, prepare_interface(mock_device.get(), 1, _))
         .Times(1);
     EXPECT_CALL(mock_egl, eglSwapBuffers(dpy,surf))
@@ -133,22 +107,12 @@
 
     device.commit_frame(dpy, surf);
 
-    EXPECT_EQ(empty_list.numHwLayers, mock_device->display0_prepare_content.numHwLayers);
+    EXPECT_EQ(1, mock_device->display0_prepare_content.numHwLayers);
     EXPECT_EQ(-1, mock_device->display0_prepare_content.retireFenceFd);
-    EXPECT_EQ(empty_list.numHwLayers, mock_device->display0_set_content.numHwLayers);
+    EXPECT_EQ(1, mock_device->display0_set_content.numHwLayers);
     EXPECT_EQ(-1, mock_device->display0_set_content.retireFenceFd);
 }
 
-TEST_F(HWC11Device, hwc_device_set_next_frontbuffer_adds_to_layerlist)
-{
-    std::shared_ptr<mg::Buffer> mock_buffer = std::make_shared<mtd::MockBuffer>();
-    EXPECT_CALL(*this->mock_hwc_layers, set_fb_target(mock_buffer))
-        .Times(1);
- 
-    mga::HWC11Device device(mock_device, mock_hwc_layers, mock_display_device, mock_vsync);
-    device.set_next_frontbuffer(mock_buffer);
-}
-
 TEST_F(HWC11Device, test_hwc_device_display_config)
 {
     using namespace testing;
@@ -158,7 +122,7 @@
         .Times(1)
         .WillOnce(DoAll(SetArgPointee<2>(hwc_configs), Return(0)));
 
-    mga::HWC11Device device(mock_device, mock_hwc_layers, mock_display_device, mock_vsync);
+    mga::HWC11Device device(mock_device, mock_vsync);
 }
 
 
@@ -172,7 +136,7 @@
         .WillOnce(Return(-1));
 
     EXPECT_THROW({
-        mga::HWC11Device device(mock_device, mock_hwc_layers, mock_display_device, mock_vsync);
+        mga::HWC11Device device(mock_device, mock_vsync);
     }, std::runtime_error);
 }
 
@@ -206,7 +170,7 @@
         .Times(1)
         .WillOnce(Invoke(display_attribute_handler));
 
-    mga::HWC11Device device(mock_device, mock_hwc_layers, mock_display_device, mock_vsync);
+    mga::HWC11Device device(mock_device, mock_vsync);
  
     auto size = device.display_size();
     EXPECT_EQ(size.width.as_uint32_t(),  static_cast<unsigned int>(display_width));
@@ -215,7 +179,7 @@
 
 TEST_F(HWC11Device, hwc_device_reports_2_fbs_available_by_default)
 {
-    mga::HWC11Device device(mock_device, mock_hwc_layers, mock_display_device, mock_vsync);
+    mga::HWC11Device device(mock_device, mock_vsync);
     EXPECT_EQ(2u, device.number_of_framebuffers_available());
 }
 
@@ -249,7 +213,7 @@
     EXPECT_CALL(mock_egl, eglTerminate(fake_display))
         .InSequence(seq);
  
-    mga::HWC11Device device(mock_device, mock_hwc_layers, mock_display_device, mock_vsync);
+    mga::HWC11Device device(mock_device, mock_vsync);
     EXPECT_EQ(geom::PixelFormat::argb_8888, device.display_format());
 }
 
@@ -272,6 +236,6 @@
     EXPECT_CALL(mock_egl, eglTerminate(fake_display))
         .InSequence(seq);
     
-    mga::HWC11Device device(mock_device, mock_hwc_layers, mock_display_device, mock_vsync);
+    mga::HWC11Device device(mock_device, mock_vsync);
     EXPECT_EQ(geom::PixelFormat::abgr_8888, device.display_format());
 }

=== modified file 'tests/unit-tests/graphics/android/test_hwc_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc_device.cpp	2013-10-31 17:03:59 +0000
+++ tests/unit-tests/graphics/android/test_hwc_device.cpp	2013-11-12 23:50:30 +0000
@@ -21,7 +21,6 @@
 #include "src/server/graphics/android/hwc_layerlist.h"
 #include "src/server/graphics/android/hwc_vsync_coordinator.h"
 #include "mir_test_doubles/mock_hwc_composer_device_1.h"
-#include "mir_test_doubles/mock_hwc_layerlist.h"
 #include "mir_test_doubles/mock_hwc_vsync_coordinator.h"
 #include "mir_test_doubles/mock_buffer.h"
 #include "mir_test_doubles/mock_egl.h"
@@ -39,14 +38,12 @@
 
 template<class T>
 std::shared_ptr<mga::HWCCommonDevice> make_hwc_device(std::shared_ptr<hwc_composer_device_1> const& hwc_device,
-                                                std::shared_ptr<mga::HWCLayerList> const& layer_list,
                                                 std::shared_ptr<mga::DisplayDevice> const& fbdev,
                                                 std::shared_ptr<mga::HWCVsyncCoordinator> const& coordinator);
 
 template <>
 std::shared_ptr<mga::HWCCommonDevice> make_hwc_device<mga::HWC10Device>(
                                                 std::shared_ptr<hwc_composer_device_1> const& hwc_device,
-                                                std::shared_ptr<mga::HWCLayerList> const&, 
                                                 std::shared_ptr<mga::DisplayDevice> const& fbdev,
                                                 std::shared_ptr<mga::HWCVsyncCoordinator> const& coordinator)
 {
@@ -56,23 +53,10 @@
 template <>
 std::shared_ptr<mga::HWCCommonDevice> make_hwc_device<mga::HWC11Device>(
                                                 std::shared_ptr<hwc_composer_device_1> const& hwc_device,
-                                                std::shared_ptr<mga::HWCLayerList> const& layer_list,
-                                                std::shared_ptr<mga::DisplayDevice> const& fbdev,
+                                                std::shared_ptr<mga::DisplayDevice> const&,
                                                 std::shared_ptr<mga::HWCVsyncCoordinator> const& coordinator)
 {
-    return std::make_shared<mga::HWC11Device>(hwc_device, layer_list, fbdev, coordinator);
-}
-
-namespace
-{
-struct HWCDummyLayer : public mga::HWCDefaultLayer
-{
-    HWCDummyLayer()
-     : HWCDefaultLayer({})
-    {
-    }
-};
-
+    return std::make_shared<mga::HWC11Device>(hwc_device, coordinator);
 }
 
 template<typename T>
@@ -84,14 +68,12 @@
         using namespace testing;
 
         mock_device = std::make_shared<testing::NiceMock<mtd::MockHWCComposerDevice1>>();
-        mock_layer_list = std::make_shared<testing::NiceMock<mtd::MockHWCLayerList>>();
         mock_fbdev = std::make_shared<testing::NiceMock<mtd::MockDisplayDevice>>();
         mock_vsync = std::make_shared<testing::NiceMock<mtd::MockVsyncCoordinator>>();
     }
 
     testing::NiceMock<mtd::MockEGL> mock_egl;
     std::shared_ptr<mtd::MockVsyncCoordinator> mock_vsync;
-    std::shared_ptr<mtd::MockHWCLayerList> mock_layer_list;
     std::shared_ptr<mtd::MockHWCComposerDevice1> mock_device;
     std::shared_ptr<mtd::MockDisplayDevice> mock_fbdev;
 };
@@ -108,8 +90,7 @@
         .Times(1)
         .WillOnce(SaveArg<1>(&procs));
 
-    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,
-                                             this->mock_fbdev, this->mock_vsync);
+    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
 
     EXPECT_NE(nullptr, procs->invalidate);
     EXPECT_NE(nullptr, procs->vsync);
@@ -127,8 +108,7 @@
         .Times(1)
         .WillOnce(Return(0));
 
-    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,
-                                             this->mock_fbdev, this->mock_vsync);
+    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
     testing::Mock::VerifyAndClearExpectations(this->mock_device.get());
 }
 
@@ -140,9 +120,9 @@
         .WillRepeatedly(Return(-EINVAL));
 
 
-    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,
-                                             this->mock_fbdev, this->mock_vsync);
+    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
     EXPECT_THROW({
+        auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
         device->mode(mir_power_mode_off);
     }, std::runtime_error);
 }
@@ -156,8 +136,7 @@
     EXPECT_CALL(*this->mock_device, blank_interface(this->mock_device.get(), HWC_DISPLAY_PRIMARY, 0))
         .Times(1);
 
-    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,
-                                             this->mock_fbdev, this->mock_vsync);
+    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
     testing::Mock::VerifyAndClearExpectations(this->mock_device.get());
 }
 
@@ -174,8 +153,7 @@
         .WillOnce(Return(-1))
         .WillOnce(Return(0));
 
-    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,
-                                             this->mock_fbdev, this->mock_vsync);
+    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
     EXPECT_THROW({
         device->mode(mir_power_mode_off);
     }, std::runtime_error);
@@ -192,8 +170,7 @@
         .Times(3)
         .WillRepeatedly(Return(0));
 
-    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,
-                                             this->mock_fbdev, this->mock_vsync);
+    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
     device->mode(mir_power_mode_off);
     device->mode(mir_power_mode_on);
     device->mode(mir_power_mode_suspend);
@@ -218,8 +195,7 @@
         .Times(1)
         .WillOnce(Return(0));
 
-    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,
-                                             this->mock_fbdev, this->mock_vsync);
+    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
     device->mode(mir_power_mode_off);
 }
 
@@ -239,15 +215,13 @@
         .Times(1)
         .WillOnce(Return(0));
 
-    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,
-                                             this->mock_fbdev, this->mock_vsync);
+    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
     device->mode(mir_power_mode_on);
 }
 
 TYPED_TEST(HWCCommon, test_hwc_display_is_deactivated_on_destroy)
 {
-    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,
-                                             this->mock_fbdev, this->mock_vsync);
+    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
 
     EXPECT_CALL(*this->mock_device, blank_interface(this->mock_device.get(), HWC_DISPLAY_PRIMARY, 1))
         .Times(1);
@@ -265,8 +239,7 @@
         .Times(1)
         .WillOnce(SaveArg<1>(&procs));
 
-    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_layer_list,
-                                             this->mock_fbdev, this->mock_vsync);
+    auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
 
     EXPECT_CALL(*this->mock_vsync, notify_vsync())
         .Times(1);

=== modified file 'tests/unit-tests/graphics/android/test_hwc_layerlist.cpp'
--- tests/unit-tests/graphics/android/test_hwc_layerlist.cpp	2013-10-15 08:53:10 +0000
+++ tests/unit-tests/graphics/android/test_hwc_layerlist.cpp	2013-11-12 23:50:30 +0000
@@ -36,140 +36,24 @@
 
         width = 432; 
         height = 876; 
-        default_size = geom::Size{width, height};
-
         native_handle_1 = std::make_shared<mtd::StubAndroidNativeBuffer>();
+        native_handle_1->anwb()->width = width;
+        native_handle_1->anwb()->height = height;
         native_handle_2 = std::make_shared<mtd::StubAndroidNativeBuffer>();
-
-        mock_buffer = std::make_shared<NiceMock<mtd::MockBuffer>>();
-        ON_CALL(*mock_buffer, native_buffer_handle())
-            .WillByDefault(Return(native_handle_1));
-        ON_CALL(*mock_buffer, size())
-            .WillByDefault(Return(default_size));
     }
 
     int width; 
     int height; 
-    geom::Size default_size;
-
     std::shared_ptr<mg::NativeBuffer> native_handle_1;
     std::shared_ptr<mg::NativeBuffer> native_handle_2;
-    std::shared_ptr<mtd::MockBuffer> mock_buffer;
 };
 
-TEST(HWCLayerDeepCopy, hwc_layer)
-{
-    mga::HWCDefaultLayer original({});
-    hwc_layer_1 layer = original;
-    EXPECT_EQ(0u, layer.visibleRegionScreen.numRects); 
-    EXPECT_EQ(nullptr, layer.visibleRegionScreen.rects);
-
-    geom::Rectangle r0{geom::Point{geom::X{0},geom::Y{1}},
-                       geom::Size{2, 3}};
-    geom::Rectangle r1{geom::Point{geom::X{0},geom::Y{1}},
-                       geom::Size{3, 3}};
-    geom::Rectangle r2{geom::Point{geom::X{1},geom::Y{1}},
-                       geom::Size{2, 3}};
-    mga::HWCRect a(r0), b(r1), c(r2);
-    mga::HWCDefaultLayer original2({a, b, c});
-    layer = original2;
-
-    ASSERT_EQ(3u, layer.visibleRegionScreen.numRects);
-    ASSERT_NE(nullptr, layer.visibleRegionScreen.rects);
-    EXPECT_THAT(a, HWCRectMatchesRect(layer.visibleRegionScreen.rects[0],""));
-    EXPECT_THAT(b, HWCRectMatchesRect(layer.visibleRegionScreen.rects[1],""));
-    EXPECT_THAT(c, HWCRectMatchesRect(layer.visibleRegionScreen.rects[2],""));
-}
-
-TEST_F(HWCLayerListTest, hwc_list_creation_loads_latest_fb_target)
-{
-    using namespace testing;
-   
-    hwc_rect_t expected_sc, expected_df, expected_visible;
-    expected_sc = {0, 0, width, height};
-    expected_df = expected_visible = expected_sc;
-    EXPECT_CALL(*mock_buffer, size())
-        .Times(1)
-        .WillOnce(Return(default_size));
-
-    mga::LayerList layerlist;
-    layerlist.set_fb_target(mock_buffer);
-
-    auto list = layerlist.native_list(); 
-    ASSERT_EQ(1u, list->numHwLayers);
-    hwc_layer_1 target_layer = list->hwLayers[0];
-    EXPECT_THAT(target_layer.sourceCrop, MatchesRect( expected_sc, "sourceCrop"));
-    EXPECT_THAT(target_layer.displayFrame, MatchesRect( expected_df, "displayFrame"));
-
-    ASSERT_EQ(1u, target_layer.visibleRegionScreen.numRects); 
-    ASSERT_NE(nullptr, target_layer.visibleRegionScreen.rects); 
-    EXPECT_THAT(target_layer.visibleRegionScreen.rects[0], MatchesRect( expected_visible, "visible"));
-}
-
-TEST_F(HWCLayerListTest, fb_target)
-{
-    using namespace testing;
-
-    mga::LayerList layerlist;
-
-    auto list = layerlist.native_list(); 
-    ASSERT_EQ(1u, list->numHwLayers);
-    hwc_layer_1 target_layer = list->hwLayers[0];
-    EXPECT_EQ(nullptr, target_layer.handle); 
-}
-
-TEST_F(HWCLayerListTest, set_fb_target_gets_fb_handle)
-{
-    using namespace testing;
-
-    mga::LayerList layerlist;
-
-    EXPECT_CALL(*mock_buffer, native_buffer_handle())
-        .Times(1)
-        .WillOnce(Return(native_handle_1));
-
-    layerlist.set_fb_target(mock_buffer);
-    auto list = layerlist.native_list(); 
-    ASSERT_EQ(1u, list->numHwLayers);
-    hwc_layer_1 target_layer = list->hwLayers[0]; 
-    EXPECT_EQ(native_handle_1->handle(), target_layer.handle); 
-}
-
-TEST_F(HWCLayerListTest, set_fb_target_2x)
-{
-    using namespace testing;
-
-    mga::LayerList layerlist;
-
-    EXPECT_CALL(*mock_buffer, native_buffer_handle())
-        .Times(2)
-        .WillOnce(Return(native_handle_1))
-        .WillOnce(Return(native_handle_2));
-
-    layerlist.set_fb_target(mock_buffer);
-    auto list = layerlist.native_list(); 
-    ASSERT_EQ(1u, list->numHwLayers);
-    hwc_layer_1 target_layer = list->hwLayers[0]; 
-    EXPECT_EQ(native_handle_1->handle(), target_layer.handle); 
-
-    layerlist.set_fb_target(mock_buffer);
-    auto list_second = layerlist.native_list();
-    ASSERT_EQ(1u, list_second->numHwLayers);
-    target_layer = list_second->hwLayers[0]; 
-    EXPECT_EQ(native_handle_2->handle(), target_layer.handle); 
-}
-
-TEST_F(HWCLayerListTest, set_fb_target_programs_other_struct_members_correctly)
-{
-    using namespace testing;
-
-    mga::LayerList layerlist;
-    layerlist.set_fb_target(mock_buffer);
-
-    hwc_rect_t source_region = {0,0,width, height};
-    hwc_rect_t target_region = source_region;
-    hwc_region_t region {1, nullptr};
-
+TEST_F(HWCLayerListTest, fb_target_layer)
+{
+    mga::FramebufferLayer target_layer(*native_handle_1);
+
+    hwc_rect_t region = {0,0,width, height};
+    hwc_region_t visible_region {1, &region};
     hwc_layer_1 expected_layer;
     expected_layer.compositionType = HWC_FRAMEBUFFER_TARGET;
     expected_layer.hints = 0;
@@ -177,14 +61,91 @@
     expected_layer.handle = native_handle_1->handle();
     expected_layer.transform = 0;
     expected_layer.blending = HWC_BLENDING_NONE;
-    expected_layer.sourceCrop = source_region;
-    expected_layer.displayFrame = target_region; 
-    expected_layer.visibleRegionScreen = region;  
-    expected_layer.acquireFenceFd = -1;
-    expected_layer.releaseFenceFd = -1;
-
-    auto list = layerlist.native_list(); 
-    ASSERT_EQ(1u, list->numHwLayers);
-    hwc_layer_1 target_layer = list->hwLayers[0]; 
-    EXPECT_THAT(target_layer, MatchesLayer( expected_layer ));
+    expected_layer.sourceCrop = region;
+    expected_layer.displayFrame = region; 
+    expected_layer.visibleRegionScreen = visible_region;  
+    expected_layer.acquireFenceFd = -1;
+    expected_layer.releaseFenceFd = -1;
+
+    EXPECT_THAT(target_layer, MatchesLayer(expected_layer));
+}
+
+TEST_F(HWCLayerListTest, gl_target_layer_with_force_gl)
+{
+    mga::CompositionLayer target_layer(*native_handle_1, HWC_SKIP_LAYER);
+
+    hwc_rect_t region = {0,0,width, height};
+    hwc_region_t visible_region {1, &region};
+    hwc_layer_1 expected_layer;
+    expected_layer.compositionType = HWC_FRAMEBUFFER;
+    expected_layer.hints = 0;
+    expected_layer.flags = HWC_SKIP_LAYER;
+    expected_layer.handle = native_handle_1->handle();
+    expected_layer.transform = 0;
+    expected_layer.blending = HWC_BLENDING_NONE;
+    expected_layer.sourceCrop = region;
+    expected_layer.displayFrame = region; 
+    expected_layer.visibleRegionScreen = visible_region;  
+    expected_layer.acquireFenceFd = -1;
+    expected_layer.releaseFenceFd = -1;
+
+    EXPECT_THAT(target_layer, MatchesLayer(expected_layer));
+}
+
+TEST_F(HWCLayerListTest, gl_target_layer_without_skip)
+{
+    mga::CompositionLayer target_layer(*native_handle_1, 0);
+
+    hwc_rect_t region = {0,0,width, height};
+    hwc_region_t visible_region {1, &region};
+    hwc_layer_1 expected_layer;
+    expected_layer.compositionType = HWC_FRAMEBUFFER;
+    expected_layer.hints = 0;
+    expected_layer.flags = 0;
+    expected_layer.handle = native_handle_1->handle();
+    expected_layer.transform = 0;
+    expected_layer.blending = HWC_BLENDING_NONE;
+    expected_layer.sourceCrop = region;
+    expected_layer.displayFrame = region; 
+    expected_layer.visibleRegionScreen = visible_region;  
+    expected_layer.acquireFenceFd = -1;
+    expected_layer.releaseFenceFd = -1;
+
+    EXPECT_THAT(target_layer, MatchesLayer(expected_layer));
+}
+
+TEST_F(HWCLayerListTest, hwc_list_creation)
+{
+    using namespace testing;
+    
+    mga::CompositionLayer surface_layer(*native_handle_1, 0);
+    mga::FramebufferLayer target_layer(*native_handle_1);
+    mga::LayerList layerlist({
+        surface_layer,
+        target_layer});
+
+    auto list = layerlist.native_list(); 
+    EXPECT_EQ(-1, list->retireFenceFd);
+    EXPECT_EQ(HWC_GEOMETRY_CHANGED, list->flags); 
+    /* note, mali hwc1.1 actually falsely returns if these are not set to something. set to garbage */ 
+    EXPECT_NE(nullptr, list->dpy);
+    EXPECT_NE(nullptr, list->sur);
+
+    ASSERT_EQ(2u, list->numHwLayers);
+    EXPECT_THAT(surface_layer, MatchesLayer(list->hwLayers[0]));
+    EXPECT_THAT(target_layer, MatchesLayer(list->hwLayers[1]));
+}
+
+TEST_F(HWCLayerListTest, hwc_list_update)
+{
+    using namespace testing;
+    mga::LayerList layerlist({
+        mga::CompositionLayer(*native_handle_1, 0),
+        mga::FramebufferLayer(*native_handle_1)});
+    layerlist.set_fb_target(native_handle_2);
+
+    auto list = layerlist.native_list(); 
+    ASSERT_EQ(2u, list->numHwLayers);
+    EXPECT_EQ(list->hwLayers[0].handle, native_handle_1->handle());
+    EXPECT_EQ(list->hwLayers[1].handle, native_handle_2->handle());
 }