Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev (dd57d551) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,10 @@ ifeq ($(TARGET_DISABLE_TRIPLE_BUFFERING),true)
		LOCAL_CFLAGS += -DTARGET_DISABLE_TRIPLE_BUFFERING
		endif

		ifneq ($(NUM_FRAMEBUFFER_SURFACE_BUFFERS),)
		LOCAL_CFLAGS += -DNUM_FRAMEBUFFER_SURFACE_BUFFERS=$(NUM_FRAMEBUFFER_SURFACE_BUFFERS)
		endif

		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		libdl \

+5 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,10 @@
		#include "DisplayHardware/GraphicBufferAlloc.h"
		#include "DisplayHardware/HWComposer.h"

		#ifndef NUM_FRAMEBUFFER_SURFACE_BUFFERS
		#define NUM_FRAMEBUFFER_SURFACE_BUFFERS (2)
		#endif

		// ----------------------------------------------------------------------------
		namespace android {
		// ----------------------------------------------------------------------------
		@@ -61,7 +65,7 @@ FramebufferSurface::FramebufferSurface(HWComposer& hwc, int disp) :
		mBufferQueue->setDefaultBufferFormat(mHwc.getFormat(disp));
		mBufferQueue->setDefaultBufferSize(mHwc.getWidth(disp), mHwc.getHeight(disp));
		mBufferQueue->setSynchronousMode(true);
		mBufferQueue->setDefaultMaxBufferCount(NUM_FRAME_BUFFERS);
		mBufferQueue->setDefaultMaxBufferCount(NUM_FRAMEBUFFER_SURFACE_BUFFERS);
		}

		status_t FramebufferSurface::nextBuffer(sp<GraphicBuffer>& outBuffer, sp<Fence>& outFence) {

+0 −2