commit 179e9a457095fea4c9e6d366c269754b882d05dd
author Jason Sams <jsams@google.com> Wed Nov 23 15:02:15 2011 -0800
committer Jason Sams <jsams@google.com> Wed Nov 23 15:02:15 2011 -0800
tree c2e0d870a8c9795769239db6e81bf637956a19bf
parent a3dcb4963f342893fac17293251e33ad32d2f02e

Private API to support MFF transition.

Change-Id: I17cc9dc46eb37e4397428ba64305b0fd8ed3ae81

driver/rsdAllocation.cpp

diff --git a/driver/rsdAllocation.cpp b/driver/rsdAllocation.cpp
index e79cd0f..e072dab 100644
--- a/driver/rsdAllocation.cpp
+++ b/driver/rsdAllocation.cpp
@@ -212,10 +212,13 @@
         return false;
     }
 
-    void * ptr = malloc(alloc->mHal.state.type->getSizeBytes());
+    void * ptr = alloc->mHal.state.usrPtr;
     if (!ptr) {
-        free(drv);
-        return false;
+        ptr = malloc(alloc->mHal.state.type->getSizeBytes());
+        if (!ptr) {
+            free(drv);
+            return false;
+        }
     }
 
     drv->glTarget = GL_NONE;
@@ -269,7 +272,7 @@
         drv->renderTargetID = 0;
     }
 
-    if (drv->mallocPtr) {
+    if (drv->mallocPtr && !alloc->mHal.state.usrPtr) {
         free(drv->mallocPtr);
         drv->mallocPtr = NULL;
     }