summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorYang Ni <yangni@google.com>2016-04-29 15:19:25 -0700
committerYang Ni <yangni@google.com>2016-04-29 15:22:59 -0700
commitb9493edce485263c3ae9b1f648715ed19dc55da2 (patch)
treee49c63bfb35b1d775a1b59604f8bb4005035c540 /support
parent3533e266fcb0650a8c9c06426d21a366584afdf9 (diff)
downloadrs-b9493edce485263c3ae9b1f648715ed19dc55da2.tar.gz
Zero-initialize launch option fields
Bug: 28463187 If left unintialized, these fields will fail checks in setUpMtlsDiemensions() in rsCpuScript.cpp (if targetAPI >= 23). Change-Id: I143bfcd052a7b799801bf5fbf2b1bae13ca4a671
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 ed8d5ee2..134b3b04 100644
--- a/support/jni/android_renderscript_RenderScript.cpp
+++ b/support/jni/android_renderscript_RenderScript.cpp
@@ -1576,6 +1576,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,
@@ -1607,6 +1613,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,