drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5aaeb8e8: am 24a2ee66: Merge "Collapse code paths for single- and multi-input kernels."

Browse Source 
* commit '5aaeb8e89eb0afd710ba9586f5e314b76e806116':
  Collapse code paths for single- and multi-input kernels.
This commit is contained in:
Stephen Hines
2014-08-13 17:34:59 +00:00
committed by Android Git Automerger
parent a42bf4c31b 5aaeb8e89e
commit c27ebda05e
3 changed files with 131 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,52 +605,14 @@ public class RenderScript {
validate();
rsnScriptInvoke(mContext, id, slot);
}
native void rsnScriptForEach(long con, long id, int slot, long ain, long aout, byte[] params);
native void rsnScriptForEach(long con, long id, int slot, long ain, long aout);
native void rsnScriptForEachClipped(long con, long id, int slot, long ain, long aout, byte[] params,
int xstart, int xend, int ystart, int yend, int zstart, int zend);
native void rsnScriptForEachClipped(long con, long id, int slot, long ain, long aout,
int xstart, int xend, int ystart, int yend, int zstart, int zend);
synchronized void nScriptForEach(long id, int slot, long ain, long aout, byte[] params) {
native void rsnScriptForEach(long con, long id, int slot, long[] ains,
long aout, byte[] params, int[] limits);
synchronized void nScriptForEach(long id, int slot, long[] ains, long aout,
byte[] params, int[] limits) {
validate();
if (params == null) {
rsnScriptForEach(mContext, id, slot, ain, aout);
} else {
rsnScriptForEach(mContext, id, slot, ain, aout, params);
}
}
synchronized void nScriptForEachClipped(long id, int slot, long ain, long aout, byte[] params,
int xstart, int xend, int ystart, int yend, int zstart, int zend) {
validate();
if (params == null) {
rsnScriptForEachClipped(mContext, id, slot, ain, aout, xstart, xend, ystart, yend, zstart, zend);
} else {
rsnScriptForEachClipped(mContext, id, slot, ain, aout, params, xstart, xend, ystart, yend, zstart, zend);
}
}
/**
* Multi-input code.
*
*/
// @hide
native void rsnScriptForEachMultiClipped(long con, long id, int slot, long[] ains, long aout, byte[] params,
int xstart, int xend, int ystart, int yend, int zstart, int zend);
// @hide
native void rsnScriptForEachMultiClipped(long con, long id, int slot, long[] ains, long aout,
int xstart, int xend, int ystart, int yend, int zstart, int zend);
// @hide
synchronized void nScriptForEachMultiClipped(long id, int slot, long[] ains, long aout, byte[] params,
int xstart, int xend, int ystart, int yend, int zstart, int zend) {
validate();
if (params == null) {
rsnScriptForEachMultiClipped(mContext, id, slot, ains, aout, xstart, xend, ystart, yend, zstart, zend);
} else {
rsnScriptForEachMultiClipped(mContext, id, slot, ains, aout, params, xstart, xend, ystart, yend, zstart, zend);
}
rsnScriptForEach(mContext, id, slot, ains, aout, params, limits);
}
native void rsnScriptInvokeV(long con, long id, int slot, byte[] params);