summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-10-18 09:53:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-18 09:53:02 -0700
commit4829b184f15350de20096a97e583ed4c2b3d6427 (patch)
treea20a8e591ef0fe00eb32b2fc137ba4e2f274dd8c
parent7b96b46c5bc0bb7149c5323c9537660558e65bad (diff)
parent118b5d7961a4abc29c8bd592956007f40ad4fc6d (diff)
downloadlibhardware-4829b184f15350de20096a97e583ed4c2b3d6427.tar.gz
am 118b5d79: Allow disabling page-flipping.
Merge commit '118b5d7961a4abc29c8bd592956007f40ad4fc6d' into gingerbread-plus-aosp * commit '118b5d7961a4abc29c8bd592956007f40ad4fc6d': Allow disabling page-flipping.
-rw-r--r--modules/gralloc/Android.mk4
-rw-r--r--modules/gralloc/framebuffer.cpp5
2 files changed, 9 insertions, 0 deletions
diff --git a/modules/gralloc/Android.mk b/modules/gralloc/Android.mk
index 8946fac3..ac09e5a7 100644
--- a/modules/gralloc/Android.mk
+++ b/modules/gralloc/Android.mk
@@ -29,4 +29,8 @@ LOCAL_SRC_FILES := \
LOCAL_MODULE := gralloc.default
LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\"
+ifeq ($(BOARD_NO_PAGE_FLIPPING),true)
+LOCAL_CFLAGS += -DNO_PAGE_FLIPPING
+endif
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp
index 01951034..a487b5da 100644
--- a/modules/gralloc/framebuffer.cpp
+++ b/modules/gralloc/framebuffer.cpp
@@ -43,7 +43,12 @@
/*****************************************************************************/
// numbers of buffers for page flipping
+#if defined(NO_PAGE_FLIPPING)
+// page-flipping is buggy on some devices
+#define NUM_BUFFERS 1
+#else
#define NUM_BUFFERS 2
+#endif
enum {