diff options
| author | Mathias Agopian <mathias@google.com> | 2011-11-17 07:48:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 07:48:10 -0800 |
| commit | 905a12a949e779b50ad7ab0d69047b6e047ad7b8 (patch) | |
| tree | 9bccdcf6f7e241391efbbc9ae895cae2a861a7e8 /libs/gui/SurfaceTexture.cpp | |
| parent | 5a1623b379662e95580736510e1640148c228123 (diff) | |
| parent | abdade71bc17153696fe2abe281c5a3b0c2e5abe (diff) | |
| download | frameworks_base-905a12a949e779b50ad7ab0d69047b6e047ad7b8.zip frameworks_base-905a12a949e779b50ad7ab0d69047b6e047ad7b8.tar.gz frameworks_base-905a12a949e779b50ad7ab0d69047b6e047ad7b8.tar.bz2 | |
am abdade71: am 69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
* commit 'abdade71bc17153696fe2abe281c5a3b0c2e5abe':
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
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 ffacd5f..9332aac 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, ...) ALOGV("[%s] "x, mName.string(), ##__VA_ARGS__) @@ -329,7 +325,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) { |