summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-04-22 18:57:39 +0000
committerDan Stoza <stoza@google.com>2015-04-22 18:57:39 +0000
commit1fc9cc25a487d4d9dea3cc185331e3481ead36ff (patch)
treeba55bd86e10b857a6d63c76a8fd669c53c584410 /include
parent8dddc990103b71137be2a6365a26b1ac36598e68 (diff)
downloadframeworks_native-1fc9cc25a487d4d9dea3cc185331e3481ead36ff.zip
frameworks_native-1fc9cc25a487d4d9dea3cc185331e3481ead36ff.tar.gz
frameworks_native-1fc9cc25a487d4d9dea3cc185331e3481ead36ff.tar.bz2
Revert "libgui: Change BufferQueue to use free lists"
This reverts commit 8dddc990103b71137be2a6365a26b1ac36598e68. Change-Id: I0b0fed9f1394c6f6ae812f6c562ead4473a8226e
Diffstat (limited to 'include')
-rw-r--r--include/gui/BufferQueueCore.h15
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