diff options
Diffstat (limited to 'graphics/java/android')
-rw-r--r-- | graphics/java/android/renderscript/RenderScript.java | 4 | ||||
-rw-r--r-- | graphics/java/android/renderscript/ScriptC.java | 33 |
2 files changed, 28 insertions, 9 deletions
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index 8fc5ad5..9840bbb 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -68,6 +68,8 @@ public class RenderScript { native void nContextBindProgramFragmentStore(int pfs); native void nContextBindProgramFragment(int pf); native void nContextBindProgramVertex(int pf); + native void nContextAddDefineI32(String name, int value); + native void nContextAddDefineF(String name, float value); native void nAssignName(int obj, byte[] name); native int nFileOpen(byte[] name); @@ -139,6 +141,8 @@ public class RenderScript { native void nScriptCSetRoot(boolean isRoot); native void nScriptCSetScript(byte[] script, int offset, int length); native int nScriptCCreate(); + native void nScriptCAddDefineI32(String name, int value); + native void nScriptCAddDefineF(String name, float value); native void nSamplerDestroy(int sampler); native void nSamplerBegin(); diff --git a/graphics/java/android/renderscript/ScriptC.java b/graphics/java/android/renderscript/ScriptC.java index 0592f5d..0f231d6 100644 --- a/graphics/java/android/renderscript/ScriptC.java +++ b/graphics/java/android/renderscript/ScriptC.java @@ -16,11 +16,13 @@ package android.renderscript; -import java.io.IOException; -import java.io.InputStream; - import android.content.res.Resources; +import android.util.Log; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map.Entry; +import java.util.HashMap; /** * @hide @@ -30,12 +32,11 @@ public class ScriptC extends Script { super(id, rs); } - - - public static class Builder extends Script.Builder { byte[] mProgram; int mProgramLength; + HashMap<String,Integer> mIntDefines = new HashMap(); + HashMap<String,Float> mFloatDefines = new HashMap(); public Builder(RenderScript rs) { super(rs); @@ -63,7 +64,7 @@ public class ScriptC extends Script { } } - public void setScript(InputStream is) throws IOException { + public void setScript(InputStream is) throws IOException { byte[] buf = new byte[1024]; int currentPos = 0; while(true) { @@ -88,19 +89,33 @@ public class ScriptC extends Script { b.mRS.nScriptCBegin(); b.transferCreate(); - b.mRS.nScriptCSetScript(b.mProgram, 0, b.mProgramLength); + for (Entry<String,Integer> e: b.mIntDefines.entrySet()) { + b.mRS.nScriptCAddDefineI32(e.getKey(), e.getValue().intValue()); + } + for (Entry<String,Float> e: b.mFloatDefines.entrySet()) { + b.mRS.nScriptCAddDefineF(e.getKey(), e.getValue().floatValue()); + } + b.mRS.nScriptCSetScript(b.mProgram, 0, b.mProgramLength); int id = b.mRS.nScriptCCreate(); ScriptC obj = new ScriptC(id, b.mRS); b.transferObject(obj); + return obj; } + public void addDefine(String name, int value) { + mIntDefines.put(name, value); + } + + public void addDefine(String name, float value) { + mFloatDefines.put(name, value); + } + public ScriptC create() { return internalCreate(this); } } - } |