From 11ec90971f4b343fec6c10121d51bba3f20ee1a4 Mon Sep 17 00:00:00 2001 From: David Gross Date: Thu, 2 Jun 2016 14:46:55 -0700 Subject: Delete simple reduction implementation. Bug: 27298560 Change-Id: I8a89c9df753d12ee8af06008d424e77bb916cd8f (cherry picked from commit 4a4578530a1a5fb751ea5a7bfbff83f3ab669895) --- rs/java/android/renderscript/Script.java | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) (limited to 'rs/java/android/renderscript/Script.java') diff --git a/rs/java/android/renderscript/Script.java b/rs/java/android/renderscript/Script.java index 04ba864c14a6..35c9a13dc62f 100644 --- a/rs/java/android/renderscript/Script.java +++ b/rs/java/android/renderscript/Script.java @@ -285,35 +285,6 @@ public class Script extends BaseObj { mRS.nScriptForEach(getID(mRS), slot, in_ids, out_id, params, limits); } - /** - * Only intended for use by generated reflected code. (Simple reduction) - * - * @hide - */ - protected void reduce(int slot, Allocation ain, Allocation aout, LaunchOptions sc) { - mRS.validate(); - mRS.validateObject(ain); - mRS.validateObject(aout); - - if (ain == null || aout == null) { - throw new RSIllegalArgumentException( - "Both ain and aout are required to be non-null."); - } - - long in_id = ain.getID(mRS); - long out_id = aout.getID(mRS); - - int[] limits = null; - if (sc != null) { - limits = new int[2]; - - limits[0] = sc.xstart; - limits[1] = sc.xend; - } - - mRS.nScriptReduce(getID(mRS), slot, in_id, out_id, limits); - } - /** * Only intended for use by generated reflected code. (General reduction) * @@ -351,7 +322,7 @@ public class Script extends BaseObj { limits[5] = sc.zend; } - mRS.nScriptReduceNew(getID(mRS), slot, in_ids, out_id, limits); + mRS.nScriptReduce(getID(mRS), slot, in_ids, out_id, limits); } long[] mInIdsBuffer; -- cgit v1.2.3