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

Commit 924454f5 authored by Chia-I Wu's avatar Chia-I Wu
Browse files

libgui: fix and clean up CpuConsumer::unlockBuffer 

addReleaseFenceLocked should be called with
AcquiredBuffer::mGraphicBuffer, not the one in ConsumerBase::mSlots.
Otherwise, it breaks ConsumerBase::stillTracking.

Also thanks to stillTracking, we don't need to do the tracking
manually.

Test: libgui_test
Change-Id: Ib69b88263c4619634ae2977b9f811be5a846f446
parent 96ad8222

libs/gui/CpuConsumer.cpp

+7 −26
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define LOG_TAG "CpuConsumer"

//#define ATRACE_TAG ATRACE_TAG_GRAPHICS



#include <cutils/compiler.h>

#include <utils/Log.h>

#include <gui/BufferItem.h>

#include <gui/CpuConsumer.h>
@@ -222,42 +221,24 @@ status_t CpuConsumer::unlockBuffer(const LockedBuffer &nativeBuffer) { 
        return BAD_VALUE;

    }



    return releaseAcquiredBufferLocked(lockedIdx);

}



status_t CpuConsumer::releaseAcquiredBufferLocked(size_t lockedIdx) {

    status_t err;

    int fd = -1;

    AcquiredBuffer& ab = mAcquiredBuffers.editItemAt(lockedIdx);



    err = mAcquiredBuffers[lockedIdx].mGraphicBuffer->unlockAsync(&fd);

    int fenceFd = -1;

    status_t err = ab.mGraphicBuffer->unlockAsync(&fenceFd);

    if (err != OK) {

        CC_LOGE("%s: Unable to unlock graphic buffer %zd", __FUNCTION__,

                lockedIdx);

        return err;

    }

    int buf = mAcquiredBuffers[lockedIdx].mSlot;

    if (CC_LIKELY(fd != -1)) {

        sp<Fence> fence(new Fence(fd));

        addReleaseFenceLocked(

            mAcquiredBuffers[lockedIdx].mSlot,

            mSlots[buf].mGraphicBuffer,

            fence);

    }



    // release the buffer if it hasn't already been freed by the BufferQueue.

    // This can happen, for example, when the producer of this buffer

    // disconnected after this buffer was acquired.

    if (CC_LIKELY(mAcquiredBuffers[lockedIdx].mGraphicBuffer ==

            mSlots[buf].mGraphicBuffer)) {

        releaseBufferLocked(

                buf, mAcquiredBuffers[lockedIdx].mGraphicBuffer,

                EGL_NO_DISPLAY, EGL_NO_SYNC_KHR);

    }

    sp<Fence> fence(fenceFd >= 0 ? new Fence(fenceFd) : Fence::NO_FENCE);

    addReleaseFenceLocked(ab.mSlot, ab.mGraphicBuffer, fence);

    releaseBufferLocked(ab.mSlot, ab.mGraphicBuffer);



    AcquiredBuffer &ab = mAcquiredBuffers.editItemAt(lockedIdx);

    ab.reset();



    mCurrentLockedBuffers--;



    return OK;

}

libs/gui/include/gui/CpuConsumer.h

+0 −2
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ class CpuConsumer : public ConsumerBase 
    // Maximum number of buffers that can be locked at a time

    const size_t mMaxLockedBuffers;



    status_t releaseAcquiredBufferLocked(size_t lockedIdx);



    virtual void freeBufferLocked(int slotIndex);



    // Tracking for buffers acquired by the user