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

Commit a1d589ea authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

am 2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1 

* commit '2ba13186b268de3527af6da1933a4b65877548d9':
  SurfaceTexture: fix a bug with buffer reallocation
parents 5ef898dd e984dd11

libs/gui/SurfaceTexture.cpp

+5 −0
Original line number Diff line number Diff line
@@ -437,6 +437,11 @@ status_t SurfaceTexture::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h, 
            mSlots[buf].mEglImage = EGL_NO_IMAGE_KHR;

            mSlots[buf].mEglDisplay = EGL_NO_DISPLAY;

        }

        if (mCurrentTexture == buf) {

            // The current texture no longer references the buffer in this slot

            // since we just allocated a new buffer.

            mCurrentTexture = INVALID_BUFFER_SLOT;

        }

        returnFlags |= ISurfaceTexture::BUFFER_NEEDS_REALLOCATION;

    }

    ST_LOGV("dequeueBuffer: returning slot=%d buf=%p flags=%#x", buf,