commit 02a7be74dd0c4eb47a522cb0f646736cb6d0de01
author Jesse Hall <jessehall@google.com> Fri Jun 29 09:54:25 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 29 09:54:25 2012 -0700
tree 022598206571a5838a56f9f1402a18482d6bb147
parent 962174da0303d94180af7648faf90e112b851192
parent d58c304cc60be46a363fdcdce6da06e4ecb589b6

Merge "Clarify aborted updateTexImage use of fences"

libs/gui/SurfaceTexture.cpp

diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index 8ef885b..9a36bf9 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -236,10 +236,8 @@
         // not accept this buffer. this is used by SurfaceFlinger to
         // reject buffers which have the wrong size
         if (rejecter && rejecter->reject(mEGLSlots[buf].mGraphicBuffer, item)) {
-            mBufferQueue->releaseBuffer(buf, dpy, mEGLSlots[buf].mFence,
-                    mEGLSlots[buf].mReleaseFence);
-            mEGLSlots[buf].mFence = EGL_NO_SYNC_KHR;
-            mEGLSlots[buf].mReleaseFence.clear();
+            mBufferQueue->releaseBuffer(buf, dpy, EGL_NO_SYNC_KHR,
+                    Fence::NO_FENCE);
             glBindTexture(mTexTarget, mTexName);
             return NO_ERROR;
         }
@@ -286,10 +284,8 @@
         if (err != NO_ERROR) {
             // Release the buffer we just acquired.  It's not safe to
             // release the old buffer, so instead we just drop the new frame.
-            mBufferQueue->releaseBuffer(buf, dpy, mEGLSlots[buf].mFence,
-                    mEGLSlots[buf].mReleaseFence);
-            mEGLSlots[buf].mFence = EGL_NO_SYNC_KHR;
-            mEGLSlots[buf].mReleaseFence.clear();
+            mBufferQueue->releaseBuffer(buf, dpy, EGL_NO_SYNC_KHR,
+                    Fence::NO_FENCE);
             return err;
         }