diff options
| author | Yang Ni <yangni@google.com> | 2015-04-14 17:02:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-14 17:02:33 +0000 |
| commit | 5024f20a85ed28e637fd61d0a2cb7c87a2e9322a (patch) | |
| tree | ca84f0a4a6591609a5d58b29490386f087eb0fec /rs/jni | |
| parent | b3a0660eabeb4d4bd7ae539ca48c0f9d22b31890 (diff) | |
| parent | 0933905375790eb850334b53fd6d0981bd40e007 (diff) | |
| download | frameworks_base-5024f20a85ed28e637fd61d0a2cb7c87a2e9322a.zip frameworks_base-5024f20a85ed28e637fd61d0a2cb7c87a2e9322a.tar.gz frameworks_base-5024f20a85ed28e637fd61d0a2cb7c87a2e9322a.tar.bz2 | |
am 09339053: am 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method"
* commit '0933905375790eb850334b53fd6d0981bd40e007':
Add name to ScriptGroup2.Builder.create() method
Diffstat (limited to 'rs/jni')
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 783df68..49afa6d 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -418,8 +418,9 @@ nClosureSetGlobal(JNIEnv *_env, jobject _this, jlong con, jlong closureID, } static long -nScriptGroup2Create(JNIEnv *_env, jobject _this, jlong con, +nScriptGroup2Create(JNIEnv *_env, jobject _this, jlong con, jstring name, jstring cacheDir, jlongArray closureArray) { + AutoJavaStringToUTF8 nameUTF(_env, name); AutoJavaStringToUTF8 cacheDirUTF(_env, cacheDir); jlong* jClosures = _env->GetLongArrayElements(closureArray, nullptr); @@ -430,7 +431,8 @@ nScriptGroup2Create(JNIEnv *_env, jobject _this, jlong con, } return (jlong)(uintptr_t)rsScriptGroup2Create( - (RsContext)con, cacheDirUTF.c_str(), cacheDirUTF.length(), + (RsContext)con, nameUTF.c_str(), nameUTF.length(), + cacheDirUTF.c_str(), cacheDirUTF.length(), closures, numClosures); } @@ -2404,7 +2406,7 @@ static JNINativeMethod methods[] = { {"rsnScriptInvokeIDCreate", "(JJI)J", (void*)nScriptInvokeIDCreate }, {"rsnScriptFieldIDCreate", "(JJI)J", (void*)nScriptFieldIDCreate }, {"rsnScriptGroupCreate", "(J[J[J[J[J[J)J", (void*)nScriptGroupCreate }, -{"rsnScriptGroup2Create", "(JLjava/lang/String;[J)J", (void*)nScriptGroup2Create }, +{"rsnScriptGroup2Create", "(JLjava/lang/String;Ljava/lang/String;[J)J", (void*)nScriptGroup2Create }, {"rsnScriptGroupSetInput", "(JJJJ)V", (void*)nScriptGroupSetInput }, {"rsnScriptGroupSetOutput", "(JJJJ)V", (void*)nScriptGroupSetOutput }, {"rsnScriptGroupExecute", "(JJ)V", (void*)nScriptGroupExecute }, |