diff options
author | Stephen Hines <srhines@google.com> | 2014-07-09 07:39:38 -0700 |
---|---|---|
committer | Stephen Hines <srhines@google.com> | 2014-07-09 07:39:38 -0700 |
commit | 48ba506dfa591d0bcd79a088457eb95a9bd4c575 (patch) | |
tree | fdef187efdaa55a0f67a4fb5e1d553d358a10f4a /rs/java/android/renderscript/RenderScript.java | |
parent | f32b3de8c931060875ed6fa1dbb87b67048d8552 (diff) | |
parent | 31012e2cef3f36183bcfd243278e969b29360c3e (diff) |
resolved conflicts for merge of 31012e2c to master
Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
-rw-r--r-- | rs/java/android/renderscript/RenderScript.java | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 44de480e033f..340efef875a3 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -630,6 +630,29 @@ public class RenderScript { } } + /** + * 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); + } + } + native void rsnScriptInvokeV(long con, long id, int slot, byte[] params); synchronized void nScriptInvokeV(long id, int slot, byte[] params) { validate(); |