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

Commit 2f54d64e authored by Valerie Hau's avatar Valerie Hau
Browse files

Modifying BLAST frame number to match BufferQueue 

Bug: 147388905
Test: build, boot, SurfaceFlinger_test
Change-Id: Ifed095ba86f05a8ec55709858a319c5944d625e8
parent dc82d9e6

services/surfaceflinger/BufferStateLayer.cpp

+4 −2
Original line number Diff line number Diff line
@@ -235,6 +235,8 @@ bool BufferStateLayer::setBuffer(const sp<GraphicBuffer>& buffer, nsecs_t postTi 
        mReleasePreviousBuffer = true;

    }



    mFrameCounter++;



    mCurrentState.buffer = buffer;

    mCurrentState.clientCacheId = clientCacheId;

    mCurrentState.modified = true;
@@ -492,6 +494,8 @@ status_t BufferStateLayer::updateTexImage(bool& /*recomputeVisibleRegions*/, nse 
        handle->latchTime = latchTime;

    }



    mFrameNumber = mFrameCounter;



    if (!SyncFeatures::getInstance().useNativeFenceSync()) {

        // Bind the new buffer to the GL texture.

        //
@@ -553,8 +557,6 @@ void BufferStateLayer::latchPerFrameState( 
    compositionState.buffer = mBufferInfo.mBuffer;

    compositionState.bufferSlot = mBufferInfo.mBufferSlot;

    compositionState.acquireFence = mBufferInfo.mFence;



    mFrameNumber++;

}



void BufferStateLayer::HwcSlotGenerator::bufferErased(const client_cache_t& clientCacheId) {

services/surfaceflinger/BufferStateLayer.h

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ private: 
    std::atomic<bool> mSidebandStreamChanged{false};



    mutable uint32_t mFrameNumber{0};

    uint64_t mFrameCounter{0};



    sp<Fence> mPreviousReleaseFence;

    uint64_t mPreviousBufferId = 0;