diff options
| author | Dan Stoza <stoza@google.com> | 2015-04-22 22:18:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-22 22:18:58 +0000 |
| commit | 83e9f6e75e0c32efba8a337bcf9eb44cbab2346c (patch) | |
| tree | b8bc5e3144df17d29cc268c307fdb71ce9c999b0 /include/gui | |
| parent | 2bff43a91240ba3e2f98778233f3c9fb8221bbf7 (diff) | |
| parent | 41422980fabb087390791d951c28fef072d93be1 (diff) | |
| download | frameworks_native-83e9f6e75e0c32efba8a337bcf9eb44cbab2346c.zip frameworks_native-83e9f6e75e0c32efba8a337bcf9eb44cbab2346c.tar.gz frameworks_native-83e9f6e75e0c32efba8a337bcf9eb44cbab2346c.tar.bz2 | |
am 41422980: am d2c12e4c: am 7637e35d: Merge "Revert "libgui: Change BufferQueue to use free lists""
* commit '41422980fabb087390791d951c28fef072d93be1':
Revert "libgui: Change BufferQueue to use free lists"
Diffstat (limited to 'include/gui')
| -rw-r--r-- | include/gui/BufferQueueCore.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/gui/BufferQueueCore.h b/include/gui/BufferQueueCore.h index a6065a9..40026bd 100644 --- a/include/gui/BufferQueueCore.h +++ b/include/gui/BufferQueueCore.h @@ -30,9 +30,6 @@ #include <utils/Trace.h> #include <utils/Vector.h> -#include <list> -#include <set> - #define BQ_LOGV(x, ...) ALOGV("[%s] " x, mConsumerName.string(), ##__VA_ARGS__) #define BQ_LOGD(x, ...) ALOGD("[%s] " x, mConsumerName.string(), ##__VA_ARGS__) #define BQ_LOGI(x, ...) ALOGI("[%s] " x, mConsumerName.string(), ##__VA_ARGS__) @@ -126,10 +123,6 @@ private: // waitWhileAllocatingLocked blocks until mIsAllocating is false. void waitWhileAllocatingLocked() const; - // validateConsistencyLocked ensures that the free lists are in sync with - // the information stored in mSlots - void validateConsistencyLocked() const; - // mAllocator is the connection to SurfaceFlinger that is used to allocate // new GraphicBuffer objects. sp<IGraphicBufferAlloc> mAllocator; @@ -184,14 +177,6 @@ private: // mQueue is a FIFO of queued buffers used in synchronous mode. Fifo mQueue; - // mFreeSlots contains all of the slots which are FREE and do not currently - // have a buffer attached - std::set<int> mFreeSlots; - - // mFreeBuffers contains all of the slots which are FREE and currently have - // a buffer attached - std::list<int> mFreeBuffers; - // mOverrideMaxBufferCount is the limit on the number of buffers that will // be allocated at one time. This value is set by the producer by calling // setBufferCount. The default is 0, which means that the producer doesn't |