diff options
| author | Miao Wang <miaowang@google.com> | 2015-03-08 00:07:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-08 00:07:09 +0000 |
| commit | 989e03f144e8031f33af08945e845283dddcc8ad (patch) | |
| tree | 8be2e2a01bc3df261970bbbf91b6c4a0e3b5647b /rs/java/android/renderscript/RenderScript.java | |
| parent | 449571c45e47e9b8d118c59dbd909b0d512f7e6d (diff) | |
| parent | c1e2bf95ab77127ea21ebd44b8615eca85338af1 (diff) | |
| download | frameworks_base-989e03f144e8031f33af08945e845283dddcc8ad.zip frameworks_base-989e03f144e8031f33af08945e845283dddcc8ad.tar.gz frameworks_base-989e03f144e8031f33af08945e845283dddcc8ad.tar.bz2 | |
am c1e2bf95: am 4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
* commit 'c1e2bf95ab77127ea21ebd44b8615eca85338af1':
[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 29004c5..b992d44 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, |