commit 756f5cbc9bf9d042ec1dce6ba7991688e9bb0263
author Tim Murray <timmurray@google.com> Wed Nov 13 18:48:26 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 13 18:48:26 2013 -0800
tree 0eb5725295a41ab45eef61280691386fde6755a8
parent f29e2cf47c79fdbc3921dccfd78af868fe8ed1cb
parent d542f1ebdf6917c4e4bbdf6cb657583a8fe4bd01

am d542f1eb: am af79a593: Fix histogram intrinsic.

* commit 'd542f1ebdf6917c4e4bbdf6cb657583a8fe4bd01':
  Fix histogram intrinsic.

cpu_ref/rsCpuIntrinsicHistogram.cpp

diff --git a/cpu_ref/rsCpuIntrinsicHistogram.cpp b/cpu_ref/rsCpuIntrinsicHistogram.cpp
index 755e8d0..cdfe7d1 100644
--- a/cpu_ref/rsCpuIntrinsicHistogram.cpp
+++ b/cpu_ref/rsCpuIntrinsicHistogram.cpp
@@ -155,7 +155,7 @@
     for (uint32_t ct=0; ct < (256 * vSize); ct++) {
         o[ct] = mSums[ct];
         for (uint32_t t=1; t < threads; t++) {
-            o[ct] += mSums[ct + 256 * vSize];
+            o[ct] += mSums[ct + (256 * vSize * t)];
         }
     }
 }
@@ -291,7 +291,7 @@
 
 RsdCpuScriptIntrinsicHistogram::RsdCpuScriptIntrinsicHistogram(RsdCpuReferenceImpl *ctx,
                                                      const Script *s, const Element *e)
-            : RsdCpuScriptIntrinsic(ctx, s, e, RS_SCRIPT_INTRINSIC_ID_BLUR) {
+            : RsdCpuScriptIntrinsic(ctx, s, e, RS_SCRIPT_INTRINSIC_ID_HISTOGRAM) {
 
     mRootPtr = NULL;
     mSums = new int[256 * 4 * mCtx->getThreadCount()];