commit 57d9d6cbb505dc4109d54962b71144111ad12777
author Tim Murray <timmurray@google.com> Tue Oct 23 22:21:17 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 23 22:21:18 2012 -0700
tree 18c33aa99975d1193db887e13aa5e4af6e840cdf
parent 2e5ef66f7d88e2f85bbc4f97edf1ed0b6edbaac7
parent 0c66f0795ad0b45934502820df6d718b9096edfa

Merge "Move runtime loading into a separate helper function."

driver/rsdIntrinsicBlend.cpp

diff --git a/driver/rsdIntrinsicBlend.cpp b/driver/rsdIntrinsicBlend.cpp
index 22ad108..c35c379 100644
--- a/driver/rsdIntrinsicBlend.cpp
+++ b/driver/rsdIntrinsicBlend.cpp
@@ -103,9 +103,6 @@
     uint32_t x1 = xstart;
     uint32_t x2 = xend;
 
-    in += xstart;
-    out += xstart;
-
     switch (p->slot) {
     case BLEND_CLEAR:
         for (;x1 < x2; x1++, out++) {

driver/rsdIntrinsicBlur.cpp

diff --git a/driver/rsdIntrinsicBlur.cpp b/driver/rsdIntrinsicBlur.cpp
index 9c1fe68..b67e8d5 100644
--- a/driver/rsdIntrinsicBlur.cpp
+++ b/driver/rsdIntrinsicBlur.cpp
@@ -126,7 +126,7 @@
 #endif
 
     while(x2 > x1) {
-        const uchar *pi = ptrIn + x1 * 4;
+        const uchar *pi = ptrIn;
         float4 blurredPixel = 0;
         const float* gp = gPtr;
 

driver/rsdIntrinsicColorMatrix.cpp

diff --git a/driver/rsdIntrinsicColorMatrix.cpp b/driver/rsdIntrinsicColorMatrix.cpp
index 8f6c70c..cfe0333 100644
--- a/driver/rsdIntrinsicColorMatrix.cpp
+++ b/driver/rsdIntrinsicColorMatrix.cpp
@@ -97,9 +97,6 @@
     uint32_t x1 = xstart;
     uint32_t x2 = xend;
 
-    in += xstart;
-    out += xstart;
-
     if(x2 > x1) {
 #if defined(ARCH_ARM_HAVE_NEON)
         int32_t len = (x2 - x1) >> 2;

driver/rsdIntrinsicLUT.cpp

diff --git a/driver/rsdIntrinsicLUT.cpp b/driver/rsdIntrinsicLUT.cpp
index a75534e..818a132 100644
--- a/driver/rsdIntrinsicLUT.cpp
+++ b/driver/rsdIntrinsicLUT.cpp
@@ -44,9 +44,6 @@
     uint32_t x1 = xstart;
     uint32_t x2 = xend;
 
-    in += xstart;
-    out += xstart;
-
     DrvAllocation *din = (DrvAllocation *)cp->lut->mHal.drv;
     const uchar *tr = (const uchar *)din->lod[0].mallocPtr;
     const uchar *tg = &tr[256];