diff options
| author | Jason Sams <rjsams@android.com> | 2010-11-16 18:30:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-16 18:30:58 -0800 |
| commit | 68f0a32d103d3861103bce3763b222bde99c0a4c (patch) | |
| tree | 2681e49340e97dc410b9a376a84754c7c5136db0 /graphics/jni | |
| parent | 4a0d0b34b244b5b730e861d875e7ae289cbb3311 (diff) | |
| parent | 6f4cf0b8885403ead157ae00fd43cf1282331c23 (diff) | |
| download | frameworks_base-68f0a32d103d3861103bce3763b222bde99c0a4c.zip frameworks_base-68f0a32d103d3861103bce3763b222bde99c0a4c.tar.gz frameworks_base-68f0a32d103d3861103bce3763b222bde99c0a4c.tar.bz2 | |
Merge "Fix ref counting for globals when set from java code."
Diffstat (limited to 'graphics/jni')
| -rw-r--r-- | graphics/jni/android_renderscript_RenderScript.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index dd84848..8888459 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -829,6 +829,13 @@ nScriptSetVarI(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slo } static void +nScriptSetVarObj(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jint val) +{ + LOG_API("nScriptSetVarObj, con(%p), s(%p), slot(%i), val(%i)", con, (void *)script, slot, val); + rsScriptSetVarObj(con, (RsScript)script, slot, (RsObjectBase)val); +} + +static void nScriptSetVarJ(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jlong val) { LOG_API("nScriptSetVarJ, con(%p), s(%p), slot(%i), val(%lli)", con, (void *)script, slot, val); @@ -1335,6 +1342,7 @@ static JNINativeMethod methods[] = { {"rsnScriptSetVarF", "(IIIF)V", (void*)nScriptSetVarF }, {"rsnScriptSetVarD", "(IIID)V", (void*)nScriptSetVarD }, {"rsnScriptSetVarV", "(III[B)V", (void*)nScriptSetVarV }, +{"rsnScriptSetVarObj", "(IIII)V", (void*)nScriptSetVarObj }, {"rsnScriptCBegin", "(I)V", (void*)nScriptCBegin }, {"rsnScriptCSetScript", "(I[BII)V", (void*)nScriptCSetScript }, |