drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1

Browse Source
This commit is contained in:
Mathias Agopian
2011-11-16 16:13:38 -08:00
committed by Android (Google) Code Review
parent e937da8314 db5494c406
commit 69c17a11a2
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/gui/Android.mk
View File

@ -32,10 +32,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE:= libgui LOCAL_MODULE:= libgui
ifeq ($(TARGET_BOARD_PLATFORM), tegra)
LOCAL_CFLAGS += -DALLOW_DEQUEUE_CURRENT_BUFFER
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
ifeq (,$(ONE_SHOT_MAKEFILE)) ifeq (,$(ONE_SHOT_MAKEFILE))

10
libs/gui/SurfaceTexture.cpp
View File

@ -36,12 +36,8 @@
#include <utils/Log.h> #include <utils/Log.h>
#include <utils/String8.h> #include <utils/String8.h>
#ifdef ALLOW_DEQUEUE_CURRENT_BUFFER
#define FLAG_ALLOW_DEQUEUE_CURRENT_BUFFER true #define ALLOW_DEQUEUE_CURRENT_BUFFER false
#warning "ALLOW_DEQUEUE_CURRENT_BUFFER enabled"
#else
#define FLAG_ALLOW_DEQUEUE_CURRENT_BUFFER false
#endif
// Macros for including the SurfaceTexture name in log messages // Macros for including the SurfaceTexture name in log messages
#define ST_LOGV(x, ...) LOGV("[%s] "x, mName.string(), ##__VA_ARGS__) #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), LOGW_IF((state == BufferSlot::FREE) && (mCurrentTexture==i),
"dequeueBuffer: buffer %d is both FREE and current!", 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) { if (state == BufferSlot::FREE || i == mCurrentTexture) {
foundSync = i; foundSync = i;
if (i != mCurrentTexture) { if (i != mCurrentTexture) {