Skip to content

Commit db5494c

Browse files
committed
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
This reverts commit e7758be. Seemed to cause failures un SurfaceTexture. Bug: 5627450
1 parent bd78368 commit db5494c

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

libs/gui/Android.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ LOCAL_SHARED_LIBRARIES := \
3232

3333
LOCAL_MODULE:= libgui
3434

35-
ifeq ($(TARGET_BOARD_PLATFORM), tegra)
36-
LOCAL_CFLAGS += -DALLOW_DEQUEUE_CURRENT_BUFFER
37-
endif
38-
3935
include $(BUILD_SHARED_LIBRARY)
4036

4137
ifeq (,$(ONE_SHOT_MAKEFILE))

libs/gui/SurfaceTexture.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,8 @@
3636
#include <utils/Log.h>
3737
#include <utils/String8.h>
3838

39-
#ifdef ALLOW_DEQUEUE_CURRENT_BUFFER
40-
#define FLAG_ALLOW_DEQUEUE_CURRENT_BUFFER true
41-
#warning "ALLOW_DEQUEUE_CURRENT_BUFFER enabled"
42-
#else
43-
#define FLAG_ALLOW_DEQUEUE_CURRENT_BUFFER false
44-
#endif
39+
40+
#define ALLOW_DEQUEUE_CURRENT_BUFFER false
4541

4642
// Macros for including the SurfaceTexture name in log messages
4743
#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,
327323
LOGW_IF((state == BufferSlot::FREE) && (mCurrentTexture==i),
328324
"dequeueBuffer: buffer %d is both FREE and current!", i);
329325

330-
if (FLAG_ALLOW_DEQUEUE_CURRENT_BUFFER) {
326+
if (ALLOW_DEQUEUE_CURRENT_BUFFER) {
331327
if (state == BufferSlot::FREE || i == mCurrentTexture) {
332328
foundSync = i;
333329
if (i != mCurrentTexture) {

0 commit comments

Comments
 (0)