From cf8cd79a6e480ef1b92cab2a113c1192de5d623f Mon Sep 17 00:00:00 2001 From: Yang Ni Date: Fri, 29 Apr 2016 15:19:25 -0700 Subject: 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 --- support/jni/android_renderscript_RenderScript.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'support') 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, -- cgit v1.2.3