diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-11-18 02:37:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-18 02:37:22 -0800 |
| commit | fa1a6eb584dde49d424fa53a995a6d0dbd45155c (patch) | |
| tree | dd338b7c9df14f53b01e8d58209c1366eda3ceb3 /opengl/java/android | |
| parent | e761f1e58f3946b01f9715e145b402db16f81367 (diff) | |
| parent | 0272e60060162d2c32aec02d9cd1414dbbe14782 (diff) | |
| download | frameworks_base-fa1a6eb584dde49d424fa53a995a6d0dbd45155c.zip frameworks_base-fa1a6eb584dde49d424fa53a995a6d0dbd45155c.tar.gz frameworks_base-fa1a6eb584dde49d424fa53a995a6d0dbd45155c.tar.bz2 | |
am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into ics-mr1
* commit '0272e60060162d2c32aec02d9cd1414dbbe14782':
GLES: add image external enums
Diffstat (limited to 'opengl/java/android')
| -rw-r--r-- | opengl/java/android/opengl/GLES11Ext.java | 4 |
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 { |