summaryrefslogtreecommitdiffstats
path: root/modules/gralloc
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2011-06-06 13:28:45 -0700
committerJean-Baptiste Queru <jbq@google.com>2011-06-06 13:28:45 -0700
commit57adb36c30893cf3161bbb16a4a3505689ee75fa (patch)
treedc24d4397ffc6d07a448a2b84e285386a1591d38 /modules/gralloc
parent188c223c7d0b53ed49c00d0828ef79890ec3052e (diff)
downloadhardware_libhardware-57adb36c30893cf3161bbb16a4a3505689ee75fa.zip
hardware_libhardware-57adb36c30893cf3161bbb16a4a3505689ee75fa.tar.gz
hardware_libhardware-57adb36c30893cf3161bbb16a4a3505689ee75fa.tar.bz2
Remove workarounds for buggy /dev/fb0 drivers
Change-Id: Ideadd5f39693d05cf29a81d9f87ed804d7e52380
Diffstat (limited to 'modules/gralloc')
-rw-r--r--modules/gralloc/Android.mk6
-rw-r--r--modules/gralloc/framebuffer.cpp23
2 files changed, 0 insertions, 29 deletions
diff --git a/modules/gralloc/Android.mk b/modules/gralloc/Android.mk
index 1e1e05f..b24c4cd 100644
--- a/modules/gralloc/Android.mk
+++ b/modules/gralloc/Android.mk
@@ -29,11 +29,5 @@ LOCAL_SRC_FILES := \
LOCAL_MODULE := gralloc.default
LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\"
-ifeq ($(BOARD_NO_PAGE_FLIPPING),true)
-LOCAL_CFLAGS += -DNO_PAGE_FLIPPING
-endif
-ifeq ($(BOARD_NO_32BPP),true)
-LOCAL_CFLAGS += -DNO_32BPP
-endif
include $(BUILD_SHARED_LIBRARY)
diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp
index fe57a8a..f908976 100644
--- a/modules/gralloc/framebuffer.cpp
+++ b/modules/gralloc/framebuffer.cpp
@@ -43,12 +43,7 @@
/*****************************************************************************/
// 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 {
@@ -176,21 +171,6 @@ int mapFrameBufferLocked(struct private_module_t* module)
info.yoffset = 0;
info.activate = FB_ACTIVATE_NOW;
-#if defined(NO_32BPP)
- /*
- * Explicitly request 5/6/5
- */
- info.bits_per_pixel = 16;
- info.red.offset = 11;
- info.red.length = 5;
- info.green.offset = 5;
- info.green.length = 6;
- info.blue.offset = 0;
- info.blue.length = 5;
- info.transp.offset = 0;
- info.transp.length = 0;
-#endif
-
/*
* Request NUM_BUFFERS screens (at lest 2 for page flipping)
*/
@@ -357,9 +337,6 @@ int fb_device_open(hw_module_t const* module, const char* name,
int format = (m->info.bits_per_pixel == 32)
? HAL_PIXEL_FORMAT_RGBX_8888
: HAL_PIXEL_FORMAT_RGB_565;
-#ifdef NO_32BPP
- format = HAL_PIXEL_FORMAT_RGB_565;
-#endif
const_cast<uint32_t&>(dev->device.flags) = 0;
const_cast<uint32_t&>(dev->device.width) = m->info.xres;
const_cast<uint32_t&>(dev->device.height) = m->info.yres;