commit 60c2796d821d9296003d4e5db025f8734d971a71
author Tim Murray <timmurray@google.com> Thu Feb 07 16:15:23 2013 -0800
committer Tim Murray <timmurray@google.com> Thu Feb 07 16:15:23 2013 -0800
tree 9c75aa3573b944d298a5e14f23446aed9d7bdc10
parent d4ecb17adc9b099351f2ca1779a74f5283f20a3d

Remove unstrided 2D copies.

Change-Id: I31744f1d5a92fe267aab5275950c9701d417bc36

rsAdapter.cpp

diff --git a/rsAdapter.cpp b/rsAdapter.cpp
index 13a728f..9fd39f8 100644
--- a/rsAdapter.cpp
+++ b/rsAdapter.cpp
@@ -38,7 +38,7 @@
 }
 
 void Adapter1D::data(Context *rsc, uint32_t x, uint32_t count, const void *data, size_t sizeBytes) {
-    mAllocation->data(rsc, x, mY, mLOD, mFace, count, 1, data, sizeBytes);
+    mAllocation->data(rsc, x, mY, mLOD, mFace, count, 1, data, sizeBytes, 0);
 }
 
 void Adapter1D::serialize(Context *rsc, OStream *stream) const {
@@ -110,7 +110,7 @@
 
 void Adapter2D::data(Context *rsc, uint32_t x, uint32_t y, uint32_t w, uint32_t h,
                      const void *data, size_t sizeBytes) {
-    mAllocation->data(rsc, x, y, mLOD, mFace, w, h, data, sizeBytes);
+    mAllocation->data(rsc, x, y, mLOD, mFace, w, h, data, sizeBytes, 0);
 }
 
 

rsAllocation.cpp

diff --git a/rsAllocation.cpp b/rsAllocation.cpp
index 80a40d8..b215dba 100644
--- a/rsAllocation.cpp
+++ b/rsAllocation.cpp
@@ -87,27 +87,7 @@
 }
 
 void Allocation::data(Context *rsc, uint32_t xoff, uint32_t yoff, uint32_t lod, RsAllocationCubemapFace face,
-                      uint32_t w, uint32_t h, const void *data, size_t sizeBytes) {
-
-    const size_t eSize = mHal.state.elementSizeBytes;
-    const size_t lineSize = eSize * w;
-
-    if ((lineSize * h) != sizeBytes) {
-        ALOGE("Allocation size mismatch, expected %zu, got %zu", (lineSize * h), sizeBytes);
-        rsAssert(!"Allocation::subData called with mismatched size");
-        return;
-    }
-
-    this->data(rsc, xoff, yoff, lod, face, w, h, data, sizeBytes, lineSize);
-}
-
-void Allocation::data(Context *rsc, uint32_t xoff, uint32_t yoff, uint32_t lod, RsAllocationCubemapFace face,
                       uint32_t w, uint32_t h, const void *data, size_t sizeBytes, size_t stride) {
-    const size_t eSize = mHal.state.elementSizeBytes;
-    const size_t lineSize = eSize * w;
-
-    //ALOGE("data2d %p,  %i %i %i %i %i %i %p %i", this, xoff, yoff, lod, face, w, h, data, sizeBytes);
-
     rsc->mHal.funcs.allocation.data2D(rsc, this, xoff, yoff, lod, face, w, h, data, sizeBytes, stride);
     sendDirty(rsc);
 }
@@ -597,7 +577,7 @@
     }
 
     texAlloc->data(rsc, 0, 0, 0, RS_ALLOCATION_CUBEMAP_FACE_POSITIVE_X,
-                   t->getDimX(), t->getDimY(), data, sizeBytes);
+                   t->getDimX(), t->getDimY(), data, sizeBytes, 0);
     if (mips == RS_ALLOCATION_MIPMAP_FULL) {
         rsc->mHal.funcs.allocation.generateMipmaps(rsc, texAlloc);
     }
@@ -629,7 +609,7 @@
     for (uint32_t face = 0; face < 6; face ++) {
         for (uint32_t dI = 0; dI < faceSize; dI ++) {
             texAlloc->data(rsc, 0, dI, 0, (RsAllocationCubemapFace)face,
-                           t->getDimX(), 1, sourcePtr + strideBytes * dI, copySize);
+                           t->getDimX(), 1, sourcePtr + strideBytes * dI, copySize, 0);
         }
 
         // Move the data pointer to the next cube face