diff options
| author | Stephen Hines <srhines@google.com> | 2010-09-21 10:29:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-21 10:29:48 -0700 |
| commit | a86c1a622fb61d8157dac9ef3d66084a6ac2f0e0 (patch) | |
| tree | 03d1af24d1e7de6c344c2708aa650425fdab38b2 /graphics | |
| parent | 35ae9ca5bf4b99bc341afe43d501a2d166f5df43 (diff) | |
| parent | ca54ec302f5bddd1674ea1f36cd3b7c540b2fbca (diff) | |
| download | frameworks_base-a86c1a622fb61d8157dac9ef3d66084a6ac2f0e0.zip frameworks_base-a86c1a622fb61d8157dac9ef3d66084a6ac2f0e0.tar.gz frameworks_base-a86c1a622fb61d8157dac9ef3d66084a6ac2f0e0.tar.bz2 | |
Merge "Add support for Float64 (double) to RenderScript."
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 | 10 |
3 files changed, 17 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index 1312036..159e070 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -358,6 +358,10 @@ public class RenderScript { synchronized void nScriptSetVarF(int id, int slot, float val) { rsnScriptSetVarF(mContext, id, slot, val); } + native void rsnScriptSetVarD(int con, int id, int slot, double val); + synchronized void nScriptSetVarD(int id, int slot, double val) { + rsnScriptSetVarD(mContext, id, slot, val); + } native void rsnScriptSetVarV(int con, int id, int slot, byte[] val); synchronized void nScriptSetVarV(int id, int slot, byte[] val) { rsnScriptSetVarV(mContext, id, slot, val); diff --git a/graphics/java/android/renderscript/Script.java b/graphics/java/android/renderscript/Script.java index 19c444c..8772c4c 100644 --- a/graphics/java/android/renderscript/Script.java +++ b/graphics/java/android/renderscript/Script.java @@ -72,6 +72,10 @@ public class Script extends BaseObj { mRS.nScriptSetVarF(mID, index, v); } + public void setVar(int index, double v) { + mRS.nScriptSetVarD(mID, index, v); + } + public void setVar(int index, int v) { mRS.nScriptSetVarI(mID, index, v); } diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index f386537..ee2080e 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -791,11 +791,18 @@ nScriptSetVarI(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slo static void nScriptSetVarF(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, float val) { - LOG_API("nScriptSetVarI, con(%p), s(%p), slot(%i), val(%f)", con, (void *)script, slot, val); + LOG_API("nScriptSetVarF, con(%p), s(%p), slot(%i), val(%f)", con, (void *)script, slot, val); rsScriptSetVarF(con, (RsScript)script, slot, val); } static void +nScriptSetVarD(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, double val) +{ + LOG_API("nScriptSetVarD, con(%p), s(%p), slot(%i), val(%lf)", con, (void *)script, slot, val); + rsScriptSetVarD(con, (RsScript)script, slot, val); +} + +static void nScriptSetVarV(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jbyteArray data) { LOG_API("nScriptSetVarV, con(%p), s(%p), slot(%i)", con, (void *)script, slot); @@ -1281,6 +1288,7 @@ static JNINativeMethod methods[] = { {"rsnScriptInvokeV", "(III[B)V", (void*)nScriptInvokeV }, {"rsnScriptSetVarI", "(IIII)V", (void*)nScriptSetVarI }, {"rsnScriptSetVarF", "(IIIF)V", (void*)nScriptSetVarF }, +{"rsnScriptSetVarD", "(IIID)V", (void*)nScriptSetVarD }, {"rsnScriptSetVarV", "(III[B)V", (void*)nScriptSetVarV }, {"rsnScriptCBegin", "(I)V", (void*)nScriptCBegin }, |