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

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

Merge "triple buffering is now controled by BoardConfig and enabled by default"

parents 0f00cca1 7f42a9c4

services/surfaceflinger/Android.mk

+6 −6
Original line number Diff line number Diff line
@@ -20,19 +20,19 @@ LOCAL_SRC_FILES:= \ 
LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\"

LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES



ifeq ($(TARGET_HAS_WAITFORVSYNC), true)

	LOCAL_CFLAGS += -DHAS_WAITFORVSYNC

endif



ifeq ($(TARGET_BOARD_PLATFORM), omap3)

	LOCAL_CFLAGS += -DNO_RGBX_8888

endif

ifeq ($(TARGET_BOARD_PLATFORM), omap4)

	LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY

	LOCAL_CFLAGS += -DUSE_TRIPLE_BUFFERING

endif

ifeq ($(TARGET_BOARD_PLATFORM), s5pc110)

	LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY -DNEVER_DEFAULT_TO_ASYNC_MODE

	LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY

	LOCAL_CFLAGS += -DNEVER_DEFAULT_TO_ASYNC_MODE

endif



ifeq ($(TARGET_DISABLE_TRIPLE_BUFFERING), true)

	LOCAL_CFLAGS += -DTARGET_DISABLE_TRIPLE_BUFFERING

endif



LOCAL_SHARED_LIBRARIES := \

services/surfaceflinger/Layer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -110,11 +110,11 @@ void Layer::onFirstRef() 
    mSurfaceTexture->setFrameAvailableListener(new FrameQueuedListener(this));

    mSurfaceTexture->setSynchronousMode(true);



#ifdef USE_TRIPLE_BUFFERING

#warning "using triple buffering"

    mSurfaceTexture->setBufferCountServer(3);

#else

#ifdef TARGET_DISABLE_TRIPLE_BUFFERING

#warning "disabling triple buffering"

    mSurfaceTexture->setBufferCountServer(2);

#else

    mSurfaceTexture->setBufferCountServer(3);

#endif

}