commit 01d3fd3318a767e6ba75492ed08d57896df95d63
author Naseer Ahmed <naseer@codeaurora.org> Sat Jul 14 21:08:13 2012 -0700
committer Brian Muramatsu <btmura@google.com> Mon Jul 23 12:39:29 2012 -0700
tree 75eb5e567c17f2aef27958efea94860de9b73e43
parent 0c8b7b5c841a7fad5df11b7e02d7cd792cfcc734

display: Clean up gralloc

* Remove pmem and ashmem implementations
* Remove usage of RefBase
* Reduce log verbosity

Change-Id: If8ef543d236e5305bd5430f4f9c62c51b3a13787

libcopybit/copybit_c2d.cpp

diff --git a/libcopybit/copybit_c2d.cpp b/libcopybit/copybit_c2d.cpp
index 72aa279..1fa08ec 100644
--- a/libcopybit/copybit_c2d.cpp
+++ b/libcopybit/copybit_c2d.cpp
@@ -49,7 +49,6 @@
 using gralloc::IMemAlloc;
 using gralloc::IonController;
 using gralloc::alloc_data;
-using android::sp;
 
 C2D_STATUS (*LINK_c2dCreateSurface)( uint32 *surface_id,
                                      uint32 surface_bits,
@@ -110,7 +109,7 @@
     FLAGS_YUV_DESTINATION     = 1<<1
 };
 
-static android::sp<gralloc::IAllocController> sAlloc = 0;
+static gralloc::IAllocController* sAlloc = 0;
 /******************************************************************************/
 
 /** State information for each device instance */
@@ -922,7 +921,7 @@
     int allocFlags = GRALLOC_USAGE_PRIVATE_SYSTEM_HEAP;
 
     if (sAlloc == 0) {
-        sAlloc = gralloc::IAllocController::getInstance(false);
+        sAlloc = gralloc::IAllocController::getInstance();
     }
 
     if (sAlloc == 0) {
@@ -930,7 +929,7 @@
         return COPYBIT_FAILURE;
     }
 
-    int err = sAlloc->allocate(data, allocFlags, 0);
+    int err = sAlloc->allocate(data, allocFlags);
     if (0 != err) {
         ALOGE("%s: allocate failed", __FUNCTION__);
         return COPYBIT_FAILURE;
@@ -944,7 +943,7 @@
 static void free_temp_buffer(alloc_data &data)
 {
     if (-1 != data.fd) {
-        sp<IMemAlloc> memalloc = sAlloc->getAllocator(data.allocType);
+        IMemAlloc* memalloc = sAlloc->getAllocator(data.allocType);
         memalloc->free_buffer(data.base, data.size, 0, data.fd);
     }
 }
@@ -1163,7 +1162,7 @@
         copy_image((private_handle_t *)src->handle, &src_image, CONVERT_TO_C2D_FORMAT);
 
         // Flush the cache
-        sp<IMemAlloc> memalloc = sAlloc->getAllocator(src_hnd->flags);
+        IMemAlloc* memalloc = sAlloc->getAllocator(src_hnd->flags);
         if (memalloc->clean_buffer((void *)(src_hnd->base), src_hnd->size,
                                    src_hnd->offset, src_hnd->fd)) {
             ALOGE("%s: clean_buffer failed", __FUNCTION__);
@@ -1234,7 +1233,7 @@
         // copy the temp. destination without the alignment to the actual destination.
         copy_image(dst_hnd, dst, CONVERT_TO_ANDROID_FORMAT);
         // Invalidate the cache.
-        sp<IMemAlloc> memalloc = sAlloc->getAllocator(dst_hnd->flags);
+        IMemAlloc* memalloc = sAlloc->getAllocator(dst_hnd->flags);
         memalloc->clean_buffer((void *)(dst_hnd->base), dst_hnd->size,
                                dst_hnd->offset, dst_hnd->fd);
     }