diff options
| author | Miao Wang <miaowang@google.com> | 2015-03-06 01:10:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-06 01:10:38 +0000 |
| commit | c1e2bf95ab77127ea21ebd44b8615eca85338af1 (patch) | |
| tree | 35f98cc443147c53f2ffba9efca739a8410cda5c /rs/java/android/renderscript/RenderScript.java | |
| parent | 26f1a53838b2c8b77c0995801dcc1c7816c47f16 (diff) | |
| parent | 4b5af9bce10dbb8b6d5ff27a5f0c49f3498a6245 (diff) | |
am 4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
* commit '4b5af9bce10dbb8b6d5ff27a5f0c49f3498a6245':
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
| -rw-r--r-- | rs/java/android/renderscript/RenderScript.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 29004c5a16b1..b992d44df47e 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -579,12 +579,11 @@ public class RenderScript { } native void rsnAllocationElementRead(long con,long id, int xoff, int yoff, int zoff, - int mip, int compIdx, Object d, int sizeBytes, int dt); + int mip, int compIdx, byte[] d, int sizeBytes); synchronized void nAllocationElementRead(long id, int xoff, int yoff, int zoff, - int mip, int compIdx, Object d, int sizeBytes, - Element.DataType dt) { + int mip, int compIdx, byte[] d, int sizeBytes) { validate(); - rsnAllocationElementRead(mContext, id, xoff, yoff, zoff, mip, compIdx, d, sizeBytes, dt.mID); + rsnAllocationElementRead(mContext, id, xoff, yoff, zoff, mip, compIdx, d, sizeBytes); } native void rsnAllocationRead2D(long con, long id, int xoff, int yoff, int mip, int face, |