diff options
| author | Dan Stoza <stoza@google.com> | 2015-05-04 16:33:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-04 16:33:47 +0000 |
| commit | 79e287890da9de37a834cceebdefe32a7d3ac0ac (patch) | |
| tree | f36ea9c0a19373a7d3e3bc8c9be4e0696eabb090 | |
| parent | b0474e78df2a778c42c6746da815f397bb2df374 (diff) | |
| parent | 52937cd9a543fe66696c38ae50ec141aa70ec1e4 (diff) | |
| download | frameworks_native-79e287890da9de37a834cceebdefe32a7d3ac0ac.zip frameworks_native-79e287890da9de37a834cceebdefe32a7d3ac0ac.tar.gz frameworks_native-79e287890da9de37a834cceebdefe32a7d3ac0ac.tar.bz2 | |
Merge "libgui: Clear frame number while freeing slot" into mnc-dev
| -rw-r--r-- | libs/gui/BufferQueueConsumer.cpp | 4 | ||||
| -rw-r--r-- | libs/gui/BufferQueueCore.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libs/gui/BufferQueueConsumer.cpp b/libs/gui/BufferQueueConsumer.cpp index 2deef0e..336ddb6 100644 --- a/libs/gui/BufferQueueConsumer.cpp +++ b/libs/gui/BufferQueueConsumer.cpp @@ -306,6 +306,8 @@ status_t BufferQueueConsumer::releaseBuffer(int slot, uint64_t frameNumber, if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS || releaseFence == NULL) { + BQ_LOGE("releaseBuffer: slot %d out of range or fence %p NULL", slot, + releaseFence.get()); return BAD_VALUE; } @@ -344,7 +346,7 @@ status_t BufferQueueConsumer::releaseBuffer(int slot, uint64_t frameNumber, mSlots[slot].mNeedsCleanupOnRelease = false; return STALE_BUFFER_SLOT; } 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); return BAD_VALUE; } diff --git a/libs/gui/BufferQueueCore.cpp b/libs/gui/BufferQueueCore.cpp index d0f7afa..37171ed 100644 --- a/libs/gui/BufferQueueCore.cpp +++ b/libs/gui/BufferQueueCore.cpp @@ -214,6 +214,7 @@ void BufferQueueCore::freeBufferLocked(int slot) { } mSlots[slot].mBufferState = BufferSlot::FREE; mSlots[slot].mAcquireCalled = false; + mSlots[slot].mFrameNumber = 0; // Destroy fence as BufferQueue now takes ownership if (mSlots[slot].mEglFence != EGL_NO_SYNC_KHR) { |