diff options
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
| -rw-r--r-- | graphics/java/android/renderscript/RenderScript.java | 90 |
1 files changed, 29 insertions, 61 deletions
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index b51279ab544c..4c505ec95e1d 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.res.AssetManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.util.Config; import android.util.Log; import android.view.Surface; @@ -40,7 +39,7 @@ public class RenderScript { static final String LOG_TAG = "RenderScript_jni"; static final boolean DEBUG = false; @SuppressWarnings({"UnusedDeclaration", "deprecation"}) - static final boolean LOG_ENABLED = DEBUG ? Config.LOGD : Config.LOGV; + static final boolean LOG_ENABLED = false; private Context mApplicationContext; @@ -421,6 +420,16 @@ public class RenderScript { validate(); rsnScriptInvoke(mContext, id, slot); } + native void rsnScriptForEach(int con, int id, int slot, int ain, int aout, byte[] params); + native void rsnScriptForEach(int con, int id, int slot, int ain, int aout); + synchronized void nScriptForEach(int id, int slot, int ain, int aout, byte[] params) { + validate(); + if (params == null) { + rsnScriptForEach(mContext, id, slot, ain, aout); + } else { + rsnScriptForEach(mContext, id, slot, ain, aout, params); + } + } native void rsnScriptInvokeV(int con, int id, int slot, byte[] params); synchronized void nScriptInvokeV(int id, int slot, byte[] params) { validate(); @@ -457,20 +466,11 @@ public class RenderScript { rsnScriptSetVarObj(mContext, id, slot, val); } - native void rsnScriptCBegin(int con); - synchronized void nScriptCBegin() { - validate(); - rsnScriptCBegin(mContext); - } - native void rsnScriptCSetScript(int con, byte[] script, int offset, int length); - synchronized void nScriptCSetScript(byte[] script, int offset, int length) { - validate(); - rsnScriptCSetScript(mContext, script, offset, length); - } - native int rsnScriptCCreate(int con, String packageName, String resName, String cacheDir); - synchronized int nScriptCCreate(String packageName, String resName, String cacheDir) { + native int rsnScriptCCreate(int con, String resName, String cacheDir, + byte[] script, int length); + synchronized int nScriptCCreate(String resName, String cacheDir, byte[] script, int length) { validate(); - return rsnScriptCCreate(mContext, packageName, resName, cacheDir); + return rsnScriptCCreate(mContext, resName, cacheDir, script, length); } native void rsnSamplerBegin(int con); @@ -494,56 +494,24 @@ public class RenderScript { return rsnSamplerCreate(mContext); } - native void rsnProgramStoreBegin(int con, int in, int out); - synchronized void nProgramStoreBegin(int in, int out) { - validate(); - rsnProgramStoreBegin(mContext, in, out); - } - native void rsnProgramStoreDepthFunc(int con, int func); - synchronized void nProgramStoreDepthFunc(int func) { + native int rsnProgramStoreCreate(int con, boolean r, boolean g, boolean b, boolean a, + boolean depthMask, boolean dither, + int srcMode, int dstMode, int depthFunc); + synchronized int nProgramStoreCreate(boolean r, boolean g, boolean b, boolean a, + boolean depthMask, boolean dither, + int srcMode, int dstMode, int depthFunc) { validate(); - rsnProgramStoreDepthFunc(mContext, func); - } - native void rsnProgramStoreDepthMask(int con, boolean enable); - synchronized void nProgramStoreDepthMask(boolean enable) { - validate(); - rsnProgramStoreDepthMask(mContext, enable); - } - native void rsnProgramStoreColorMask(int con, boolean r, boolean g, boolean b, boolean a); - synchronized void nProgramStoreColorMask(boolean r, boolean g, boolean b, boolean a) { - validate(); - rsnProgramStoreColorMask(mContext, r, g, b, a); - } - native void rsnProgramStoreBlendFunc(int con, int src, int dst); - synchronized void nProgramStoreBlendFunc(int src, int dst) { - validate(); - rsnProgramStoreBlendFunc(mContext, src, dst); - } - native void rsnProgramStoreDither(int con, boolean enable); - synchronized void nProgramStoreDither(boolean enable) { - validate(); - rsnProgramStoreDither(mContext, enable); - } - native int rsnProgramStoreCreate(int con); - synchronized int nProgramStoreCreate() { - validate(); - return rsnProgramStoreCreate(mContext); + return rsnProgramStoreCreate(mContext, r, g, b, a, depthMask, dither, srcMode, + dstMode, depthFunc); } - native int rsnProgramRasterCreate(int con, boolean pointSmooth, boolean lineSmooth, boolean pointSprite); - synchronized int nProgramRasterCreate(boolean pointSmooth, boolean lineSmooth, boolean pointSprite) { - validate(); - return rsnProgramRasterCreate(mContext, pointSmooth, lineSmooth, pointSprite); - } - native void rsnProgramRasterSetLineWidth(int con, int pr, float v); - synchronized void nProgramRasterSetLineWidth(int pr, float v) { - validate(); - rsnProgramRasterSetLineWidth(mContext, pr, v); - } - native void rsnProgramRasterSetCullMode(int con, int pr, int mode); - synchronized void nProgramRasterSetCullMode(int pr, int mode) { + native int rsnProgramRasterCreate(int con, boolean pointSmooth, boolean lineSmooth, + boolean pointSprite, float lineWidth, int cullMode); + synchronized int nProgramRasterCreate(boolean pointSmooth, boolean lineSmooth, + boolean pointSprite, float lineWidth, int cullMode) { validate(); - rsnProgramRasterSetCullMode(mContext, pr, mode); + return rsnProgramRasterCreate(mContext, pointSmooth, lineSmooth, pointSprite, lineWidth, + cullMode); } native void rsnProgramBindConstants(int con, int pv, int slot, int mID); |