commit db6ab83c87945b366b054f6473cfe849a9357e59
author Linux Build Service Account <lnxbuild@quicinc.com> Wed Aug 30 00:06:07 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Aug 30 00:06:07 2017 -0700
tree 063f17099cbd0ea92b5b993daedc3697a3409db6
parent a359878186dda8d8a520f69bd0dda2228d2d83e8
parent 95dc2884f57fa0450d718e73e62fa261c4a05877

Merge "gralloc1: Use implementation defined format at allocate"

libgralloc1/gr_buf_mgr.cpp

diff --git a/libgralloc1/gr_buf_mgr.cpp b/libgralloc1/gr_buf_mgr.cpp
index 64ff861..3c00ca7 100644
--- a/libgralloc1/gr_buf_mgr.cpp
+++ b/libgralloc1/gr_buf_mgr.cpp
@@ -452,17 +452,15 @@
   if (!handle)
     return -EINVAL;
 
-  int format = descriptor.GetFormat();
   gralloc1_producer_usage_t prod_usage = descriptor.GetProducerUsage();
   gralloc1_consumer_usage_t cons_usage = descriptor.GetConsumerUsage();
+  int format = allocator_->GetImplDefinedFormat(prod_usage, cons_usage, descriptor.GetFormat());
   uint32_t layer_count = descriptor.GetLayerCount();
 
-  // Get implementation defined format
-  int gralloc_format = allocator_->GetImplDefinedFormat(prod_usage, cons_usage, format);
-
   unsigned int size;
   unsigned int alignedw, alignedh;
-  int buffer_type = GetBufferType(gralloc_format);
+
+  int buffer_type = GetBufferType(format);
   BufferInfo info = GetBufferInfo(descriptor);
   GetBufferSizeAndDimensions(info, &size, &alignedw, &alignedh);
   size = (bufferSize >= size) ? bufferSize : size;