commit 2178d4262c06210b27c51a04379d23d1368b2e8b
author Jason Sams <jsams@google.com> Tue Mar 24 15:51:27 2015 -0700
committer Jason Sams <jsams@google.com> Thu Mar 26 12:39:36 2015 -0700
tree 4d7d355d4d177bfea48aa9920e0362c2e754c5fd
parent 4efe3d38ee1d7b76c93a47ce6218b1f708fd4d9a

Fix 3d Adapter launches

Change-Id: If96073c8f9afc7f802dc866e1a08f2337c8fa159

driver/rsdAllocation.cpp

diff --git a/driver/rsdAllocation.cpp b/driver/rsdAllocation.cpp
index eb57760..3467086 100644
--- a/driver/rsdAllocation.cpp
+++ b/driver/rsdAllocation.cpp
@@ -482,9 +482,6 @@
         return;
     }
 
-    uint8_t * ptrA = (uint8_t *)base->getPointerUnchecked(alloc->mHal.state.originX, alloc->mHal.state.originY);
-    uint8_t * ptrB = (uint8_t *)base->getPointerUnchecked(0, 0);
-
     //ALOGE("rsdAllocationAdapterOffset  %p  %p", ptrA, ptrB);
     //ALOGE("rsdAllocationAdapterOffset  lodCount %i", alloc->mHal.drvState.lodCount);
 
@@ -492,9 +489,9 @@
     uint32_t lodCount = rsMax(alloc->mHal.drvState.lodCount, (uint32_t)1);
     for (uint32_t lod=0; lod < lodCount; lod++) {
         alloc->mHal.drvState.lod[lod] = base->mHal.drvState.lod[lod + lodBias];
-        alloc->mHal.drvState.lod[lod].mallocPtr =
-                ((uint8_t *)alloc->mHal.drvState.lod[lod].mallocPtr + (ptrA - ptrB));
-        //ALOGE("rsdAllocationAdapterOffset  lod  %p  %i %i", alloc->mHal.drvState.lod[lod].mallocPtr, alloc->mHal.drvState.lod[lod].dimX, alloc->mHal.drvState.lod[lod].dimY);
+        alloc->mHal.drvState.lod[lod].mallocPtr = GetOffsetPtr(alloc,
+                      alloc->mHal.state.originX, alloc->mHal.state.originY, alloc->mHal.state.originZ,
+                      lodBias, (RsAllocationCubemapFace)alloc->mHal.state.originFace);
     }
 }