Deprecate
Change-Id: Idad2c5ad4f8a30f8cc60d88318f2e1809866d309
diff --git a/graphics/java/android/renderscript/Mesh.java b/graphics/java/android/renderscript/Mesh.java
index ffbb41d..bc32038 100644
--- a/graphics/java/android/renderscript/Mesh.java
+++ b/graphics/java/android/renderscript/Mesh.java
@@ -20,7 +20,7 @@
import android.util.Log;
-/**
+/** @deprecated renderscript is deprecated in J
* <p>This class is a container for geometric data displayed with
* Renderscript. Internally, a mesh is a collection of allocations that
* represent vertex data (positions, normals, texture
@@ -39,34 +39,34 @@
**/
public class Mesh extends BaseObj {
- /**
+ /** @deprecated renderscript is deprecated in J
* Describes the way mesh vertex data is interpreted when rendering
*
**/
public enum Primitive {
- /**
+ /** @deprecated renderscript is deprecated in J
* Vertex data will be rendered as a series of points
*/
POINT (0),
- /**
+ /** @deprecated renderscript is deprecated in J
* Vertex pairs will be rendered as lines
*/
LINE (1),
- /**
+ /** @deprecated renderscript is deprecated in J
* Vertex data will be rendered as a connected line strip
*/
LINE_STRIP (2),
- /**
+ /** @deprecated renderscript is deprecated in J
* Vertices will be rendered as individual triangles
*/
TRIANGLE (3),
- /**
+ /** @deprecated renderscript is deprecated in J
* Vertices will be rendered as a connected triangle strip
* defined by the first three vertices with each additional
* triangle defined by a new vertex
*/
TRIANGLE_STRIP (4),
- /**
+ /** @deprecated renderscript is deprecated in J
* Vertices will be rendered as a sequence of triangles that all
* share first vertex as the origin
*/
@@ -86,7 +86,7 @@
super(id, rs);
}
- /**
+ /** @deprecated renderscript is deprecated in J
* @return number of allocations containing vertex data
*
**/
@@ -96,7 +96,7 @@
}
return mVertexBuffers.length;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* @param slot index in the list of allocations to return
* @return vertex data allocation at the given index
*
@@ -105,7 +105,7 @@
return mVertexBuffers[slot];
}
- /**
+ /** @deprecated renderscript is deprecated in J
* @return number of primitives or index sets in the mesh
*
**/
@@ -116,7 +116,7 @@
return mIndexBuffers.length;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* @param slot locaton within the list of index set allocation
* @return allocation containing primtive index data or null if
* the index data is not specified explicitly
@@ -125,7 +125,7 @@
public Allocation getIndexSetAllocation(int slot) {
return mIndexBuffers[slot];
}
- /**
+ /** @deprecated renderscript is deprecated in J
* @param slot locaiton within the list of index set primitives
* @return index set primitive type
*
@@ -167,7 +167,7 @@
}
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Mesh builder object. It starts empty and requires you to
* add the types necessary to create vertex and index
* allocations.
@@ -189,7 +189,7 @@
Entry[] mVertexTypes;
Vector mIndexTypes;
- /**
+ /** @deprecated renderscript is deprecated in J
* Creates builder object
* @param rs Context to which the mesh will belong.
* @param usage specifies how the mesh allocations are to be
@@ -204,7 +204,7 @@
mIndexTypes = new Vector();
}
- /**
+ /** @deprecated renderscript is deprecated in J
* @return internal index of the last vertex buffer type added to
* builder
**/
@@ -212,7 +212,7 @@
return mVertexTypeCount - 1;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* @return internal index of the last index set added to the
* builder
**/
@@ -220,7 +220,7 @@
return mIndexTypes.size() - 1;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Adds a vertex data type to the builder object
*
* @param t type of the vertex data allocation to be created
@@ -239,7 +239,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Adds a vertex data type to the builder object
*
* @param e element describing the vertex data layout
@@ -260,7 +260,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Adds an index set data type to the builder object
*
* @param t type of the index set data, could be null
@@ -278,7 +278,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Adds an index set primitive type to the builder object
*
* @param p primitive type
@@ -295,7 +295,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Adds an index set data type to the builder object
*
* @param e element describing the index set data layout
@@ -320,7 +320,7 @@
return tb.create();
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Create a Mesh object from the current state of the builder
*
**/
@@ -372,7 +372,7 @@
}
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Mesh builder object. It starts empty and requires the user to
* add all the vertex and index allocations that comprise the
* mesh
@@ -391,6 +391,8 @@
Vector mIndexTypes;
+ /** @deprecated renderscript is deprecated in J
+ */
public AllocationBuilder(RenderScript rs) {
mRS = rs;
mVertexTypeCount = 0;
@@ -398,7 +400,7 @@
mIndexTypes = new Vector();
}
- /**
+ /** @deprecated renderscript is deprecated in J
* @return internal index of the last vertex buffer type added to
* builder
**/
@@ -406,7 +408,7 @@
return mVertexTypeCount - 1;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* @return internal index of the last index set added to the
* builder
**/
@@ -414,7 +416,7 @@
return mIndexTypes.size() - 1;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Adds an allocation containing vertex buffer data to the
* builder
*
@@ -433,7 +435,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Adds an allocation containing index buffer data and index type
* to the builder
*
@@ -450,7 +452,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Adds an index set type to the builder
*
* @param p index set primitive type
@@ -465,7 +467,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Create a Mesh object from the current state of the builder
*
**/
@@ -506,7 +508,7 @@
}
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Builder that allows creation of a mesh object point by point
* and triangle by triangle
*
@@ -533,11 +535,17 @@
int mVtxSize;
int mFlags;
+ /** @deprecated renderscript is deprecated in J
+ */
public static final int COLOR = 0x0001;
+ /** @deprecated renderscript is deprecated in J
+ */
public static final int NORMAL = 0x0002;
+ /** @deprecated renderscript is deprecated in J
+ */
public static final int TEXTURE_0 = 0x0100;
- /**
+ /** @deprecated renderscript is deprecated in J
* @param rs Context to which the mesh will belong.
* @param vtxSize specifies whether the vertex is a float2 or
* float3
@@ -592,7 +600,7 @@
mMaxIndex ++;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Adds a float2 vertex to the mesh
*
* @param x position x
@@ -612,7 +620,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Adds a float3 vertex to the mesh
*
* @param x position x
@@ -635,7 +643,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Sets the texture coordinate for the vertices that are added after this method call.
*
* @param s texture coordinate s
@@ -652,7 +660,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Sets the normal vector for the vertices that are added after this method call.
*
* @param x normal vector x
@@ -671,7 +679,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Sets the color for the vertices that are added after this method call.
*
* @param r red component
@@ -692,7 +700,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Adds a new triangle to the mesh builder
*
* @param idx1 index of the first vertex in the triangle
@@ -718,7 +726,7 @@
return this;
}
- /**
+ /** @deprecated renderscript is deprecated in J
* Creates the mesh object from the current state of the builder
*
* @param uploadToBufferObject specifies whether the vertex data