Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25beec15 authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am b690c9a2: am c7bdd50c: Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev 

* commit 'b690c9a2':
  Unhide android.opengl.GLES30 class and contents
parents 67c43942 b690c9a2

api/current.txt

+471 −1

File changed.

Preview size limit exceeded, changes collapsed.

opengl/java/android/opengl/GLES20.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

opengl/java/android/opengl/GLES30.java

+0 −1
Original line number Diff line number Diff line
@@ -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;