drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Begin using reflected files."

Browse Source
This commit is contained in:
Jason Sams
2010-06-08 15:43:57 -07:00
committed by Android (Google) Code Review
parent 30bb8f89ad e29f3e74f7
commit cbe4a73fef
12 changed files with 163 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
graphics/java/android/renderscript/Element.java
View File

@ -72,12 +72,6 @@ public class Element extends BaseObj {
public enum DataKind {
USER (0),
COLOR (1),
POSITION (2),
TEXTURE (3),
NORMAL (4),
INDEX (5),
POINT_SIZE(6),
PIXEL_L (7),
PIXEL_A (8),
@ -105,6 +99,20 @@ public class Element extends BaseObj {
return rs.mElement_I8;
}
public static Element U16(RenderScript rs) {
if(rs.mElement_U16 == null) {
rs.mElement_U16 = createUser(rs, DataType.UNSIGNED_16);
}
return rs.mElement_U16;
}
public static Element I16(RenderScript rs) {
if(rs.mElement_I16 == null) {
rs.mElement_I16 = createUser(rs, DataType.SIGNED_16);
}
return rs.mElement_I16;
}
public static Element U32(RenderScript rs) {
if(rs.mElement_U32 == null) {
rs.mElement_U32 = createUser(rs, DataType.UNSIGNED_32);
@ -239,13 +247,6 @@ public class Element extends BaseObj {
return rs.mElement_RGBA_8888;
}
public static Element INDEX_16(RenderScript rs) {
if(rs.mElement_INDEX_16 == null) {
rs.mElement_INDEX_16 = createIndex(rs);
}
return rs.mElement_INDEX_16;
}
public static Element F32_2(RenderScript rs) {
if(rs.mElement_FLOAT_2 == null) {
rs.mElement_FLOAT_2 = createVector(rs, DataType.FLOAT_32, 2);
@ -314,10 +315,6 @@ public class Element extends BaseObj {
return new Element(rs, dt, DataKind.USER, false, size);
}
public static Element createIndex(RenderScript rs) {
return new Element(rs, DataType.UNSIGNED_16, DataKind.INDEX, false, 1);
}
public static Element createPixel(RenderScript rs, DataType dt, DataKind dk) {
if (!(dk == DataKind.PIXEL_L ||
dk == DataKind.PIXEL_A ||

1
graphics/java/android/renderscript/RenderScript.java
View File

@ -223,7 +223,6 @@ public class RenderScript {
Element mElement_RGBA_4444;
Element mElement_RGBA_8888;
Element mElement_INDEX_16;
Element mElement_FLOAT_2;
Element mElement_FLOAT_3;
Element mElement_FLOAT_4;

2
graphics/java/android/renderscript/SimpleMesh.java
View File

@ -332,7 +332,7 @@ public class SimpleMesh extends BaseObj {
Builder smb = new Builder(mRS);
smb.addVertexType(mElement, mVtxCount / floatCount);
smb.setIndexType(Element.createIndex(mRS), mIndexCount);
smb.setIndexType(Element.U16(mRS), mIndexCount);
smb.setPrimitive(Primitive.TRIANGLE);
SimpleMesh sm = smb.create();