Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"

Browse Source 
* commit '802aaf3b9d029e8f6fdb1bf0a81758484801d330':
  Fix element size on 64b
This commit is contained in:
Jason Sams
2014-06-18 23:08:35 +00:00
committed by Android Git Automerger
parent 7deaf7c530 802aaf3b9d
commit 3aa4de11b0
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rs/java/android/renderscript/Element.java
View File

@@ -143,17 +143,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;
@@ -161,6 +161,14 @@ public class Element extends BaseObj {
mID = id;
mSize = size;
}
DataType(int id) {
mID = id;
mSize = 4;
if (RenderScript.sPointerSize == 8) {
mSize = 32;
}
}
}
/**