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

Commit 351a513b authored by Jamie Gennis's avatar Jamie Gennis
Browse files

(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip 

This change fixes an issue where Layer::isOpaque was being called in
lockPageFlip to get the opaqueness for the new buffer before
mActiveBuffer was updated.

Bug: 5321313
Change-Id: Ibb5d7d3f4e9a2b1448e117a484a0d9f9ca5fc9de
parent caf953f0

services/surfaceflinger/Layer.cpp

+10 −10
Original line number Original line Diff line number Diff line
@@ -404,7 +404,9 @@ bool Layer::isCropped() const { 
void Layer::lockPageFlip(bool& recomputeVisibleRegions)

void Layer::lockPageFlip(bool& recomputeVisibleRegions)

{

{

    if (mQueuedFrames > 0) {

    if (mQueuedFrames > 0) {

        // Capture the old state of the layer for comparisons later

        const bool oldOpacity = isOpaque();

        const bool oldOpacity = isOpaque();

        sp<GraphicBuffer> oldActiveBuffer = mActiveBuffer;





        // signal another event if we have more frames pending

        // signal another event if we have more frames pending

        if (android_atomic_dec(&mQueuedFrames) > 1) {

        if (android_atomic_dec(&mQueuedFrames) > 1) {
@@ -417,7 +419,8 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions) 
            return;

            return;

        }

        }





        sp<GraphicBuffer> newFrontBuffer(mSurfaceTexture->getCurrentBuffer());

        // update the active buffer

        mActiveBuffer = mSurfaceTexture->getCurrentBuffer();





        const Rect crop(mSurfaceTexture->getCurrentCrop());

        const Rect crop(mSurfaceTexture->getCurrentCrop());

        const uint32_t transform(mSurfaceTexture->getCurrentTransform());

        const uint32_t transform(mSurfaceTexture->getCurrentTransform());
@@ -439,16 +442,16 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions) 
            mFlinger->invalidateHwcGeometry();

            mFlinger->invalidateHwcGeometry();

        }

        }





        uint32_t bufWidth  = newFrontBuffer->getWidth();

        uint32_t bufWidth  = mActiveBuffer->getWidth();

        uint32_t bufHeight = newFrontBuffer->getHeight();

        uint32_t bufHeight = mActiveBuffer->getHeight();

        if (mActiveBuffer != NULL) {

        if (oldActiveBuffer != NULL) {

            if (bufWidth != uint32_t(mActiveBuffer->width) ||

            if (bufWidth != uint32_t(oldActiveBuffer->width) ||

                bufHeight != uint32_t(mActiveBuffer->height)) {

                bufHeight != uint32_t(oldActiveBuffer->height)) {

                mFlinger->invalidateHwcGeometry();

                mFlinger->invalidateHwcGeometry();

            }

            }

        }

        }





        mCurrentOpacity = getOpacityForFormat(newFrontBuffer->format);

        mCurrentOpacity = getOpacityForFormat(mActiveBuffer->format);

        if (oldOpacity != isOpaque()) {

        if (oldOpacity != isOpaque()) {

            recomputeVisibleRegions = true;

            recomputeVisibleRegions = true;

        }

        }
@@ -462,9 +465,6 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions) 
        // FIXME: mPostedDirtyRegion = dirty & bounds

        // FIXME: mPostedDirtyRegion = dirty & bounds

        mPostedDirtyRegion.set(front.w, front.h);

        mPostedDirtyRegion.set(front.w, front.h);





        // update active buffer

        mActiveBuffer = newFrontBuffer;



        if ((front.w != front.requested_w) ||

        if ((front.w != front.requested_w) ||

            (front.h != front.requested_h))

            (front.h != front.requested_h))

        {

        {