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

Commit 4c2fc8cb authored by Jack Palevich's avatar Jack Palevich
Browse files

resolved conflicts for merge of fac57636 to master

parents b9863ec0 fac57636

api/current.xml

+6539 −0

File changed.

Preview size limit exceeded, changes collapsed.

opengl/java/android/opengl/GLES20.java

+14 −13
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 


package android.opengl;



/** OpenGL ES 2.0

/** OpenGL ES 2.0. This class exposes the core OpenGL ES 2.0 APIs.

 * All the methods are static.

 */

public class GLES20 {

    public static final int GL_ACTIVE_TEXTURE                          = 0x84E0;
@@ -48,7 +49,7 @@ public class GLES20 { 
    public static final int GL_SRC_ALPHA_SATURATE                      = 0x0308;

    public static final int GL_FUNC_ADD                                = 0x8006;

    public static final int GL_BLEND_EQUATION                          = 0x8009;

    public static final int GL_BLEND_EQUATION_RGB                      = 0x8009;   /* same as BLEND_EQUATION */

    public static final int GL_BLEND_EQUATION_RGB                      = 0x8009;

    public static final int GL_BLEND_EQUATION_ALPHA                    = 0x883D;

    public static final int GL_FUNC_SUBTRACT                           = 0x800A;

    public static final int GL_FUNC_REVERSE_SUBTRACT                   = 0x800B;