commit f51bfae5eeb631b9f63d4d724d9281a0de61f215
author Linux Build Service Account <lnxbuild@localhost> Tue Jan 08 18:08:13 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jan 08 18:08:13 2013 -0800
tree 2415ee444c531a0722bd09d6ee6e1223799f936b
parent 018b7d2925bad0b16b8625557755d4a10d16813c
parent 3d4c0ac4f2600ca28eb3229ed0c7b0e4c0408c3c

Merge "libgralloc: Add support for custom buffer size."

libgralloc/gpu.cpp

diff --git a/libgralloc/gpu.cpp b/libgralloc/gpu.cpp
index 7b2c1d8..f11a5fe 100644
--- a/libgralloc/gpu.cpp
+++ b/libgralloc/gpu.cpp
@@ -44,6 +44,7 @@
     common.module  = const_cast<hw_module_t*>(&module->base.common);
     common.close   = gralloc_close;
     alloc          = gralloc_alloc;
+    allocSize      = gralloc_alloc_size;
     free           = gralloc_free;
 
 }
@@ -236,7 +237,7 @@
 
     if ((ssize_t)size <= 0)
         return -EINVAL;
-    size = (bufferSize >= size)? bufferSize : size;
+    size = (bufferSize != 0)? bufferSize : size;
 
     // All buffers marked as protected or for external
     // display need to go to overlay