am 78b050ea: Fix bugs in scriptGroup.

* commit '78b050ea1e13108110ce3b8ead63252e5ebe2468':
  Fix bugs in scriptGroup.

9 files changed, 20 insertions, 17 deletions

diff --git a/driver/rsdBcc.cpp b/driver/rsdBcc.cpp
index 8273697d..e616afd9 100644
--- a/driver/rsdBcc.cpp
+++ b/driver/rsdBcc.cpp
@@ -522,10 +522,7 @@ void rsdScriptSetGlobalBind(const Context *dc, const Script *script, uint32_t sl
     //rsAssert(!script->mFieldIsObject[slot]);
     //ALOGE("setGlobalBind %p %p %i %p", dc, script, slot, data);
 
-    if (drv->mIntrinsicID) {
-        drv->mIntrinsicFuncs.bind(dc, script, drv->mIntrinsicData, slot, data);
-        return;
-    }
+    rsAssert(!drv->mIntrinsicID);
 
     int32_t *destPtr = reinterpret_cast<int32_t *>(
                           drv->mExecutable->getExportVarAddrs()[slot]);
@@ -548,6 +545,12 @@ void rsdScriptSetGlobalObj(const Context *dc, const Script *script, uint32_t slo
     //rsAssert(script->mFieldIsObject[slot]);
     //ALOGE("setGlobalObj %p %p %i %p", dc, script, slot, data);
 
+    if (drv->mIntrinsicID) {
+        drv->mIntrinsicFuncs.setVarObj(dc, script, drv->mIntrinsicData, slot,
+                                       static_cast<Allocation *>(data));
+        return;
+    }
+
     int32_t *destPtr = reinterpret_cast<int32_t *>(
                           drv->mExecutable->getExportVarAddrs()[slot]);
     if (!destPtr) {
diff --git a/driver/rsdBcc.h b/driver/rsdBcc.h
index a99a0628..ab62f14b 100644
--- a/driver/rsdBcc.h
+++ b/driver/rsdBcc.h
@@ -99,10 +99,10 @@ typedef void (*outer_foreach_t)(
 
 typedef struct RsdIntriniscFuncs_rec {
 
-    void (*bind)(const android::renderscript::Context *dc,
-                 const android::renderscript::Script *script,
-                 void * intrinsicData,
-                 uint32_t slot, android::renderscript::Allocation *data);
+    void (*setVarObj)(const android::renderscript::Context *dc,
+                      const android::renderscript::Script *script,
+                      void * intrinsicData,
+                      uint32_t slot, android::renderscript::Allocation *data);
     void (*setVar)(const android::renderscript::Context *dc,
                    const android::renderscript::Script *script,
                    void * intrinsicData,
diff --git a/driver/rsdIntrinsicBlur.cpp b/driver/rsdIntrinsicBlur.cpp
index 04ab57b5..9c1fe685 100644
--- a/driver/rsdIntrinsicBlur.cpp
+++ b/driver/rsdIntrinsicBlur.cpp
@@ -213,7 +213,7 @@ void * rsdIntrinsic_InitBlur(const android::renderscript::Context *dc,
                                     RsdIntriniscFuncs_t *funcs) {
 
     script->mHal.info.exportedVariableCount = 2;
-    funcs->bind = Blur_Bind;
+    funcs->setVarObj = Blur_Bind;
     funcs->setVar = Blur_SetVar;
     funcs->root = Blur_uchar4;
 
diff --git a/driver/rsdIntrinsicConvolve3x3.cpp b/driver/rsdIntrinsicConvolve3x3.cpp
index fda82820..55f4360e 100644
--- a/driver/rsdIntrinsicConvolve3x3.cpp
+++ b/driver/rsdIntrinsicConvolve3x3.cpp
@@ -123,7 +123,7 @@ void * rsdIntrinsic_InitConvolve3x3(const android::renderscript::Context *dc,
                                     RsdIntriniscFuncs_t *funcs) {
 
     script->mHal.info.exportedVariableCount = 2;
-    funcs->bind = Convolve3x3_Bind;
+    funcs->setVarObj = Convolve3x3_Bind;
     funcs->setVar = Convolve3x3_SetVar;
     funcs->root = Convolve3x3_uchar4;
 
diff --git a/driver/rsdIntrinsicConvolve5x5.cpp b/driver/rsdIntrinsicConvolve5x5.cpp
index 2f16a960..fc6b029e 100644
--- a/driver/rsdIntrinsicConvolve5x5.cpp
+++ b/driver/rsdIntrinsicConvolve5x5.cpp
@@ -152,7 +152,7 @@ void * rsdIntrinsic_InitConvolve5x5(const android::renderscript::Context *dc,
                                     RsdIntriniscFuncs_t *funcs) {
 
     script->mHal.info.exportedVariableCount = 2;
-    funcs->bind = Convolve5x5_Bind;
+    funcs->setVarObj = Convolve5x5_Bind;
     funcs->setVar = Convolve5x5_SetVar;
     funcs->root = Convolve5x5_uchar4;
 
diff --git a/driver/rsdIntrinsicLUT.cpp b/driver/rsdIntrinsicLUT.cpp
index 298d4d43..a75534ed 100644
--- a/driver/rsdIntrinsicLUT.cpp
+++ b/driver/rsdIntrinsicLUT.cpp
@@ -68,7 +68,7 @@ void * rsdIntrinsic_InitLUT(const android::renderscript::Context *dc,
                                     RsdIntriniscFuncs_t *funcs) {
 
     script->mHal.info.exportedVariableCount = 1;
-    funcs->bind = LUT_Bind;
+    funcs->setVarObj = LUT_Bind;
     funcs->root = LUT_uchar4;
     ConvolveParams *cp = (ConvolveParams *)calloc(1, sizeof(ConvolveParams));
     return cp;
diff --git a/driver/rsdIntrinsicYuvToRGB.cpp b/driver/rsdIntrinsicYuvToRGB.cpp
index ab3e7f27..b3fb0596 100644
--- a/driver/rsdIntrinsicYuvToRGB.cpp
+++ b/driver/rsdIntrinsicYuvToRGB.cpp
@@ -130,7 +130,7 @@ void * rsdIntrinsic_InitYuvToRGB(const android::renderscript::Context *dc,
                                  RsdIntriniscFuncs_t *funcs) {
 
     script->mHal.info.exportedVariableCount = 1;
-    funcs->bind = YuvToRGB_Bind;
+    funcs->setVarObj = YuvToRGB_Bind;
     funcs->root = YuvToRGB_uchar4;
     YuvParams *cp = (YuvParams *)calloc(1, sizeof(YuvParams));
     return cp;
diff --git a/driver/rsdIntrinsics.cpp b/driver/rsdIntrinsics.cpp
index 348bcf19..0f747faa 100644
--- a/driver/rsdIntrinsics.cpp
+++ b/driver/rsdIntrinsics.cpp
@@ -30,8 +30,8 @@ void * rsdIntrinsic_InitLUT(const Context *, Script *, RsdIntriniscFuncs_t *);
 void * rsdIntrinsic_InitYuvToRGB(const Context *, Script *, RsdIntriniscFuncs_t *);
 void * rsdIntrinsic_InitBlend(const Context *, Script *, RsdIntriniscFuncs_t *);
 
-static void Bind(const Context *, const Script *, void *, uint32_t, Allocation *) {
-    rsAssert(!"Intrinsic_Bind unexpectedly called");
+static void SetVarObj(const Context *, const Script *, void *, uint32_t, Allocation *) {
+    rsAssert(!"Intrinsic_SetVarObj unexpectedly called");
 }
 
 static void SetVar(const Context *, const Script *, void *, uint32_t, void *, size_t) {
@@ -47,7 +47,7 @@ void * rsdIntrinsic_Init(const android::renderscript::Context *dc,
                        RsScriptIntrinsicID iid,
                        RsdIntriniscFuncs_t *funcs) {
 
-    funcs->bind = Bind;
+    funcs->setVarObj = SetVarObj;
     funcs->setVar = SetVar;
     funcs->destroy = Destroy;
 
diff --git a/driver/rsdScriptGroup.cpp b/driver/rsdScriptGroup.cpp
index 1eb3d651..b19678dc 100644
--- a/driver/rsdScriptGroup.cpp
+++ b/driver/rsdScriptGroup.cpp
@@ -63,7 +63,7 @@ void rsdScriptGroupExecute(const android::renderscript::Context *rsc,
         for (size_t ct2=0; ct2 < n->mInputs.size(); ct2++) {
             if (n->mInputs[ct2]->mDstField.get() && n->mInputs[ct2]->mDstField->mScript) {
                 //ALOGE("field %p %zu", n->mInputs[ct2]->mDstField->mScript, n->mInputs[ct2]->mDstField->mSlot);
-                s->setSlot(n->mInputs[ct2]->mDstField->mSlot, n->mInputs[ct2]->mAlloc.get());
+                s->setVarObj(n->mInputs[ct2]->mDstField->mSlot, n->mInputs[ct2]->mAlloc.get());
             }
         }