diff options
| author | Yang Ni <yangni@google.com> | 2015-01-16 11:06:26 -0800 |
|---|---|---|
| committer | Yang Ni <yangni@google.com> | 2015-01-29 08:46:46 -0800 |
| commit | ebf63408d2b5181aeb7d83adf0f7ab95946a16d4 (patch) | |
| tree | d2cf06acf33ad4cef99b6dc24d976892160791b2 /rs/jni | |
| parent | 106da5bf80d182a2e6fd346e1836ae4fc0ba1d92 (diff) | |
| download | frameworks_base-ebf63408d2b5181aeb7d83adf0f7ab95946a16d4.zip frameworks_base-ebf63408d2b5181aeb7d83adf0f7ab95946a16d4.tar.gz frameworks_base-ebf63408d2b5181aeb7d83adf0f7ab95946a16d4.tar.bz2 | |
Pass in code cache directory when creating a script group.
Change-Id: Ia73ea917a126a5055ec97f13d90a5feaafd6a2f5
Diffstat (limited to 'rs/jni')
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 06f4def..cbcba39 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -258,7 +258,9 @@ nClosureSetGlobal(JNIEnv *_env, jobject _this, jlong con, jlong closureID, static long nScriptGroup2Create(JNIEnv *_env, jobject _this, jlong con, - jlongArray closureArray) { + jstring cacheDir, jlongArray closureArray) { + AutoJavaStringToUTF8 cacheDirUTF(_env, cacheDir); + jlong* jClosures = _env->GetLongArrayElements(closureArray, nullptr); jsize numClosures = _env->GetArrayLength(closureArray); RsClosure* closures = (RsClosure*)alloca(sizeof(RsClosure) * numClosures); @@ -266,8 +268,9 @@ nScriptGroup2Create(JNIEnv *_env, jobject _this, jlong con, closures[i] = (RsClosure)jClosures[i]; } - return (jlong)(uintptr_t)rsScriptGroup2Create((RsContext)con, closures, - numClosures); + return (jlong)(uintptr_t)rsScriptGroup2Create( + (RsContext)con, cacheDirUTF.c_str(), cacheDirUTF.length(), + closures, numClosures); } static void @@ -2008,7 +2011,7 @@ static JNINativeMethod methods[] = { {"rsnScriptKernelIDCreate", "(JJII)J", (void*)nScriptKernelIDCreate }, {"rsnScriptFieldIDCreate", "(JJI)J", (void*)nScriptFieldIDCreate }, {"rsnScriptGroupCreate", "(J[J[J[J[J[J)J", (void*)nScriptGroupCreate }, -{"rsnScriptGroup2Create", "(J[J)J", (void*)nScriptGroup2Create }, +{"rsnScriptGroup2Create", "(JLjava/lang/String;[J)J", (void*)nScriptGroup2Create }, {"rsnScriptGroupSetInput", "(JJJJ)V", (void*)nScriptGroupSetInput }, {"rsnScriptGroupSetOutput", "(JJJJ)V", (void*)nScriptGroupSetOutput }, {"rsnScriptGroupExecute", "(JJ)V", (void*)nScriptGroupExecute }, |