diff --git a/rs/java/android/renderscript/ScriptGroup2.java b/rs/java/android/renderscript/ScriptGroup2.java index 2e171b66c0906..4a56572fe7397 100644 --- a/rs/java/android/renderscript/ScriptGroup2.java +++ b/rs/java/android/renderscript/ScriptGroup2.java @@ -342,6 +342,18 @@ public class ScriptGroup2 extends BaseObj { return outputObjs; } + /** + @hide Pending Android public API approval. + */ + public static final class Binding { + public Script.FieldID mField; + public Object mValue; + public Binding(Script.FieldID field, Object value) { + mField = field; + mValue = value; + } + } + /** @hide Pending Android public API approval. */ @@ -349,7 +361,6 @@ public class ScriptGroup2 extends BaseObj { RenderScript mRS; List mClosures; List mInputs; - private static final String TAG = "ScriptGroup2.Builder"; public Builder(RenderScript rs) { @@ -378,10 +389,50 @@ public class ScriptGroup2 extends BaseObj { return unbound; } + public Closure addKernel(Script.KernelID k, Type returnType, Object... argsAndBindings) { + ArrayList args = new ArrayList(); + Map bindingMap = new HashMap(); + if (!seperateArgsAndBindings(argsAndBindings, args, bindingMap)) { + return null; + } + return addKernel(k, returnType, args.toArray(), bindingMap); + } + + public Closure addInvoke(Script.InvokeID invoke, Object... argsAndBindings) { + ArrayList args = new ArrayList(); + Map bindingMap = new HashMap(); + if (!seperateArgsAndBindings(argsAndBindings, args, bindingMap)) { + return null; + } + return addInvoke(invoke, args.toArray(), bindingMap); + } + public ScriptGroup2 create(Future... outputs) { ScriptGroup2 ret = new ScriptGroup2(mRS, mClosures, mInputs, outputs); return ret; } + private boolean seperateArgsAndBindings(Object[] argsAndBindings, + ArrayList args, + Map bindingMap) { + int i; + for (i = 0; i < argsAndBindings.length; i++) { + if (argsAndBindings[i] instanceof Binding) { + break; + } + args.add(argsAndBindings[i]); + } + + for (; i < argsAndBindings.length; i++) { + if (!(argsAndBindings[i] instanceof Binding)) { + return false; + } + Binding b = (Binding)argsAndBindings[i]; + bindingMap.put(b.mField, b.mValue); + } + + return true; + } + } }