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

* commit 'a37a78e2efe54892a744adfc6330c2d2179dee21':
  GLES: add image external enums
This commit is contained in:
Jamie Gennis 2011-11-17 15:49:45 -08:00 committed by Android Git Automerger
commit f9eed6f949

View File

@ -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 {
@ -135,4 +139,4 @@ public class GLES11Ext {
private static final int GL_FLOAT = GLES10.GL_FLOAT;
private static final int GL_SHORT = GLES10.GL_SHORT;
private static Buffer _matrixIndexPointerOES;
private static Buffer _matrixIndexPointerOES;