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

Merge "libgui: Clear frame number while freeing slot"

Browse Source
This commit is contained in:
Dan Stoza 2015-05-04 16:57:53 +00:00 committed by Gerrit Code Review
commit e357f64945
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/gui/BufferQueueConsumer.cpp
View File

@ -306,6 +306,8 @@ status_t BufferQueueConsumer::releaseBuffer(int slot, uint64_t frameNumber,
if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS || if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS ||
releaseFence == NULL) { releaseFence == NULL) {
BQ_LOGE("releaseBuffer: slot %d out of range or fence %p NULL", slot,
releaseFence.get());
return BAD_VALUE; return BAD_VALUE;
} }
@ -344,7 +346,7 @@ status_t BufferQueueConsumer::releaseBuffer(int slot, uint64_t frameNumber,
mSlots[slot].mNeedsCleanupOnRelease = false; mSlots[slot].mNeedsCleanupOnRelease = false;
return STALE_BUFFER_SLOT; return STALE_BUFFER_SLOT;
} else { } else {
BQ_LOGV("releaseBuffer: attempted to release buffer slot %d " BQ_LOGE("releaseBuffer: attempted to release buffer slot %d "
"but its state was %d", slot, mSlots[slot].mBufferState); "but its state was %d", slot, mSlots[slot].mBufferState);
return BAD_VALUE; return BAD_VALUE;
} }

1
libs/gui/BufferQueueCore.cpp
View File

@ -214,6 +214,7 @@ void BufferQueueCore::freeBufferLocked(int slot) {
} }
mSlots[slot].mBufferState = BufferSlot::FREE; mSlots[slot].mBufferState = BufferSlot::FREE;
mSlots[slot].mAcquireCalled = false; mSlots[slot].mAcquireCalled = false;
mSlots[slot].mFrameNumber = 0;
// Destroy fence as BufferQueue now takes ownership // Destroy fence as BufferQueue now takes ownership
if (mSlots[slot].mEglFence != EGL_NO_SYNC_KHR) { if (mSlots[slot].mEglFence != EGL_NO_SYNC_KHR) {