diff options
| author | Mathias Agopian <mathias@google.com> | 2011-11-16 15:59:13 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2011-11-16 15:59:13 -0800 |
| commit | db5494c4067c8f5cc4aa4fc2ceeca0cf673349ac (patch) | |
| tree | 1beca287b274c532204dbdc552e83006462ebb5e /libs/gui/SurfaceTexture.cpp | |
| parent | bd7836846c1e5d3610ba6c26686674d429a4316c (diff) | |
| download | frameworks_base-db5494c4067c8f5cc4aa4fc2ceeca0cf673349ac.zip frameworks_base-db5494c4067c8f5cc4aa4fc2ceeca0cf673349ac.tar.gz frameworks_base-db5494c4067c8f5cc4aa4fc2ceeca0cf673349ac.tar.bz2 | |
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
This reverts commit e7758be6da85728df6b4215f413660c67c5a9740.
Seemed to cause failures un SurfaceTexture.
Bug: 5627450
Diffstat (limited to 'libs/gui/SurfaceTexture.cpp')
| -rw-r--r-- | libs/gui/SurfaceTexture.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index 374f3c5..6f84206 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -36,12 +36,8 @@ #include <utils/Log.h> #include <utils/String8.h> -#ifdef ALLOW_DEQUEUE_CURRENT_BUFFER -#define FLAG_ALLOW_DEQUEUE_CURRENT_BUFFER true -#warning "ALLOW_DEQUEUE_CURRENT_BUFFER enabled" -#else -#define FLAG_ALLOW_DEQUEUE_CURRENT_BUFFER false -#endif + +#define ALLOW_DEQUEUE_CURRENT_BUFFER false // Macros for including the SurfaceTexture name in log messages #define ST_LOGV(x, ...) LOGV("[%s] "x, mName.string(), ##__VA_ARGS__) @@ -327,7 +323,7 @@ status_t SurfaceTexture::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h, LOGW_IF((state == BufferSlot::FREE) && (mCurrentTexture==i), "dequeueBuffer: buffer %d is both FREE and current!", i); - if (FLAG_ALLOW_DEQUEUE_CURRENT_BUFFER) { + if (ALLOW_DEQUEUE_CURRENT_BUFFER) { if (state == BufferSlot::FREE || i == mCurrentTexture) { foundSync = i; if (i != mCurrentTexture) { |