Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e895863c authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge changes I96f8ad86,I84dcd82e,Ifcece69f 

* changes:
  SurfaceFlinger and libgui: Support for child layers.
  SurfaceFlinger: Use traversal functions to iterate LayerList.
  SurfaceFlinger and libgui: Switch Z-order to signed type.
parents 2a03c32a 1f0a16a5

include/gui/ISurfaceComposer.h

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public: 
    virtual status_t captureScreen(const sp<IBinder>& display,

            const sp<IGraphicBufferProducer>& producer,

            Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight,

            uint32_t minLayerZ, uint32_t maxLayerZ,

            int32_t minLayerZ, int32_t maxLayerZ,

            bool useIdentityTransform,

            Rotation rotation = eRotateNone) = 0;

include/gui/ISurfaceComposerClient.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public: 
    virtual status_t createSurface(

            const String8& name, uint32_t w, uint32_t h,

            PixelFormat format, uint32_t flags,

            const sp<IBinder>& parent,

            sp<IBinder>* handle,

            sp<IGraphicBufferProducer>* gbp) = 0;

include/gui/SurfaceComposerClient.h

+7 −6
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ public: 
            uint32_t w,         // width in pixel

            uint32_t h,         // height in pixel

            PixelFormat format, // pixel-format desired

            uint32_t flags = 0  // usage flags

            uint32_t flags = 0,  // usage flags

            SurfaceControl* parent = nullptr // parent

    );



    //! Create a virtual display
@@ -142,7 +143,7 @@ public: 
    status_t    show(const sp<IBinder>& id);

    status_t    setFlags(const sp<IBinder>& id, uint32_t flags, uint32_t mask);

    status_t    setTransparentRegionHint(const sp<IBinder>& id, const Region& transparent);

    status_t    setLayer(const sp<IBinder>& id, uint32_t layer);

    status_t    setLayer(const sp<IBinder>& id, int32_t layer);

    status_t    setLayerInfo(const sp<IBinder>& id, uint32_t type, uint32_t appid);

    status_t    setAlpha(const sp<IBinder>& id, float alpha=1.0f);

    status_t    setMatrix(const sp<IBinder>& id, float dsdx, float dtdx, float dsdy, float dtdy);
@@ -213,12 +214,12 @@ public: 
            const sp<IBinder>& display,

            const sp<IGraphicBufferProducer>& producer,

            Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight,

            uint32_t minLayerZ, uint32_t maxLayerZ,

            int32_t minLayerZ, int32_t maxLayerZ,

            bool useIdentityTransform);

    static status_t captureToBuffer(

            const sp<IBinder>& display,

            Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight,

            uint32_t minLayerZ, uint32_t maxLayerZ,

            int32_t minLayerZ, int32_t maxLayerZ,

            bool useIdentityTransform,

            uint32_t rotation,

            sp<GraphicBuffer>* outbuffer);
@@ -242,11 +243,11 @@ public: 
            bool useIdentityTransform);

    status_t update(const sp<IBinder>& display,

            Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight,

            uint32_t minLayerZ, uint32_t maxLayerZ,

            int32_t minLayerZ, int32_t maxLayerZ,

            bool useIdentityTransform);

    status_t update(const sp<IBinder>& display,

            Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight,

            uint32_t minLayerZ, uint32_t maxLayerZ,

            int32_t minLayerZ, int32_t maxLayerZ,

            bool useIdentityTransform, uint32_t rotation);



    sp<CpuConsumer> getCpuConsumer() const;

include/gui/SurfaceControl.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public: 
    void        disconnect();



    status_t    setLayerStack(uint32_t layerStack);

    status_t    setLayer(uint32_t layer);

    status_t    setLayer(int32_t layer);

    status_t    setLayerInfo(uint32_t type, uint32_t appid);

    status_t    setPosition(float x, float y);

    status_t    setSize(uint32_t w, uint32_t h);

include/private/gui/LayerState.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct layer_state_t { 
            uint32_t        what;

            float           x;

            float           y;

            uint32_t        z;

            int32_t         z;

            uint32_t        w;

            uint32_t        h;

            uint32_t        layerStack;