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

Commit f7f63450 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android (Google) Code Review
Browse files

Merge "Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"" into jb-mr1-dev

parents b3d68efa 483bccd0

include/gui/SurfaceTexture.h

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ private: 
    // slot and destroy the EGLImage in that slot.  Otherwise it has no effect.

    //

    // This method must be called with mMutex locked.

    virtual void freeBufferLocked(int slotIndex);

    void freeBufferLocked(int slotIndex);



    // computeCurrentTransformMatrix computes the transform matrix for the

    // current texture.  It uses mCurrentTransform and the current GraphicBuffer

libs/gui/SurfaceTexture.cpp

+0 −1
Original line number Diff line number Diff line
@@ -710,7 +710,6 @@ void SurfaceTexture::freeBufferLocked(int slotIndex) { 
        eglDestroyImageKHR(mEglDisplay, img);

    }

    mEglSlots[slotIndex].mEglImage = EGL_NO_IMAGE_KHR;

    ConsumerBase::freeBufferLocked(slotIndex);

}



void SurfaceTexture::abandonLocked() {