Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Delete simple reduction implementation.\" into nyc-dev

Browse Source 
am: d749245b88

Change-Id: I28a4e52a41678ecb10b0869566e1cb79d4287b60
This commit is contained in:
David Gross
2016-06-13 22:12:48 +00:00
committed by android-build-merger
parent 0aa4bb9e6b d749245b88
commit 8e988ec8d8
3 changed files with 10 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rs/java/android/renderscript/RenderScript.java
View File

@@ -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);

31
rs/java/android/renderscript/Script.java
View File

@@ -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)
*
@@ -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;