commit cd347fdf74d5f2e0af856455c514e655f40a6fdb
author Jean-Baptiste Queru <jbq@google.com> Thu Mar 31 19:34:19 2011 -0700
committer Jean-Baptiste Queru <jbq@google.com> Thu Mar 31 19:58:27 2011 -0700
tree a19f5a7537958e81d2f1bbd5878b4eb41a05d956
parent 25b68b5c24e443c326af73a33cea6dc45e845254

Allow to force 16bpp when 32bpp has problems

Bug: 4197654

Change-Id: Icf1e8793d6a4d2e070a8f232efd4136d79339496

modules/gralloc/Android.mk

diff --git a/modules/gralloc/Android.mk b/modules/gralloc/Android.mk
index ac09e5a..cbfd82b 100644
--- a/modules/gralloc/Android.mk
+++ b/modules/gralloc/Android.mk
@@ -32,5 +32,8 @@
 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)

modules/gralloc/framebuffer.cpp

diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp
index e1323c2..fe57a8a 100644
--- a/modules/gralloc/framebuffer.cpp
+++ b/modules/gralloc/framebuffer.cpp
@@ -176,6 +176,21 @@
     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)
      */
@@ -342,6 +357,9 @@
             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;