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

Commit 029f7606 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 556a406c: am 3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra... 

am 556a406c: am 3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1

* commit '556a406cf4dd8a7faa318e0d522d899f8b9da7dc':
  enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
parents 5db8b422 8a680e59

libs/gui/Android.mk

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

libs/gui/SurfaceTexture.cpp

+7 −3
Original line number Diff line number Diff line
@@ -36,8 +36,12 @@ 
#include <utils/Log.h>

#include <utils/String8.h>





#define ALLOW_DEQUEUE_CURRENT_BUFFER    false

#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



// Macros for including the SurfaceTexture name in log messages

#define ST_LOGV(x, ...) ALOGV("[%s] "x, mName.string(), ##__VA_ARGS__)
@@ -323,7 +327,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 (ALLOW_DEQUEUE_CURRENT_BUFFER) {

            if (FLAG_ALLOW_DEQUEUE_CURRENT_BUFFER) {

                if (state == BufferSlot::FREE || i == mCurrentTexture) {

                    foundSync = i;

                    if (i != mCurrentTexture) {