ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* commit 'f7f6345068fe0644bf296b88a687b361eae0cc98':
  Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"
This commit is contained in:
Jamie Gennis 2012-08-20 14:35:20 -07:00 committed by Android Git Automerger
commit 9e08ee7493
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gui/SurfaceTexture.h
View File

@ -248,7 +248,7 @@ private:
// slot and destroy the EGLImage in that slot. Otherwise it has no effect. // slot and destroy the EGLImage in that slot. Otherwise it has no effect.
// //
// This method must be called with mMutex locked. // This method must be called with mMutex locked.
virtual void freeBufferLocked(int slotIndex); void freeBufferLocked(int slotIndex);
// computeCurrentTransformMatrix computes the transform matrix for the // computeCurrentTransformMatrix computes the transform matrix for the
// current texture. It uses mCurrentTransform and the current GraphicBuffer // current texture. It uses mCurrentTransform and the current GraphicBuffer

1
libs/gui/SurfaceTexture.cpp
View File

@ -710,7 +710,6 @@ void SurfaceTexture::freeBufferLocked(int slotIndex) {
eglDestroyImageKHR(mEglDisplay, img); eglDestroyImageKHR(mEglDisplay, img);
} }
mEglSlots[slotIndex].mEglImage = EGL_NO_IMAGE_KHR; mEglSlots[slotIndex].mEglImage = EGL_NO_IMAGE_KHR;
ConsumerBase::freeBufferLocked(slotIndex);
} }
void SurfaceTexture::abandonLocked() { void SurfaceTexture::abandonLocked() {