diff options
| author | Tim Murray <timmurray@google.com> | 2014-06-12 23:13:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 23:13:28 +0000 |
| commit | eb2b52ffaff549df07fbf848d1475a207d33038d (patch) | |
| tree | 03d48c26f74d9e1600a0bd1465da67b8faf4d64c /rs | |
| parent | a6ce7708d6124224399241503fadcafe0c4684d4 (diff) | |
| parent | 604ea0e415faa2466ab6c89372001d6c93ad0d98 (diff) | |
| download | frameworks_base-eb2b52ffaff549df07fbf848d1475a207d33038d.zip frameworks_base-eb2b52ffaff549df07fbf848d1475a207d33038d.tar.gz frameworks_base-eb2b52ffaff549df07fbf848d1475a207d33038d.tar.bz2 | |
am 604ea0e4: am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."
* commit '604ea0e415faa2466ab6c89372001d6c93ad0d98':
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 0e57232..c9bba69 100644 --- a/rs/java/android/renderscript/FieldPacker.java +++ b/rs/java/android/renderscript/FieldPacker.java @@ -233,6 +233,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)); @@ -240,6 +243,9 @@ public class FieldPacker { } else { if (RenderScript.sPointerSize == 8) { addI64(0); + addI64(0); + addI64(0); + addI64(0); } else { addI32(0); } |