GFX api cleanup 2 of 2
Change-Id: Ie928b8ee7d31fcaa26fcad9a2548581bb8395a61
diff --git a/graphics/java/android/renderscript/Mesh.java b/graphics/java/android/renderscript/Mesh.java
index f49a24e..7210513 100644
--- a/graphics/java/android/renderscript/Mesh.java
+++ b/graphics/java/android/renderscript/Mesh.java
@@ -21,6 +21,7 @@
import android.util.Log;
/**
+ * @deprecated in API 16
* <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
@@ -40,33 +41,40 @@
public class Mesh extends BaseObj {
/**
+ * @deprecated in API 16
* Describes the way mesh vertex data is interpreted when rendering
*
**/
public enum Primitive {
/**
+ * @deprecated in API 16
* Vertex data will be rendered as a series of points
*/
POINT (0),
/**
+ * @deprecated in API 16
* Vertex pairs will be rendered as lines
*/
LINE (1),
/**
+ * @deprecated in API 16
* Vertex data will be rendered as a connected line strip
*/
LINE_STRIP (2),
/**
+ * @deprecated in API 16
* Vertices will be rendered as individual triangles
*/
TRIANGLE (3),
/**
+ * @deprecated in API 16
* 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 in API 16
* Vertices will be rendered as a sequence of triangles that all
* share first vertex as the origin
*/
@@ -87,6 +95,7 @@
}
/**
+ * @deprecated in API 16
* @return number of allocations containing vertex data
*
**/
@@ -97,6 +106,7 @@
return mVertexBuffers.length;
}
/**
+ * @deprecated in API 16
* @param slot index in the list of allocations to return
* @return vertex data allocation at the given index
*
@@ -106,6 +116,7 @@
}
/**
+ * @deprecated in API 16
* @return number of primitives or index sets in the mesh
*
**/
@@ -117,6 +128,7 @@
}
/**
+ * @deprecated in API 16
* @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
@@ -126,6 +138,7 @@
return mIndexBuffers[slot];
}
/**
+ * @deprecated in API 16
* @param slot locaiton within the list of index set primitives
* @return index set primitive type
*
@@ -168,6 +181,7 @@
}
/**
+ * @deprecated in API 16
* Mesh builder object. It starts empty and requires you to
* add the types necessary to create vertex and index
* allocations.
@@ -190,6 +204,7 @@
Vector mIndexTypes;
/**
+ * @deprecated in API 16
* Creates builder object
* @param rs Context to which the mesh will belong.
* @param usage specifies how the mesh allocations are to be
@@ -205,6 +220,7 @@
}
/**
+ * @deprecated in API 16
* @return internal index of the last vertex buffer type added to
* builder
**/
@@ -213,6 +229,7 @@
}
/**
+ * @deprecated in API 16
* @return internal index of the last index set added to the
* builder
**/
@@ -221,6 +238,7 @@
}
/**
+ * @deprecated in API 16
* Adds a vertex data type to the builder object
*
* @param t type of the vertex data allocation to be created
@@ -240,6 +258,7 @@
}
/**
+ * @deprecated in API 16
* Adds a vertex data type to the builder object
*
* @param e element describing the vertex data layout
@@ -261,6 +280,7 @@
}
/**
+ * @deprecated in API 16
* Adds an index set data type to the builder object
*
* @param t type of the index set data, could be null
@@ -279,6 +299,7 @@
}
/**
+ * @deprecated in API 16
* Adds an index set primitive type to the builder object
*
* @param p primitive type
@@ -296,6 +317,7 @@
}
/**
+ * @deprecated in API 16
* Adds an index set data type to the builder object
*
* @param e element describing the index set data layout
@@ -321,6 +343,7 @@
}
/**
+ * @deprecated in API 16
* Create a Mesh object from the current state of the builder
*
**/
diff --git a/graphics/java/android/renderscript/ProgramFragment.java b/graphics/java/android/renderscript/ProgramFragment.java
index fa6e2d4..69968ac 100644
--- a/graphics/java/android/renderscript/ProgramFragment.java
+++ b/graphics/java/android/renderscript/ProgramFragment.java
@@ -21,6 +21,7 @@
/**
+ * @deprecated in API 16
* <p>The Renderscript fragment program, also known as fragment shader is responsible
* for manipulating pixel data in a user defined way. It's constructed from a GLSL
* shader string containing the program body, textures inputs, and a Type object
@@ -41,8 +42,12 @@
super(id, rs);
}
+ /**
+ * @deprecated in API 16
+ */
public static class Builder extends BaseProgramBuilder {
/**
+ * @deprecated in API 16
* Create a builder object.
*
* @param rs Context to which the program will belong.
@@ -52,6 +57,7 @@
}
/**
+ * @deprecated in API 16
* Creates ProgramFragment from the current state of the builder
*
* @return ProgramFragment
diff --git a/graphics/java/android/renderscript/ProgramRaster.java b/graphics/java/android/renderscript/ProgramRaster.java
index e40751f..c44521b 100644
--- a/graphics/java/android/renderscript/ProgramRaster.java
+++ b/graphics/java/android/renderscript/ProgramRaster.java
@@ -21,14 +21,27 @@
/**
+ * @deprecated in API 16
* Program raster is primarily used to specify whether point sprites are enabled and to control
* the culling mode. By default, back faces are culled.
**/
public class ProgramRaster extends BaseObj {
+ /**
+ * @deprecated in API 16
+ **/
public enum CullMode {
+ /**
+ * @deprecated in API 16
+ **/
BACK (0),
+ /**
+ * @deprecated in API 16
+ **/
FRONT (1),
+ /**
+ * @deprecated in API 16
+ **/
NONE (2);
int mID;
@@ -48,6 +61,7 @@
}
/**
+ * @deprecated in API 16
* Specifies whether vertices are rendered as screen aligned
* elements of a specified size
* @return whether point sprites are enabled
@@ -57,6 +71,7 @@
}
/**
+ * @deprecated in API 16
* Specifies how triangles are culled based on their orientation
* @return cull mode
*/
@@ -64,6 +79,9 @@
return mCullMode;
}
+ /**
+ * @deprecated in API 16
+ */
public static ProgramRaster CULL_BACK(RenderScript rs) {
if(rs.mProgramRaster_CULL_BACK == null) {
ProgramRaster.Builder builder = new ProgramRaster.Builder(rs);
@@ -73,6 +91,9 @@
return rs.mProgramRaster_CULL_BACK;
}
+ /**
+ * @deprecated in API 16
+ */
public static ProgramRaster CULL_FRONT(RenderScript rs) {
if(rs.mProgramRaster_CULL_FRONT == null) {
ProgramRaster.Builder builder = new ProgramRaster.Builder(rs);
@@ -82,6 +103,9 @@
return rs.mProgramRaster_CULL_FRONT;
}
+ /**
+ * @deprecated in API 16
+ */
public static ProgramRaster CULL_NONE(RenderScript rs) {
if(rs.mProgramRaster_CULL_NONE == null) {
ProgramRaster.Builder builder = new ProgramRaster.Builder(rs);
@@ -91,27 +115,42 @@
return rs.mProgramRaster_CULL_NONE;
}
+ /**
+ * @deprecated in API 16
+ */
public static class Builder {
RenderScript mRS;
boolean mPointSprite;
CullMode mCullMode;
+ /**
+ * @deprecated in API 16
+ */
public Builder(RenderScript rs) {
mRS = rs;
mPointSprite = false;
mCullMode = CullMode.BACK;
}
+ /**
+ * @deprecated in API 16
+ */
public Builder setPointSpriteEnabled(boolean enable) {
mPointSprite = enable;
return this;
}
+ /**
+ * @deprecated in API 16
+ */
public Builder setCullMode(CullMode m) {
mCullMode = m;
return this;
}
+ /**
+ * @deprecated in API 16
+ */
public ProgramRaster create() {
mRS.validate();
int id = mRS.nProgramRasterCreate(mPointSprite, mCullMode.mID);
diff --git a/graphics/java/android/renderscript/ProgramVertex.java b/graphics/java/android/renderscript/ProgramVertex.java
index 74d666b..2bd5124 100644
--- a/graphics/java/android/renderscript/ProgramVertex.java
+++ b/graphics/java/android/renderscript/ProgramVertex.java
@@ -43,6 +43,7 @@
/**
+ * @deprecated in API 16
* ProgramVertex, also know as a vertex shader, describes a
* stage in the graphics pipeline responsible for manipulating
* geometric data in a user-defined way.
@@ -55,6 +56,7 @@
}
/**
+ * @deprecated in API 16
* @return number of input attribute elements
*/
public int getInputCount() {
@@ -62,6 +64,7 @@
}
/**
+ * @deprecated in API 16
* @param slot location of the input to return
* @return input attribute element
*/
@@ -73,6 +76,7 @@
}
/**
+ * @deprecated in API 16
* Builder class for creating ProgramVertex objects.
* The builder starts empty and the user must minimally provide
* the GLSL shader code, and the varying inputs. Constant, or
@@ -82,6 +86,7 @@
**/
public static class Builder extends BaseProgramBuilder {
/**
+ * @deprecated in API 16
* Create a builder object.
*
* @param rs Context to which the program will belong.
@@ -91,6 +96,7 @@
}
/**
+ * @deprecated in API 16
* Add varying inputs to the program
*
* @param e element describing the layout of the varying input
@@ -110,6 +116,7 @@
}
/**
+ * @deprecated in API 16
* Creates ProgramVertex from the current state of the builder
*
* @return ProgramVertex
diff --git a/graphics/java/android/renderscript/RSTextureView.java b/graphics/java/android/renderscript/RSTextureView.java
index 30b2f99..ed04000 100644
--- a/graphics/java/android/renderscript/RSTextureView.java
+++ b/graphics/java/android/renderscript/RSTextureView.java
@@ -29,6 +29,7 @@
import android.view.TextureView;
/**
+ * @deprecated in API 16
* The Texture View for a graphics renderscript (RenderScriptGL)
* to draw on.
*
@@ -38,6 +39,7 @@
private SurfaceTexture mSurfaceTexture;
/**
+ * @deprecated in API 16
* Standard View constructor. In order to render something, you
* must call {@link android.opengl.GLSurfaceView#setRenderer} to
* register a renderer.
@@ -49,6 +51,7 @@
}
/**
+ * @deprecated in API 16
* Standard View constructor. In order to render something, you
* must call {@link android.opengl.GLSurfaceView#setRenderer} to
* register a renderer.
@@ -64,6 +67,9 @@
//android.util.Log.e("rs", "getSurfaceTextureListerner " + getSurfaceTextureListener());
}
+ /**
+ * @deprecated in API 16
+ */
@Override
public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
//Log.e(RenderScript.LOG_TAG, "onSurfaceTextureAvailable");
@@ -74,6 +80,9 @@
}
}
+ /**
+ * @deprecated in API 16
+ */
@Override
public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
//Log.e(RenderScript.LOG_TAG, "onSurfaceTextureSizeChanged");
@@ -84,6 +93,9 @@
}
}
+ /**
+ * @deprecated in API 16
+ */
@Override
public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
//Log.e(RenderScript.LOG_TAG, "onSurfaceTextureDestroyed");
@@ -96,6 +108,9 @@
return true;
}
+ /**
+ * @deprecated in API 16
+ */
@Override
public void onSurfaceTextureUpdated(SurfaceTexture surface) {
//Log.e(RenderScript.LOG_TAG, "onSurfaceTextureUpdated");
@@ -103,6 +118,7 @@
}
/**
+ * @deprecated in API 16
* Inform the view that the activity is paused. The owner of this view must
* call this method when the activity is paused. Calling this method will
* pause the rendering thread.
@@ -115,6 +131,7 @@
}
/**
+ * @deprecated in API 16
* Inform the view that the activity is resumed. The owner of this view must
* call this method when the activity is resumed. Calling this method will
* recreate the OpenGL display and resume the rendering
@@ -128,6 +145,7 @@
}
/**
+ * @deprecated in API 16
* Create a new RenderScriptGL object and attach it to the
* TextureView if present.
*
@@ -146,6 +164,7 @@
}
/**
+ * @deprecated in API 16
* Destroy the RenderScriptGL object associated with this
* TextureView.
*/
@@ -155,6 +174,7 @@
}
/**
+ * @deprecated in API 16
* Set a new RenderScriptGL object. This also will attach the
* new object to the TextureView if present.
*
@@ -168,6 +188,7 @@
}
/**
+ * @deprecated in API 16
* Returns the previously set RenderScriptGL object.
*
* @return RenderScriptGL
diff --git a/graphics/java/android/renderscript/RenderScriptGL.java b/graphics/java/android/renderscript/RenderScriptGL.java
index dbdbe3d..12c8102 100644
--- a/graphics/java/android/renderscript/RenderScriptGL.java
+++ b/graphics/java/android/renderscript/RenderScriptGL.java
@@ -29,6 +29,7 @@
import android.view.SurfaceView;
/**
+ * @deprecated in API 16
* The Graphics derivitive of Renderscript. Extends the basic context to add a
* root script which is the display window for graphical output. When the
* system needs to update the display the currently bound root script will be
@@ -46,6 +47,7 @@
int mHeight;
/**
+ * @deprecated in API 16
* Class which is used to describe a pixel format for a graphical buffer.
* This is used to describe the intended format of the display surface.
*
@@ -66,9 +68,15 @@
int mSamplesPref = 1;
float mSamplesQ = 1.f;
+ /**
+ * @deprecated in API 16
+ */
public SurfaceConfig() {
}
+ /**
+ * @deprecated in API 16
+ */
public SurfaceConfig(SurfaceConfig sc) {
mDepthMin = sc.mDepthMin;
mDepthPref = sc.mDepthPref;
@@ -93,6 +101,7 @@
}
/**
+ * @deprecated in API 16
* Set the per-component bit depth for color (red, green, blue). This
* configures the surface for an unsigned integer buffer type.
*
@@ -106,6 +115,7 @@
}
/**
+ * @deprecated in API 16
* Set the bit depth for alpha. This configures the surface for
* an unsigned integer buffer type.
*
@@ -119,6 +129,7 @@
}
/**
+ * @deprecated in API 16
* Set the bit depth for the depth buffer. This configures the
* surface for an unsigned integer buffer type. If a minimum of 0
* is specified then its possible no depth buffer will be
@@ -134,6 +145,7 @@
}
/**
+ * @deprecated in API 16
* Configure the multisample rendering.
*
* @param minimum The required number of samples, must be at least 1.
@@ -157,6 +169,7 @@
SurfaceConfig mSurfaceConfig;
/**
+ * @deprecated in API 16
* Construct a new RenderScriptGL context.
*
* @param ctx The context.
@@ -187,6 +200,7 @@
}
/**
+ * @deprecated in API 16
* Bind an os surface
*
*
@@ -223,6 +237,7 @@
}
/**
+ * @deprecated in API 16
* return the height of the last set surface.
*
* @return int
@@ -232,6 +247,7 @@
}
/**
+ * @deprecated in API 16
* return the width of the last set surface.
*
* @return int
@@ -241,6 +257,7 @@
}
/**
+ * @deprecated in API 16
* Temporarly halt calls to the root rendering script.
*
*/
@@ -250,6 +267,7 @@
}
/**
+ * @deprecated in API 16
* Resume calls to the root rendering script.
*
*/
@@ -260,6 +278,7 @@
/**
+ * @deprecated in API 16
* Set the script to handle calls to render the primary surface.
*
* @param s Graphics script to process rendering requests.
@@ -270,6 +289,7 @@
}
/**
+ * @deprecated in API 16
* Set the default ProgramStore object seen as the parent state by the root
* rendering script.
*
@@ -281,6 +301,7 @@
}
/**
+ * @deprecated in API 16
* Set the default ProgramFragment object seen as the parent state by the
* root rendering script.
*
@@ -292,6 +313,7 @@
}
/**
+ * @deprecated in API 16
* Set the default ProgramRaster object seen as the parent state by the
* root rendering script.
*
@@ -303,6 +325,7 @@
}
/**
+ * @deprecated in API 16
* Set the default ProgramVertex object seen as the parent state by the
* root rendering script.
*