commit 330067c2ef5f69648a2e9d3be383f3f4394bcbea
author Linux Build Service Account <lnxbuild@localhost> Fri May 10 00:50:13 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 10 00:50:13 2013 -0700
tree ed3401638f227c370bb940fb8dc6e40821bb07a6
parent d59f0b5f5616aae91024a44882b0a9c7c656c985
parent 1b379695ef3d008575f382d7ec747ceee515a891

Merge "libgralloc: Don't pad if debug.gralloc.map_fb_memory is set"

libgralloc/alloc_controller.cpp

diff --git a/libgralloc/alloc_controller.cpp b/libgralloc/alloc_controller.cpp
index 123be3f..677bb4e 100644
--- a/libgralloc/alloc_controller.cpp
+++ b/libgralloc/alloc_controller.cpp
@@ -105,6 +105,15 @@
     int stride = ALIGN(width, 32);
     // Currently surface padding is only computed for RGB* surfaces.
     if (format < 0x7) {
+        // Don't add any additional padding if debug.gralloc.map_fb_memory
+        // is enabled
+        char property[PROPERTY_VALUE_MAX];
+        if((property_get("debug.gralloc.map_fb_memory", property, NULL) > 0) &&
+           (!strncmp(property, "1", PROPERTY_VALUE_MAX ) ||
+           (!strncasecmp(property,"true", PROPERTY_VALUE_MAX )))) {
+              return stride;
+        }
+
         int bpp = 4;
         switch(format)
         {