~raof/mir/blowup-eventhub

Viewing changes to src/platform/graphics/android/hwc_layerlist.h

Committer: Tarmac
Author(s): Kevin DuBois
Date: 2014-01-29 00:49:23 UTC
mfrom: (1329.1.42 renderable)
Revision ID: tarmac-20140129004923-a52iu4phmbzmv9ot

android: split out HWC layers into their own file and add a mga::CompositionLayer type that depends on the interface mg::Renderable.

Approved by Andreas Pokorny, Alan Griffiths, PS Jenkins bot.

files added:
include/test/mir_test_doubles/mock_renderable.h

include/test/mir_test_doubles/stub_renderable.h

src/platform/graphics/android/hwc_layers.cpp

src/platform/graphics/android/hwc_layers.h

tests/unit-tests/graphics/android/hwc_struct_helpers.cpp

tests/unit-tests/graphics/android/test_hwc_layers.cpp

files renamed:
tests/unit-tests/graphics/android/hwc_struct_helper-inl.h => tests/unit-tests/graphics/android/hwc_struct_helpers.h

files modified:
include/platform/mir/graphics/display_buffer.h

include/platform/mir/graphics/renderable.h

include/test/mir_test_doubles/mock_android_native_buffer.h

include/test/mir_test_doubles/mock_display_buffer.h

include/test/mir_test_doubles/mock_display_device.h

include/test/mir_test_doubles/null_display_buffer.h

include/test/mir_test_doubles/stub_display_device.h

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/android/display_buffer.cpp

src/platform/graphics/android/display_buffer.h

src/platform/graphics/android/display_device.h

src/platform/graphics/android/fb_device.cpp

src/platform/graphics/android/fb_device.h

src/platform/graphics/android/hwc_device.cpp

src/platform/graphics/android/hwc_device.h

src/platform/graphics/android/hwc_fb_device.cpp

src/platform/graphics/android/hwc_fb_device.h

src/platform/graphics/android/hwc_layerlist.cpp

src/platform/graphics/android/hwc_layerlist.h

src/platform/graphics/mesa/display_buffer.cpp

src/platform/graphics/mesa/display_buffer.h

src/server/graphics/nested/nested_output.cpp

src/server/graphics/nested/nested_output.h

src/server/graphics/offscreen/display_buffer.cpp

src/server/graphics/offscreen/display_buffer.h

tests/unit-tests/graphics/android/CMakeLists.txt

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_hwc_display.cpp

tests/unit-tests/graphics/android/test_hwc_fb_device.cpp

tests/unit-tests/graphics/android/test_hwc_layerlist.cpp

Show diffs side-by-side

added added

removed removed

src/platform/graphics/android/hwc_layerlist.h

#include "mir/graphics/android/fence.h"

#include "mir/geometry/rectangle.h"

#include "hwc_layers.h"

#include <hardware/hwcomposer.h>

#include <memory>

#include <vector>

namespace android

{

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:

Older »