From 483bccd0d9f7e5e7aa452e9e3e53056387f4b25c Mon Sep 17 00:00:00 2001 From: Jamie Gennis Date: Mon, 20 Aug 2012 14:28:21 -0700 Subject: [PATCH] Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked" This reverts commit f8d33c652b930abbfb0722f3a2928cbc2ea71078 Change-Id: I1ff2e1cc85824a8fac1051f573d2931db81af511 --- include/gui/SurfaceTexture.h | 2 +- libs/gui/SurfaceTexture.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h index 98741c550..0a83ce6af 100644 --- a/include/gui/SurfaceTexture.h +++ b/include/gui/SurfaceTexture.h @@ -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 diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index 0579a3dec..451ccc26e 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -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() {