diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-10-12 14:33:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-12 14:33:52 -0700 |
| commit | dd57d551944c01394bc2807d962be4953c58c7c1 (patch) | |
| tree | 3acb417fd14c9d5df23d56c4675259e2aa1ea867 /services | |
| parent | b763d5fffa2f942a6ae3637fab17439dd32dbebc (diff) | |
| parent | cdbaecb54152ce98789823420d426077d72aa1e7 (diff) | |
| download | frameworks_native-dd57d551944c01394bc2807d962be4953c58c7c1.zip frameworks_native-dd57d551944c01394bc2807d962be4953c58c7c1.tar.gz frameworks_native-dd57d551944c01394bc2807d962be4953c58c7c1.tar.bz2 | |
Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/Android.mk | 4 | ||||
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp | 6 | ||||
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/FramebufferSurface.h | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 0d559e7..5a57697 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -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 \ diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp index 9ada197..6c86a53 100644 --- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp +++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp @@ -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) { diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.h b/services/surfaceflinger/DisplayHardware/FramebufferSurface.h index d64fea7..6336345 100644 --- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.h +++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.h @@ -22,8 +22,6 @@ #include <gui/ConsumerBase.h> -#define NUM_FRAME_BUFFERS 2 - // --------------------------------------------------------------------------- namespace android { // --------------------------------------------------------------------------- |