diff options
| author | Miao Wang <miaowang@google.com> | 2015-10-12 16:46:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-12 16:46:55 +0000 |
| commit | c4c42d55f0c1a4130da7e8f70a2338a4282b3ae5 (patch) | |
| tree | 6b27fbc2147abf08e2f5f690db4c7c349293e300 | |
| parent | fe9c950a49a9bcdb9e35f709a7d1fffad58aa414 (diff) | |
| parent | d22b9b77577e305e5fb5b3794df2b13e949e6212 (diff) | |
| download | frameworks_base-c4c42d55f0c1a4130da7e8f70a2338a4282b3ae5.zip frameworks_base-c4c42d55f0c1a4130da7e8f70a2338a4282b3ae5.tar.gz frameworks_base-c4c42d55f0c1a4130da7e8f70a2338a4282b3ae5.tar.bz2 | |
Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index ffc4fd8..2bc48e4 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -611,7 +611,7 @@ nScriptIntrinsicBLAS_Double(JNIEnv *_env, jobject _this, jlong con, jlong id, ji in_allocs[2] = (RsAllocation)C; rsScriptForEachMulti((RsContext)con, (RsScript)id, 0, - in_allocs, sizeof(in_allocs), nullptr, + in_allocs, NELEM(in_allocs), nullptr, &call, sizeof(call), nullptr, 0); } @@ -646,7 +646,7 @@ nScriptIntrinsicBLAS_Complex(JNIEnv *_env, jobject _this, jlong con, jlong id, j in_allocs[2] = (RsAllocation)C; rsScriptForEachMulti((RsContext)con, (RsScript)id, 0, - in_allocs, sizeof(in_allocs), nullptr, + in_allocs, NELEM(in_allocs), nullptr, &call, sizeof(call), nullptr, 0); } @@ -681,7 +681,7 @@ nScriptIntrinsicBLAS_Z(JNIEnv *_env, jobject _this, jlong con, jlong id, jint fu in_allocs[2] = (RsAllocation)C; rsScriptForEachMulti((RsContext)con, (RsScript)id, 0, - in_allocs, sizeof(in_allocs), nullptr, + in_allocs, NELEM(in_allocs), nullptr, &call, sizeof(call), nullptr, 0); } @@ -707,7 +707,7 @@ nScriptIntrinsicBLAS_BNNM(JNIEnv *_env, jobject _this, jlong con, jlong id, jint in_allocs[2] = (RsAllocation)C; rsScriptForEachMulti((RsContext)con, (RsScript)id, 0, - in_allocs, sizeof(in_allocs), nullptr, + in_allocs, NELEM(in_allocs), nullptr, &call, sizeof(call), nullptr, 0); } |