diff options
| author | Tim Murray <timmurray@google.com> | 2014-06-12 23:08:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 23:08:39 +0000 |
| commit | 604ea0e415faa2466ab6c89372001d6c93ad0d98 (patch) | |
| tree | 27684b87e11df04428e8c541bd052ed67da86407 /rs/java/android/renderscript/FieldPacker.java | |
| parent | 50ece5ec53661a51ce5a15f782fdcd747171bc02 (diff) | |
| parent | b1c9430c8749b1feba59bb55a31cb1364270981b (diff) | |
am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."
* commit 'b1c9430c8749b1feba59bb55a31cb1364270981b':
Move FieldPacker over to use large objects on 64-bit.
Diffstat (limited to 'rs/java/android/renderscript/FieldPacker.java')
| -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 2ff1c28d3f8f..576a84d03c4b 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); } |