summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2013-04-16 22:17:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-16 22:17:20 +0000
commitc7bdd50c97d874456d0408599c1a6145186167dd (patch)
tree337db05532cad0918f779b4f918a0f4c901f5fcc /opengl
parentd12a7645a3bf3ffa83b8041bf343f1dc12a2381f (diff)
parent58d80c53c0aa2716b9bb6efa64111e1528cef2f8 (diff)
downloadframeworks_base-c7bdd50c97d874456d0408599c1a6145186167dd.zip
frameworks_base-c7bdd50c97d874456d0408599c1a6145186167dd.tar.gz
frameworks_base-c7bdd50c97d874456d0408599c1a6145186167dd.tar.bz2
Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev
Diffstat (limited to 'opengl')
-rw-r--r--opengl/java/android/opengl/GLES20.java1
-rw-r--r--opengl/java/android/opengl/GLES30.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/opengl/java/android/opengl/GLES20.java b/opengl/java/android/opengl/GLES20.java
index 14abb87..8261474 100644
--- a/opengl/java/android/opengl/GLES20.java
+++ b/opengl/java/android/opengl/GLES20.java
@@ -299,6 +299,7 @@ public class GLES20 {
// GL_STENCIL_INDEX does not appear in gl2.h or gl2ext.h, and there is no
// token with value 0x1901.
//
+ @Deprecated
public static final int GL_STENCIL_INDEX = 0x1901;
public static final int GL_STENCIL_INDEX8 = 0x8D48;
public static final int GL_RENDERBUFFER_WIDTH = 0x8D42;
diff --git a/opengl/java/android/opengl/GLES30.java b/opengl/java/android/opengl/GLES30.java
index ecc96af..9164849 100644
--- a/opengl/java/android/opengl/GLES30.java
+++ b/opengl/java/android/opengl/GLES30.java
@@ -20,7 +20,6 @@
package android.opengl;
/** OpenGL ES 3.0
- * @hide
*/
public class GLES30 extends GLES20 {
public static final int GL_READ_BUFFER = 0x0C02;