summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Script.java
diff options
context:
space:
mode:
authorDavid Gross <dgross@google.com>2016-06-13 17:58:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-13 17:58:32 +0000
commitd749245b88456fcec8be1b93528e179d3a2d61aa (patch)
tree0f294cf0c00c2694947928edceadb2eabb1443f7 /rs/java/android/renderscript/Script.java
parent29dbc3cc47a27ae09f0f5aacd778aded427444bc (diff)
parent4a4578530a1a5fb751ea5a7bfbff83f3ab669895 (diff)
Merge "Delete simple reduction implementation." into nyc-dev
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 fc3280be3ac7..13d5fcd57446 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)
*
*/
@@ -350,7 +321,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;