diff options
| author | Dan Stoza <stoza@google.com> | 2015-04-22 19:17:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-22 19:17:56 +0000 |
| commit | 41422980fabb087390791d951c28fef072d93be1 (patch) | |
| tree | e6fc0ca990155726f6c4b92163c25c7b19e17b56 /include/gui | |
| parent | 3805a00d6efef02535aaed96f412e0c55a9875f8 (diff) | |
| parent | d2c12e4cd394ab9ed642526f8bd0e1b3acd692ae (diff) | |
| download | frameworks_native-41422980fabb087390791d951c28fef072d93be1.zip frameworks_native-41422980fabb087390791d951c28fef072d93be1.tar.gz frameworks_native-41422980fabb087390791d951c28fef072d93be1.tar.bz2 | |
am d2c12e4c: am 7637e35d: Merge "Revert "libgui: Change BufferQueue to use free lists""
* commit 'd2c12e4cd394ab9ed642526f8bd0e1b3acd692ae':
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 |