GFX api cleanup 1 of 2
Change-Id: Ib85784c18b1647e51f1d7cf2a4c956d17e1d2e3c
diff --git a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java b/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
index 14f10f1..848c5a3 100644
--- a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
+++ b/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (C) 2008-2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
/**
+ * @deprecated in API 16
* <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
@@ -34,11 +35,15 @@
}
static class InternalBuilder extends BaseProgramBuilder {
+ /**
+ * @deprecated in API 16
+ */
public InternalBuilder(RenderScript rs) {
super(rs);
}
/**
+ * @deprecated in API 16
* Creates ProgramFragmentFixedFunction from the current state
* of the builder
*
@@ -75,7 +80,13 @@
}
}
+ /**
+ * @deprecated in API 16
+ */
public static class Builder {
+ /**
+ * @deprecated in API 16
+ */
public static final int MAX_TEXTURE = 2;
int mNumTextures;
boolean mPointSpriteEnable;
@@ -84,13 +95,23 @@
RenderScript mRS;
/**
+ * @deprecated in API 16
* EnvMode describes how textures are combined with the existing
* color in the fixed function fragment shader
*
**/
public enum EnvMode {
+ /**
+ * @deprecated in API 16
+ **/
REPLACE (1),
+ /**
+ * @deprecated in API 16
+ **/
MODULATE (2),
+ /**
+ * @deprecated in API 16
+ **/
DECAL (3);
int mID;
@@ -100,14 +121,27 @@
}
/**
+ * @deprecated in API 16
* Format describes the pixel format of textures in the fixed
* function fragment shader and how they are sampled
*
**/
public enum Format {
+ /**
+ * @deprecated in API 16
+ **/
ALPHA (1),
+ /**
+ * @deprecated in API 16
+ **/
LUMINANCE_ALPHA (2),
+ /**
+ * @deprecated in API 16
+ **/
RGB (3),
+ /**
+ * @deprecated in API 16
+ **/
RGBA (4);
int mID;
@@ -191,6 +225,7 @@
}
/**
+ * @deprecated
* Creates a builder for fixed function fragment program
*
* @param rs Context to which the program will belong.
@@ -202,6 +237,7 @@
}
/**
+ * @deprecated in API 16
* Adds a texture to be fetched as part of the fixed function
* fragment program
*
@@ -224,6 +260,7 @@
}
/**
+ * @deprecated in API 16
* Specifies whether the texture coordinate passed from the
* vertex program is replaced with an openGL internal point
* sprite texture coordinate
@@ -235,6 +272,7 @@
}
/**
+ * @deprecated in API 16
* 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
@@ -247,6 +285,7 @@
}
/**
+ * @deprecated in API 16
* Creates the fixed function fragment program from the current
* state of the builder.
*