Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c554d2b8 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

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

parents d1ca738e c21180ee

libs/gui/Android.mk

+0 −4
Original line number Original line Diff line number Diff line
@@ -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))

libs/gui/SurfaceTexture.cpp

+3 −7
Original line number Original line Diff line number Diff line
@@ -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) {