summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorDavid Gross <dgross@google.com>2016-06-15 18:44:03 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-06-15 18:44:04 +0000
commite8909dc0f43fc521edcb035e21f435d7984a1f40 (patch)
treebd50093bfb04de10736cdc03898203b8efa3040a /rs/java/android/renderscript/RenderScript.java
parent4467c845c09ebab4e1e503709fca8ccb55e35007 (diff)
parent11ec90971f4b343fec6c10121d51bba3f20ee1a4 (diff)
Merge "Delete simple reduction implementation."
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
-rw-r--r--rs/java/android/renderscript/RenderScript.java14
1 files changed, 3 insertions, 11 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java
index 017b5d62af0f..0f22568a9e2a 100644
--- a/rs/java/android/renderscript/RenderScript.java
+++ b/rs/java/android/renderscript/RenderScript.java
@@ -752,20 +752,12 @@ public class RenderScript {
rsnScriptForEach(mContext, id, slot, ains, aout, params, limits);
}
- native void rsnScriptReduce(long con, long id, int slot, long ain,
+ native void rsnScriptReduce(long con, long id, int slot, long[] ains,
long aout, int[] limits);
- synchronized void nScriptReduce(long id, int slot, long ain, long aout,
+ synchronized void nScriptReduce(long id, int slot, long ains[], long aout,
int[] limits) {
validate();
- rsnScriptReduce(mContext, id, slot, ain, aout, limits);
- }
-
- native void rsnScriptReduceNew(long con, long id, int slot, long[] ains,
- long aout, int[] limits);
- synchronized void nScriptReduceNew(long id, int slot, long ains[], long aout,
- int[] limits) {
- validate();
- rsnScriptReduceNew(mContext, id, slot, ains, aout, limits);
+ rsnScriptReduce(mContext, id, slot, ains, aout, limits);
}
native void rsnScriptInvokeV(long con, long id, int slot, byte[] params);