diff options
| author | Tim Murray <timmurray@google.com> | 2014-06-12 23:05:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 23:05:16 +0000 |
| commit | b1c9430c8749b1feba59bb55a31cb1364270981b (patch) | |
| tree | adaa1deae37cc88bc34a182e9eeb7b367ba59581 /rs | |
| parent | 9a0485aa567c99157e45d08e9712a281f34ffc5f (diff) | |
| parent | 77d28ca25378530f92d409fbd72a38a1e256b59f (diff) | |
| download | frameworks_base-b1c9430c8749b1feba59bb55a31cb1364270981b.zip frameworks_base-b1c9430c8749b1feba59bb55a31cb1364270981b.tar.gz frameworks_base-b1c9430c8749b1feba59bb55a31cb1364270981b.tar.bz2 | |
am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."
* commit '77d28ca25378530f92d409fbd72a38a1e256b59f':
Move FieldPacker over to use large objects on 64-bit.
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/java/android/renderscript/FieldPacker.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/FieldPacker.java b/rs/java/android/renderscript/FieldPacker.java index 2ff1c28..576a84d 100644 --- a/rs/java/android/renderscript/FieldPacker.java +++ b/rs/java/android/renderscript/FieldPacker.java @@ -234,6 +234,9 @@ public class FieldPacker { if (obj != null) { if (RenderScript.sPointerSize == 8) { addI64(obj.getID(null)); + addI64(0); + addI64(0); + addI64(0); } else { addI32((int)obj.getID(null)); @@ -241,6 +244,9 @@ public class FieldPacker { } else { if (RenderScript.sPointerSize == 8) { addI64(0); + addI64(0); + addI64(0); + addI64(0); } else { addI32(0); } |