commit f8e9c43ca2edef05fcf8bb6d677a1d66937144aa
author Naseer Ahmed <naseer@codeaurora.org> Tue Jun 13 17:45:12 2017 -0400
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jun 19 11:07:43 2017 -0700
tree 404cdb7018c95733e1945bb84e7a76afd767ac6b
parent 0518de7f7f6a35d72ec86d7a3997706846e15d27

gralloc1: Align buffer size for each layer

Align the per layer buffer size instead of the total size.

Change-Id: I114fe6b9e0b40ce6cf92fcb32559ed01b94527e4

libgralloc1/gr_buf_mgr.cpp

diff --git a/libgralloc1/gr_buf_mgr.cpp b/libgralloc1/gr_buf_mgr.cpp
index 7e0ba14..767a4e9 100644
--- a/libgralloc1/gr_buf_mgr.cpp
+++ b/libgralloc1/gr_buf_mgr.cpp
@@ -497,14 +497,14 @@
   BufferInfo info = GetBufferInfo(descriptor);
   GetBufferSizeAndDimensions(info, &size, &alignedw, &alignedh);
   size = (bufferSize >= size) ? bufferSize : size;
-  size = size * layer_count;
 
   int err = 0;
   int flags = 0;
   auto page_size = UINT(getpagesize());
   AllocData data;
   data.align = GetDataAlignment(format, prod_usage, cons_usage);
-  data.size = ALIGN(size, data.align);
+  size = ALIGN(size, data.align) * layer_count;
+  data.size = size;
   data.handle = (uintptr_t) handle;
   data.uncached = allocator_->UseUncached(prod_usage, cons_usage);