ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mathias Agopian 2012-04-23 20:04:17 -07:00 committed by Android (Google) Code Review
commit bce2d744b7
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/surfaceflinger/Android.mk
View File

@ -20,19 +20,19 @@ LOCAL_SRC_FILES:= \
LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\" LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\"
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
ifeq ($(TARGET_HAS_WAITFORVSYNC), true)
LOCAL_CFLAGS += -DHAS_WAITFORVSYNC
endif
ifeq ($(TARGET_BOARD_PLATFORM), omap3) ifeq ($(TARGET_BOARD_PLATFORM), omap3)
LOCAL_CFLAGS += -DNO_RGBX_8888 LOCAL_CFLAGS += -DNO_RGBX_8888
endif endif
ifeq ($(TARGET_BOARD_PLATFORM), omap4) ifeq ($(TARGET_BOARD_PLATFORM), omap4)
LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY
LOCAL_CFLAGS += -DUSE_TRIPLE_BUFFERING
endif endif
ifeq ($(TARGET_BOARD_PLATFORM), s5pc110) 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 endif
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \

8
services/surfaceflinger/Layer.cpp
View File

@ -110,11 +110,11 @@ void Layer::onFirstRef()
mSurfaceTexture->setFrameAvailableListener(new FrameQueuedListener(this)); mSurfaceTexture->setFrameAvailableListener(new FrameQueuedListener(this));
mSurfaceTexture->setSynchronousMode(true); mSurfaceTexture->setSynchronousMode(true);
#ifdef USE_TRIPLE_BUFFERING #ifdef TARGET_DISABLE_TRIPLE_BUFFERING
#warning "using triple buffering" #warning "disabling triple buffering"
mSurfaceTexture->setBufferCountServer(3);
#else
mSurfaceTexture->setBufferCountServer(2); mSurfaceTexture->setBufferCountServer(2);
#else
mSurfaceTexture->setBufferCountServer(3);
#endif #endif
} }