Revert "Deprecate"
This reverts commit a0c2eb27b408660b02fa248943166d6c7e447908.
Conflicts:
api/current.txt
graphics/java/android/renderscript/Element.java
graphics/java/android/renderscript/Script.java
Change-Id: I3c8fa62b12da95b3dbc842b5284dbed65d3cf963
diff --git a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java b/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
index 19fca58..14f10f1 100644
--- a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
+++ b/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
@@ -20,7 +20,7 @@
import android.util.Log;
-/** @deprecated renderscript is deprecated in J
+/**
* <p>ProgramFragmentFixedFunction is a helper class that provides
* a way to make a simple fragment shader without writing any
* GLSL code. This class allows for display of constant color, interpolated
@@ -38,7 +38,7 @@
super(rs);
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Creates ProgramFragmentFixedFunction from the current state
* of the builder
*
@@ -76,8 +76,6 @@
}
public static class Builder {
- /** @deprecated renderscript is deprecated in J
- */
public static final int MAX_TEXTURE = 2;
int mNumTextures;
boolean mPointSpriteEnable;
@@ -85,20 +83,14 @@
String mShader;
RenderScript mRS;
- /** @deprecated renderscript is deprecated in J
+ /**
* EnvMode describes how textures are combined with the existing
* color in the fixed function fragment shader
*
**/
public enum EnvMode {
- /** @deprecated renderscript is deprecated in J
- */
REPLACE (1),
- /** @deprecated renderscript is deprecated in J
- */
MODULATE (2),
- /** @deprecated renderscript is deprecated in J
- */
DECAL (3);
int mID;
@@ -107,23 +99,15 @@
}
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Format describes the pixel format of textures in the fixed
* function fragment shader and how they are sampled
*
**/
public enum Format {
- /** @deprecated renderscript is deprecated in J
- */
ALPHA (1),
- /** @deprecated renderscript is deprecated in J
- */
LUMINANCE_ALPHA (2),
- /** @deprecated renderscript is deprecated in J
- */
RGB (3),
- /** @deprecated renderscript is deprecated in J
- */
RGBA (4);
int mID;
@@ -206,7 +190,7 @@
mShader += "}\n";
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Creates a builder for fixed function fragment program
*
* @param rs Context to which the program will belong.
@@ -217,7 +201,7 @@
mPointSpriteEnable = false;
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Adds a texture to be fetched as part of the fixed function
* fragment program
*
@@ -239,7 +223,7 @@
return this;
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Specifies whether the texture coordinate passed from the
* vertex program is replaced with an openGL internal point
* sprite texture coordinate
@@ -250,7 +234,7 @@
return this;
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Specifies whether the varying color passed from the vertex
* program or the constant color set on the fragment program is
* used in the final color calculation in the fixed function
@@ -262,7 +246,7 @@
return this;
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Creates the fixed function fragment program from the current
* state of the builder.
*