summaryrefslogtreecommitdiffstats
path: root/opengl/java
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-11-17 15:47:28 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-17 15:47:28 -0800
commita37a78e2efe54892a744adfc6330c2d2179dee21 (patch)
treeac24599f75ff1e7d0ed4436cc60994f68f4498e6 /opengl/java
parent31b0c6872dcec0759ff0dbbcfc6bf1e51d3e0f12 (diff)
parent9726b1b54b45f9a165a12bc4738f22c5070a6657 (diff)
downloadframeworks_base-a37a78e2efe54892a744adfc6330c2d2179dee21.zip
frameworks_base-a37a78e2efe54892a744adfc6330c2d2179dee21.tar.gz
frameworks_base-a37a78e2efe54892a744adfc6330c2d2179dee21.tar.bz2
Merge "GLES: add image external enums" into ics-mr1
Diffstat (limited to 'opengl/java')
-rw-r--r--opengl/java/android/opengl/GLES11Ext.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/opengl/java/android/opengl/GLES11Ext.java b/opengl/java/android/opengl/GLES11Ext.java
index 25d5467..484439a 100644
--- a/opengl/java/android/opengl/GLES11Ext.java
+++ b/opengl/java/android/opengl/GLES11Ext.java
@@ -125,6 +125,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 {