Merge "Remove InvokeData and add ContextFinish to generate a sync point."

2 files changed, 11 insertions, 7 deletions

diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index 9dd8d1e..70f6bd7 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -68,6 +68,7 @@ public class RenderScript {
     native void nContextSetSurface(int w, int h, Surface sur);
     native void nContextSetPriority(int p);
     native void nContextDump(int bits);
+    native void nContextFinish();
 
     native void nContextBindRootScript(int script);
     native void nContextBindSampler(int sampler, int slot);
@@ -141,7 +142,6 @@ public class RenderScript {
     native void nScriptBindAllocation(int script, int alloc, int slot);
     native void nScriptSetTimeZone(int script, byte[] timeZone);
     native void nScriptInvoke(int id, int slot);
-    native void nScriptInvokeData(int id, int slot);
     native void nScriptInvokeV(int id, int slot, byte[] params);
     native void nScriptSetVarI(int id, int slot, int val);
     native void nScriptSetVarF(int id, int slot, float val);
@@ -323,6 +323,10 @@ public class RenderScript {
         nContextDump(bits);
     }
 
+    public void finish() {
+        nContextFinish();
+    }
+
     public void destroy() {
         validate();
         nContextDeinitToClient();
diff --git a/graphics/java/android/renderscript/Script.java b/graphics/java/android/renderscript/Script.java
index 4c4071a..beac997 100644
--- a/graphics/java/android/renderscript/Script.java
+++ b/graphics/java/android/renderscript/Script.java
@@ -46,12 +46,12 @@ public class Script extends BaseObj {
         mRS.nScriptInvoke(mID, slot);
     }
 
-    protected void invokeData(int slot) {
-        mRS.nScriptInvokeData(mID, slot);
-    }
-
-    protected void invokeV(int slot, FieldPacker v) {
-        mRS.nScriptInvokeV(mID, slot, v.getData());
+    protected void invoke(int slot, FieldPacker v) {
+        if (v != null) {
+            mRS.nScriptInvokeV(mID, slot, v.getData());
+        } else {
+            mRS.nScriptInvoke(mID, slot);
+        }
     }