diff options
| author | 2011-11-16 16:16:11 -0800 | |
|---|---|---|
| committer | 2011-11-16 16:16:11 -0800 | |
| commit | abdade71bc17153696fe2abe281c5a3b0c2e5abe (patch) | |
| tree | 282fabe34a685c61ba5e79776fec818ac486aa2a | |
| parent | 3de689186531cebfabcb4b4d4163eae6baac528d (diff) | |
| parent | 69c17a11a2ce5badc238e66ce9f8ca4a3a1028b3 (diff) | |
am 69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
* commit '69c17a11a2ce5badc238e66ce9f8ca4a3a1028b3':
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
| -rw-r--r-- | libs/gui/Android.mk | 4 | ||||
| -rw-r--r-- | libs/gui/SurfaceTexture.cpp | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk index 9767568bed35..ed319f5e9381 100644 --- a/libs/gui/Android.mk +++ b/libs/gui/Android.mk @@ -32,10 +32,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgui -ifeq ($(TARGET_BOARD_PLATFORM), tegra) - LOCAL_CFLAGS += -DALLOW_DEQUEUE_CURRENT_BUFFER -endif - include $(BUILD_SHARED_LIBRARY) ifeq (,$(ONE_SHOT_MAKEFILE)) diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index ee54bf4f37d0..3c0d4756ff6c 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__) @@ -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) { |