diff options
| author | Jason Sams <jsams@google.com> | 2014-06-18 23:14:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-18 23:14:14 +0000 |
| commit | 864b75be515eec7a2818c0b62fe4174e7b7210c2 (patch) | |
| tree | e1378f10feb479cc48dc578a2e0cbd4e2737e27f /rs/java/android/renderscript/Element.java | |
| parent | 7a2d46f39bb47304be4faa63123af3a14a5133d7 (diff) | |
| parent | 3aa4de11b05599d75af92a15820731144941c38f (diff) | |
| download | frameworks_base-864b75be515eec7a2818c0b62fe4174e7b7210c2.zip frameworks_base-864b75be515eec7a2818c0b62fe4174e7b7210c2.tar.gz frameworks_base-864b75be515eec7a2818c0b62fe4174e7b7210c2.tar.bz2 | |
am 3aa4de11: am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"
* commit '3aa4de11b05599d75af92a15820731144941c38f':
Fix element size on 64b
Diffstat (limited to 'rs/java/android/renderscript/Element.java')
| -rw-r--r-- | rs/java/android/renderscript/Element.java | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/rs/java/android/renderscript/Element.java b/rs/java/android/renderscript/Element.java index 55b671d..c6b5b0d 100644 --- a/rs/java/android/renderscript/Element.java +++ b/rs/java/android/renderscript/Element.java @@ -140,17 +140,17 @@ public class Element extends BaseObj { MATRIX_3X3 (17, 36), MATRIX_2X2 (18, 16), - RS_ELEMENT (1000, 4), - RS_TYPE (1001, 4), - RS_ALLOCATION (1002, 4), - RS_SAMPLER (1003, 4), - RS_SCRIPT (1004, 4), - RS_MESH (1005, 4), - RS_PROGRAM_FRAGMENT (1006, 4), - RS_PROGRAM_VERTEX (1007, 4), - RS_PROGRAM_RASTER (1008, 4), - RS_PROGRAM_STORE (1009, 4), - RS_FONT (1010, 4); + RS_ELEMENT (1000), + RS_TYPE (1001), + RS_ALLOCATION (1002), + RS_SAMPLER (1003), + RS_SCRIPT (1004), + RS_MESH (1005), + RS_PROGRAM_FRAGMENT (1006), + RS_PROGRAM_VERTEX (1007), + RS_PROGRAM_RASTER (1008), + RS_PROGRAM_STORE (1009), + RS_FONT (1010); int mID; int mSize; @@ -158,6 +158,14 @@ public class Element extends BaseObj { mID = id; mSize = size; } + + DataType(int id) { + mID = id; + mSize = 4; + if (RenderScript.sPointerSize == 8) { + mSize = 32; + } + } } /** |