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

Commit 2aa1da58 authored by Steve Kondik's avatar Steve Kondik
Browse files

Revert swaprect feature for new upstream implementation. 

Revert "Display: Define new composition type for blit composition"

This reverts commit 835f0ad6.

Revert "surfaceflinger: Conditional compilation for swaprect feature"

This reverts commit 5e9e33ac.

Conflicts:
	services/surfaceflinger/DisplayHardware/HWComposer.h

Change-Id: I83e3b5a66b9ea7c3bae008d6a7e84c1358c512bc

Revert "SF: Add flag for swaprect status in HAL"

This reverts commit 4fd75c0a.

Conflicts:
	services/surfaceflinger/DisplayHardware/HWComposer.cpp

Change-Id: Ibd8714a49e09653bf34da466db17fbe4b20c6c8d

Revert "sf: Enable swaprect optimization by default only on QCOMs"

This reverts commit 0438f810.

Revert "Display: Add swaprect feature for MDP composition."

This reverts commit 9b5ef379.

Conflicts:
	include/gui/Surface.h

Change-Id: I6d276ee82f8f0b4214e79c91cd9675fcbfd57dd4
parent ad12007d

include/gui/BufferQueue.h

+1 −26
Original line number Diff line number Diff line
@@ -207,23 +207,6 @@ public: 
    // connected to the specified producer API.

    virtual status_t disconnect(int api);



    // Since there can be multiple buffers for a layer, we need to store

    // dirty region for all of them.

    // updateDirtyRegion is used to update the dirty region passed from

    // HW renderer for a layer on it's respective buffer index.

    // Here first argument is the buffer index and left, top, right, bottom

    // are parameters of dirty rectangle.

    virtual status_t updateDirtyRegion(int bufferidx, int left, int top,

                                       int right, int bottom);



    // setCurrentDirtyRegion is used to set the layer's dirty region

    // for it's buffer index which is currently in use.

    virtual status_t setCurrentDirtyRegion(int bufferidx);



    // getCurrentDirtyRegion is used for retrieving the layer's dirty region

    // for it's buffer index which is currently in use.

    virtual status_t getCurrentDirtyRegion(Rect& dirtyRect);



    // setBufferSize enables us to specify user defined sizes for the buffers

    // that need to be allocated by surfaceflinger for its client. This is

    // useful for cases where the client doesn't want the gralloc to calculate
@@ -590,14 +573,6 @@ private: 


    // mConnectedProducerToken is used to set a binder death notification on the producer

    sp<IBinder> mConnectedProducerToken;



   // mDirtyRegion is used to store dirty region for a layer

   // on it's respective buffer index

   mutable Rect mDirtyRegion[BufferQueue::NUM_BUFFER_SLOTS];



   // mCurrentDirtyRegion is used to store the layer's dirty region

   // for it's buffer index which currently in use

   Rect mCurrentDirtyRegion;

};



// ----------------------------------------------------------------------------

include/gui/GLConsumer.h

+0 −2
Original line number Diff line number Diff line
@@ -171,8 +171,6 @@ public: 


    // getCurrentCrop returns the cropping rectangle of the current buffer.

    Rect getCurrentCrop() const;

    // getDirtyRegion gives the dirty rect to associated buffer for a layer.

    void getDirtyRegion(Rect& dirtyRect);



    // getCurrentTransform returns the transform of the current buffer.

    uint32_t getCurrentTransform() const;

include/gui/IGraphicBufferConsumer.h

+0 −3
Original line number Diff line number Diff line
@@ -199,9 +199,6 @@ public: 
    // dump state into a string

    virtual void dump(String8& result, const char* prefix) const = 0;



    // swap rect APIs to set/get dirty rect for associated layer buffer.

    virtual status_t setCurrentDirtyRegion(int bufferidx) = 0;

    virtual status_t getCurrentDirtyRegion(Rect&  dirtyRect) =0;

public:

    DECLARE_META_INTERFACE(GraphicBufferConsumer);

};

include/gui/IGraphicBufferProducer.h

+0 −6
Original line number Diff line number Diff line
@@ -58,12 +58,6 @@ public: 
        RELEASE_ALL_BUFFERS       = 0x2,

    };



    // updateDirtyRegion gets called from hardware renderer when there

    // is a change in the dirty rect for a layer. It sets the dirty

    // rect for corresponding layer buffer.

    virtual status_t updateDirtyRegion(int bufferidx, int l, int t,

                                       int r, int b) = 0;



    // requestBuffer requests a new buffer for the given index. The server (i.e.

    // the IGraphicBufferProducer implementation) assigns the newly created

    // buffer to the given slot index, and the client is expected to mirror the

include/gui/Surface.h

+0 −5
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ public: 
        return surface != NULL && surface->getIGraphicBufferProducer() != NULL;

    }



    status_t setDirtyRegion(Region* dirty = NULL);



protected:

    virtual ~Surface();
@@ -266,9 +264,6 @@ private: 
#ifdef SURFACE_SKIP_FIRST_DEQUEUE

    bool                        mDequeuedOnce;

#endif



    // mDequeueIdx will be used to store the current buffer index for a layer.

    int mDequeueIdx;

};



}; // namespace android