summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Script.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/Script.java
parent4467c845c09ebab4e1e503709fca8ccb55e35007 (diff)
parent11ec90971f4b343fec6c10121d51bba3f20ee1a4 (diff)
Merge "Delete simple reduction implementation."
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
-rw-r--r--rs/java/android/renderscript/Script.java31
1 files changed, 1 insertions, 30 deletions
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
@@ -286,35 +286,6 @@ public class Script extends BaseObj {
}
/**
- * 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)
*
* @hide
@@ -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;