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

Commit 38deda9d authored by Omprakash Dhyade's avatar Omprakash Dhyade Committed by Steve Kondik
Browse files

frameworks/native: fix copy back dirty region 

Copyback dirty region logic does copyback,
even when its not necessary causing 2ms delay.
Fix the logic to copy back only what is necessary.

Change-Id: I52de68258ac9f87d704ee5401f93417805fa6773
parent 2025c368

libs/gui/Surface.cpp

+9 −10
Original line number Diff line number Diff line
@@ -801,6 +801,7 @@ status_t Surface::lock( 
        }



        // figure out if we can copy the frontbuffer back

        int backBufferSlot(getSlotFromBufferLocked(backBuffer.get()));

        const sp<GraphicBuffer>& frontBuffer(mPostedBuffer);

        const bool canCopyBack = (frontBuffer != 0 &&

                backBuffer->width  == frontBuffer->width &&
@@ -808,15 +809,19 @@ status_t Surface::lock( 
                backBuffer->format == frontBuffer->format);



        if (canCopyBack) {

            // copy the area that is invalid and not repainted this round

            const Region copyback(mDirtyRegion.subtract(newDirtyRegion));

            Mutex::Autolock lock(mMutex);

            Region oldDirtyRegion;

            for(int i = 0 ; i < NUM_BUFFER_SLOTS; i++ ) {

                if(i != backBufferSlot && !mSlots[i].dirtyRegion.isEmpty())

                    oldDirtyRegion.orSelf(mSlots[i].dirtyRegion);

            }

            const Region copyback(oldDirtyRegion.subtract(newDirtyRegion));

            if (!copyback.isEmpty())

                copyBlt(backBuffer, frontBuffer, copyback);

        } else {

            // if we can't copy-back anything, modify the user's dirty

            // region to make sure they redraw the whole buffer

            newDirtyRegion.set(bounds);

            mDirtyRegion.clear();

            Mutex::Autolock lock(mMutex);

            for (size_t i=0 ; i<NUM_BUFFER_SLOTS ; i++) {

                mSlots[i].dirtyRegion.clear();
@@ -826,15 +831,9 @@ status_t Surface::lock( 


        { // scope for the lock

            Mutex::Autolock lock(mMutex);

            int backBufferSlot(getSlotFromBufferLocked(backBuffer.get()));

            if (backBufferSlot >= 0) {

                Region& dirtyRegion(mSlots[backBufferSlot].dirtyRegion);

                mDirtyRegion.subtract(dirtyRegion);

                dirtyRegion = newDirtyRegion;

            }

            mSlots[backBufferSlot].dirtyRegion = newDirtyRegion;

        }



        mDirtyRegion.orSelf(newDirtyRegion);

        if (inOutDirtyBounds) {

            *inOutDirtyBounds = newDirtyRegion.getBounds();

        }