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

Commit 20bd3362 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 672ea584: Merge "fix [2420565] Surface.lockCanvas() updates the dirty... 

am 672ea584: Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken
parents c15936c7 83e08455

libs/surfaceflinger_client/Surface.cpp

+14 −11
Original line number Diff line number Diff line
@@ -495,9 +495,12 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer) 
    // below we make sure we AT LEAST have the usage flags we want

    const uint32_t usage(getUsage());

    const sp<GraphicBuffer>& backBuffer(mBuffers[bufIdx]);



    // Always call needNewBuffer(), since it clears the needed buffers flags

    bool needNewBuffer = mSharedBufferClient->needNewBuffer(bufIdx);

    if (backBuffer == 0 || 

        ((uint32_t(backBuffer->usage) & usage) != usage) ||

        mSharedBufferClient->needNewBuffer(bufIdx)) 

        needNewBuffer)

    {

        err = getBufferLocked(bufIdx, usage);

        LOGE_IF(err, "getBufferLocked(%ld, %08x) failed (%s)",
@@ -717,16 +720,17 @@ status_t Surface::lock(SurfaceInfo* other, Region* dirtyIn, bool blocking) 
            Region scratch(bounds);

            Region& newDirtyRegion(dirtyIn ? *dirtyIn : scratch);



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

            if (mNeedFullUpdate) {

                // reset newDirtyRegion to bounds when a buffer is reallocated

                // it would be better if this information was associated with

                // the buffer and made available to outside of Surface.

                // This will do for now though.

                mNeedFullUpdate = false;

                Region uninitialized(bounds);

                uninitialized.subtractSelf(copyback | newDirtyRegion);

                // reset newDirtyRegion to bounds when a buffer is reallocated

                // and we have nothing to copy back to it

                if (!uninitialized.isEmpty())

                    newDirtyRegion.set(bounds);

            } else {

                newDirtyRegion.andSelf(bounds);

            }

            newDirtyRegion.andSelf(bounds);



            const sp<GraphicBuffer>& frontBuffer(mPostedBuffer);

            if (frontBuffer != 0 &&
@@ -734,8 +738,7 @@ status_t Surface::lock(SurfaceInfo* other, Region* dirtyIn, bool blocking) 
                backBuffer->height == frontBuffer->height &&

                !(mFlags & ISurfaceComposer::eDestroyBackbuffer)) 

            {

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

                if (!copyback.isEmpty() && frontBuffer!=0) {

                if (!copyback.isEmpty()) {

                    // copy front to back

                    copyBlt(backBuffer, frontBuffer, copyback);

                }