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

Merge "Clarify aborted updateTexImage use of fences"

Browse Source
This commit is contained in:
Jesse Hall 2012-06-29 09:54:25 -07:00 committed by Android (Google) Code Review
commit 02a7be74dd
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/gui/SurfaceTexture.cpp
View File

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