diff options
| author | Tim Murray <timmurray@google.com> | 2014-06-12 23:02:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-12 05:34:11 +0000 |
| commit | 77d28ca25378530f92d409fbd72a38a1e256b59f (patch) | |
| tree | c7dbdfc34f6a99128e0f839356e8e3945e13ec41 | |
| parent | 1ef888e564926b78aeb02ef1085be2f72227b862 (diff) | |
| parent | 4154bbd69b6763a65cec384b9b0e98c43350d0e3 (diff) | |
| download | base-77d28ca25378530f92d409fbd72a38a1e256b59f.tar.gz | |
Merge "Move FieldPacker over to use large objects on 64-bit."
| -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); } |