summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorYang Ni <yangni@google.com>2016-05-02 15:54:08 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-02 15:54:08 +0000
commita87bdeaaecbc3265bcc731291557163f2270edad (patch)
treeeaee94a93f4b1d22a80f468c309ff35fa04c00ff /support
parentffdde8030b344c38abfc5e91a373d49f20f2894c (diff)
parentcf8cd79a6e480ef1b92cab2a113c1192de5d623f (diff)
downloadrs-a87bdeaaecbc3265bcc731291557163f2270edad.tar.gz
Merge "Zero-initialize launch option fields" am: 9d4584b907
am: b3ea343725 * commit 'b3ea3437255b1c50b9be95de30f87b1b0ea15289': Zero-initialize launch option fields Change-Id: I13d5d1820127ec5db81de73eba7e921efa662486
Diffstat (limited to 'support')
-rw-r--r--support/jni/android_renderscript_RenderScript.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/support/jni/android_renderscript_RenderScript.cpp b/support/jni/android_renderscript_RenderScript.cpp
index fcb4289c..78de8d5b 100644
--- a/support/jni/android_renderscript_RenderScript.cpp
+++ b/support/jni/android_renderscript_RenderScript.cpp
@@ -1589,6 +1589,12 @@ nScriptForEachClipped(JNIEnv *_env, jobject _this, jlong con, jlong incCon,
sc.strategy = RS_FOR_EACH_STRATEGY_DONT_CARE;
sc.arrayStart = 0;
sc.arrayEnd = 0;
+ sc.array2Start = 0;
+ sc.array2End = 0;
+ sc.array3Start = 0;
+ sc.array3End = 0;
+ sc.array4Start = 0;
+ sc.array4End = 0;
if (mUseInc) {
dispatchTab.ContextFinish((RsContext)con);
dispatchTabInc.ScriptForEach((RsContext)incCon, (RsScript)script, slot,
@@ -1620,6 +1626,12 @@ nScriptForEachClippedV(JNIEnv *_env, jobject _this, jlong con, jlong incCon,
sc.strategy = RS_FOR_EACH_STRATEGY_DONT_CARE;
sc.arrayStart = 0;
sc.arrayEnd = 0;
+ sc.array2Start = 0;
+ sc.array2End = 0;
+ sc.array3Start = 0;
+ sc.array3End = 0;
+ sc.array4Start = 0;
+ sc.array4End = 0;
if (mUseInc) {
dispatchTab.ContextFinish((RsContext)con);
dispatchTabInc.ScriptForEach((RsContext)incCon, (RsScript)script, slot,