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

Commit bcf848e0 authored by Jack Palevich's avatar Jack Palevich Committed by Android Git Automerger
Browse files

am 74befcc7: am 981ccfbb: Implement Matrix Palette extension. 

Merge commit '74befcc7'

* commit '74befcc7':
  Implement Matrix Palette extension.
parents 4c2fc8cb 74befcc7

opengl/java/android/opengl/GLES20.java

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


package android.opengl;



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

 * All the methods are static.

/** OpenGL ES 2.0

 */

public class GLES20 {

    public static final int GL_ACTIVE_TEXTURE                          = 0x84E0;
@@ -49,7 +48,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;

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

    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;