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

Commit 79e28789 authored by Dan Stoza's avatar Dan Stoza Committed by Android (Google) Code Review
Browse files

Merge "libgui: Clear frame number while freeing slot" into mnc-dev

parents b0474e78 52937cd9

libs/gui/BufferQueueConsumer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -306,6 +306,8 @@ status_t BufferQueueConsumer::releaseBuffer(int slot, uint64_t frameNumber, 


    if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS ||

            releaseFence == NULL) {

        BQ_LOGE("releaseBuffer: slot %d out of range or fence %p NULL", slot,

                releaseFence.get());

        return BAD_VALUE;

    }
@@ -344,7 +346,7 @@ status_t BufferQueueConsumer::releaseBuffer(int slot, uint64_t frameNumber, 
            mSlots[slot].mNeedsCleanupOnRelease = false;

            return STALE_BUFFER_SLOT;

        } else {

            BQ_LOGV("releaseBuffer: attempted to release buffer slot %d "

            BQ_LOGE("releaseBuffer: attempted to release buffer slot %d "

                    "but its state was %d", slot, mSlots[slot].mBufferState);

            return BAD_VALUE;

        }

libs/gui/BufferQueueCore.cpp

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ void BufferQueueCore::freeBufferLocked(int slot) { 
    }

    mSlots[slot].mBufferState = BufferSlot::FREE;

    mSlots[slot].mAcquireCalled = false;

    mSlots[slot].mFrameNumber = 0;



    // Destroy fence as BufferQueue now takes ownership

    if (mSlots[slot].mEglFence != EGL_NO_SYNC_KHR) {