commit b0abb140ac51b93d1a85aadaa63fe057f2d29850
author David Gross <dgross@google.com> Thu Mar 12 15:23:03 2015 -0700
committer David Gross <dgross@google.com> Mon Mar 16 11:18:38 2015 -0700
tree 5575d076799366905301a9bc75b5bb7a98a97d78
parent 958d8b23ac969d13ea3da0a2d9a355f5951afa8c

Pass RsExpandKernelDriverInfo not RsExpandKernelParams.

Which is to say: retire RsExpandKernelParams and pass RsExpandKernelDriverInfo
directly to kernel wrapper functions instead.

Requires related change in frameworks/compile/libbcc.

Change-Id: I453f45ec18f389e88e27fcfa57ddf245d077cb98

cpu_ref/rsCpuCore.cpp

diff --git a/cpu_ref/rsCpuCore.cpp b/cpu_ref/rsCpuCore.cpp
index 2492c22..f164517 100644
--- a/cpu_ref/rsCpuCore.cpp
+++ b/cpu_ref/rsCpuCore.cpp
@@ -49,7 +49,7 @@
 using namespace android::renderscript;
 
 typedef void (*outer_foreach_t)(
-    const android::renderscript::RsExpandKernelParams *,
+    const RsExpandKernelDriverInfo *,
     uint32_t x1, uint32_t x2, uint32_t outstep);
 
 
@@ -348,28 +348,6 @@
                             RsExpandKernelDriverInfo,
                             outer_foreach_t);
 
-static void kparamSetup(RsExpandKernelParams *kparams, const RsExpandKernelDriverInfo *fep) {
-    //ALOGE("kp  usr %p", fep->usr);
-    //ALOGE("kp  slot %i", fep->slot);
-    //ALOGE("kp  dim %i %i %i", fep->dim.x, fep->dim.y, fep->dim.z);
-    //ALOGE("kp  lid %i", fep->lid);
-    //ALOGE("kp  in[0] stide %i  ptr %p", fep->inStride[0], fep->inPtr[0]);
-    //ALOGE("kp  out[0] ptr %p", fep->outPtr[0]);
-    //ALOGE("kp  loc %i %i %i", fep->current.x, fep->current.y, fep->current.z);
-
-    kparams->usr  = fep->usr;
-    kparams->slot = fep->slot;
-    kparams->dimX = fep->dim.x;
-    kparams->dimY = fep->dim.y;
-    kparams->dimZ = fep->dim.z;
-    kparams->lid = fep->lid;
-    kparams->inEStrides = (uint32_t *)&fep->inStride[0];
-    kparams->ins = (const void **)&fep->inPtr[0];
-    kparams->out = fep->outPtr[0];
-    kparams->y = fep->current.y;
-    kparams->z = fep->current.z;
-}
-
 static inline void FepPtrSetup(const MTLaunchStruct *mtls, RsExpandKernelDriverInfo *fep,
                                uint32_t x, uint32_t y,
                                uint32_t z = 0, uint32_t lod = 0,
@@ -436,9 +414,7 @@
                         mtls->fep.current.array[0], mtls->fep.current.array[1],
                         mtls->fep.current.array[2], mtls->fep.current.array[3]);
 
-            RsExpandKernelParams kparams;
-            kparamSetup(&kparams, &mtls->fep);
-            fn(&kparams, mtls->start.x, mtls->end.x, mtls->fep.outStride[0]);
+            fn(&mtls->fep, mtls->start.x, mtls->end.x, mtls->fep.outStride[0]);
         }
     }
 
@@ -464,10 +440,7 @@
         for (fep.current.y = yStart; fep.current.y < yEnd; fep.current.y++) {
             FepPtrSetup(mtls, &fep, mtls->start.x, fep.current.y);
 
-            RsExpandKernelParams kparams;
-            kparamSetup(&kparams, &fep);
-
-            fn(&kparams, mtls->start.x, mtls->end.x, fep.outStride[0]);
+            fn(&fep, mtls->start.x, mtls->end.x, fep.outStride[0]);
         }
     }
 }
@@ -491,10 +464,7 @@
 
         FepPtrSetup(mtls, &fep, xStart, 0);
 
-        RsExpandKernelParams kparams;
-        kparamSetup(&kparams, &fep);
-
-        fn(&kparams, xStart, xEnd, fep.outStride[0]);
+        fn(&fep, xStart, xEnd, fep.outStride[0]);
     }
 }
 
@@ -579,9 +549,7 @@
                             mtls->fep.current.array[0], mtls->fep.current.array[1],
                             mtls->fep.current.array[2], mtls->fep.current.array[3]);
 
-                RsExpandKernelParams kparams;
-                kparamSetup(&kparams, &mtls->fep);
-                fn(&kparams, mtls->start.x, mtls->end.x, mtls->fep.outStride[0]);
+                fn(&mtls->fep, mtls->start.x, mtls->end.x, mtls->fep.outStride[0]);
             }
         }
     }