diff options
| author | Stephen Hines <srhines@google.com> | 2010-10-11 10:54:21 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2010-10-11 12:32:33 -0700 |
| commit | 031ec58cfc7a20927302a5300eba3f5fc1709b50 (patch) | |
| tree | 4a5719c7c6c89b66d8a304d0df333810b2a2aa3f /graphics | |
| parent | c2a443250768086a609c5666f23d93316d84252c (diff) | |
| download | frameworks_base-031ec58cfc7a20927302a5300eba3f5fc1709b50.zip frameworks_base-031ec58cfc7a20927302a5300eba3f5fc1709b50.tar.gz frameworks_base-031ec58cfc7a20927302a5300eba3f5fc1709b50.tar.bz2 | |
Fix support for 64-bit integers.
Change-Id: I4e2146a5fda41f280ee3f6f685a34f3cff28f05e
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/renderscript/RenderScript.java | 4 | ||||
| -rw-r--r-- | graphics/java/android/renderscript/Script.java | 4 | ||||
| -rw-r--r-- | graphics/jni/android_renderscript_RenderScript.cpp | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index 27c40fa..8ad54c9 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -359,6 +359,10 @@ public class RenderScript { synchronized void nScriptSetVarI(int id, int slot, int val) { rsnScriptSetVarI(mContext, id, slot, val); } + native void rsnScriptSetVarJ(int con, int id, int slot, long val); + synchronized void nScriptSetVarJ(int id, int slot, long val) { + rsnScriptSetVarJ(mContext, id, slot, val); + } native void rsnScriptSetVarF(int con, int id, int slot, float val); synchronized void nScriptSetVarF(int id, int slot, float val) { rsnScriptSetVarF(mContext, id, slot, val); diff --git a/graphics/java/android/renderscript/Script.java b/graphics/java/android/renderscript/Script.java index 8772c4c..53a33e4 100644 --- a/graphics/java/android/renderscript/Script.java +++ b/graphics/java/android/renderscript/Script.java @@ -80,6 +80,10 @@ public class Script extends BaseObj { mRS.nScriptSetVarI(mID, index, v); } + public void setVar(int index, long v) { + mRS.nScriptSetVarJ(mID, index, v); + } + public void setVar(int index, boolean v) { mRS.nScriptSetVarI(mID, index, v ? 1 : 0); } diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index 3e52fef..586d7e9 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -780,6 +780,13 @@ nScriptSetVarI(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slo } 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); + rsScriptSetVarJ(con, (RsScript)script, slot, val); +} + +static void nScriptSetVarF(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, float val) { LOG_API("nScriptSetVarF, con(%p), s(%p), slot(%i), val(%f)", con, (void *)script, slot, val); @@ -1266,6 +1273,7 @@ static JNINativeMethod methods[] = { {"rsnScriptInvoke", "(III)V", (void*)nScriptInvoke }, {"rsnScriptInvokeV", "(III[B)V", (void*)nScriptInvokeV }, {"rsnScriptSetVarI", "(IIII)V", (void*)nScriptSetVarI }, +{"rsnScriptSetVarJ", "(IIIJ)V", (void*)nScriptSetVarJ }, {"rsnScriptSetVarF", "(IIIF)V", (void*)nScriptSetVarF }, {"rsnScriptSetVarD", "(IIID)V", (void*)nScriptSetVarD }, {"rsnScriptSetVarV", "(III[B)V", (void*)nScriptSetVarV }, |