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

Commit f9eed6f9 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

am a37a78e2: Merge "GLES: add image external enums" into ics-mr1 

* commit 'a37a78e2efe54892a744adfc6330c2d2179dee21':
  GLES: add image external enums
parents 5faee2c0 11f8fde8

opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if

+5 −1
Original line number Diff line number Diff line
@@ -124,6 +124,10 @@ public class GLES11Ext { 
    public static final int GL_TEXTURE_MAX_ANISOTROPY_EXT                           = 0x84FE;

    public static final int GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT                       = 0x84FF;

    public static final int GL_BGRA                                                 = 0x80E1;

    public static final int GL_TEXTURE_EXTERNAL_OES                                 = 0x8D65;

    public static final int GL_SAMPLER_EXTERNAL_OES                                 = 0x8D66;

    public static final int GL_TEXTURE_BINDING_EXTERNAL_OES                         = 0x8D67;

    public static final int GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES                     = 0x8D68;



    native private static void _nativeClassInit();

    static {