diff options
author | David Gross <dgross@google.com> | 2016-06-13 17:58:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-13 17:58:32 +0000 |
commit | d749245b88456fcec8be1b93528e179d3a2d61aa (patch) | |
tree | 0f294cf0c00c2694947928edceadb2eabb1443f7 /rs/java/android/renderscript/RenderScript.java | |
parent | 29dbc3cc47a27ae09f0f5aacd778aded427444bc (diff) | |
parent | 4a4578530a1a5fb751ea5a7bfbff83f3ab669895 (diff) |
Merge "Delete simple reduction implementation." into nyc-dev
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
-rw-r--r-- | rs/java/android/renderscript/RenderScript.java | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 3d1370a52ae3..3333aa863cbc 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); |