summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jamie Gennis <jgennis@google.com> 2011-11-17 15:47:28 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-11-17 15:47:28 -0800
commit11f8fde84d594b9f78548d0d0ca385d8747150fe (patch)
tree0cd3e64204efb7bec9ab9dfe2304024bed5db6b8
parent2c7ae67462f55887a96a13125f89b5715e58ac20 (diff)
parent9c6c6992e010672b559a0da19d5079a6da2509d7 (diff)
Merge "GLES: add image external enums" into ics-mr1
-rw-r--r--opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if6
1 files changed, 5 insertions, 1 deletions
diff --git a/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if b/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if
index c5e34cd1b9..0c5fa04f13 100644
--- a/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if
+++ b/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if
@@ -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; \ No newline at end of file
+ private static Buffer _matrixIndexPointerOES;