commit bf3c3f2ab1067b647038170cb201cdd1a9a1c6d2
author Alex Sakhartchouk <alexst@google.com> Thu Feb 02 09:47:26 2012 -0800
committer Alex Sakhartchouk <alexst@google.com> Thu Feb 02 09:47:26 2012 -0800
tree b5a9129e4c9e34d1f043058c0810fc0405b51340
parent bbf1bc8b6c3348265930ce08506efbbd3c5ab61f

Fix an incorrect assert that doesn't account for element array size.

Change-Id: Ibcb5c55d91967603391a1721137d010a85025990

libs/rs/rsAllocation.cpp

diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp
index 972e3d6..fd85b07 100644
--- a/libs/rs/rsAllocation.cpp
+++ b/libs/rs/rsAllocation.cpp
@@ -124,7 +124,8 @@
     }
 
     const Element * e = mHal.state.type->getElement()->getField(cIdx);
-    if (sizeBytes != e->getSizeBytes()) {
+    uint32_t elemArraySize = mHal.state.type->getElement()->getFieldArraySize(cIdx);
+    if (sizeBytes != e->getSizeBytes() * elemArraySize) {
         ALOGE("Error Allocation::subElementData data size %zu does not match field size %zu.", sizeBytes, e->getSizeBytes());
         rsc->setError(RS_ERROR_BAD_VALUE, "subElementData bad size.");
         return;
@@ -157,8 +158,8 @@
     }
 
     const Element * e = mHal.state.type->getElement()->getField(cIdx);
-
-    if (sizeBytes != e->getSizeBytes()) {
+    uint32_t elemArraySize = mHal.state.type->getElement()->getFieldArraySize(cIdx);
+    if (sizeBytes != e->getSizeBytes() * elemArraySize) {
         ALOGE("Error Allocation::subElementData data size %zu does not match field size %zu.", sizeBytes, e->getSizeBytes());
         rsc->setError(RS_ERROR_BAD_VALUE, "subElementData bad size.");
         return;