diff options
| author | Tim Murray <timmurray@google.com> | 2014-05-16 11:47:26 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2014-06-03 12:30:53 -0700 |
| commit | f0c62b26765f1e0ec0df8fceeecb77fca690c29a (patch) | |
| tree | f79737d93c08e6cb882cdc241da57926add84d90 /rs/java/android/renderscript/FieldPacker.java | |
| parent | b75b3aaac4f0282a99bb4486b5dce51a87bc0dd7 (diff) | |
Add support for mixed 32/64 APKs using RenderScript.
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
Diffstat (limited to 'rs/java/android/renderscript/FieldPacker.java')
| -rw-r--r-- | rs/java/android/renderscript/FieldPacker.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/FieldPacker.java b/rs/java/android/renderscript/FieldPacker.java index cf20e635e22a..2ff1c28d3f8f 100644 --- a/rs/java/android/renderscript/FieldPacker.java +++ b/rs/java/android/renderscript/FieldPacker.java @@ -232,10 +232,18 @@ public class FieldPacker { public void addObj(BaseObj obj) { if (obj != null) { - // FIXME: this is fine for 32-bit but needs a path for 64-bit - addI32((int)obj.getID(null)); + if (RenderScript.sPointerSize == 8) { + addI64(obj.getID(null)); + } + else { + addI32((int)obj.getID(null)); + } } else { - addI32(0); + if (RenderScript.sPointerSize == 8) { + addI64(0); + } else { + addI32(0); + } } } |