commit 9d8e5af146326250ebc1e9b3c93402bd0e7669bb
author Jason Sams <jsams@google.com> Thu Feb 28 14:00:08 2013 -0800
committer Jason Sams <jsams@google.com> Thu Feb 28 14:00:08 2013 -0800
tree 6361a4a7c55203a11bba97fee930853af0bafb90
parent 5261a5ea546ff358edd5aac7602fc4132434f481

Fix bug introduced with IO_INPUT.

YUV allocations were calculating the wrong allocation size.

Change-Id: Iecca4f1d300aca93a34b744d8589e53105109480

driver/rsdAllocation.cpp

diff --git a/driver/rsdAllocation.cpp b/driver/rsdAllocation.cpp
index 28d8aad..ed27dca 100644
--- a/driver/rsdAllocation.cpp
+++ b/driver/rsdAllocation.cpp
@@ -241,9 +241,10 @@
 #endif
 }
 
-static void DeriveYUVLayout(int yuv, Allocation::Hal::DrvState *state) {
+static size_t DeriveYUVLayout(int yuv, Allocation::Hal::DrvState *state) {
     // YUV only supports basic 2d
     // so we can stash the plane pointers in the mipmap levels.
+    size_t uvSize = 0;
     switch(yuv) {
     case HAL_PIXEL_FORMAT_YV12:
         state->lod[1].dimX = state->lod[0].dimX / 2;
@@ -251,12 +252,14 @@
         state->lod[1].stride = rsRound(state->lod[0].stride >> 1, 16);
         state->lod[1].mallocPtr = ((uint8_t *)state->lod[0].mallocPtr) +
                 (state->lod[0].stride * state->lod[0].dimY);
+        uvSize += state->lod[1].stride * state->lod[1].dimY;
 
         state->lod[2].dimX = state->lod[1].dimX;
         state->lod[2].dimY = state->lod[1].dimY;
         state->lod[2].stride = state->lod[1].stride;
         state->lod[2].mallocPtr = ((uint8_t *)state->lod[1].mallocPtr) +
                 (state->lod[1].stride * state->lod[1].dimY);
+        uvSize += state->lod[2].stride * state->lod[2].dimY;
 
         state->lodCount = 3;
         break;
@@ -266,11 +269,13 @@
         state->lod[1].stride = state->lod[0].stride;
         state->lod[1].mallocPtr = ((uint8_t *)state->lod[0].mallocPtr) +
                 (state->lod[0].stride * state->lod[0].dimY);
+        uvSize += state->lod[1].stride * state->lod[1].dimY;
         state->lodCount = 2;
         break;
     default:
         rsAssert(0);
     }
+    return uvSize;
 }
 
 
@@ -308,7 +313,7 @@
             if (tz > 1) tz >>= 1;
         }
     } else if (alloc->mHal.state.yuv) {
-        DeriveYUVLayout(alloc->mHal.state.yuv, &alloc->mHal.drvState);
+        o += DeriveYUVLayout(alloc->mHal.state.yuv, &alloc->mHal.drvState);
 
         for (uint32_t ct = 1; ct < alloc->mHal.drvState.lodCount; ct++) {
             offsets[ct] = (size_t)alloc->mHal.drvState.lod[ct].mallocPtr;