summaryrefslogtreecommitdiffstats
path: root/opengl/specs
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2013-10-02 10:41:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-02 10:41:58 -0700
commit886b152111cc13dcfe1b47724f5e496f12ccc420 (patch)
tree691091775cca7236e3ed1b07b69289eb48c25961 /opengl/specs
parent9b4b1180941f4d2ef9d3e7bd26bc1855ff9fb141 (diff)
parenta9c47f327373cbe48e187442c7f9554d24a75c08 (diff)
downloadframeworks_native-886b152111cc13dcfe1b47724f5e496f12ccc420.zip
frameworks_native-886b152111cc13dcfe1b47724f5e496f12ccc420.tar.gz
frameworks_native-886b152111cc13dcfe1b47724f5e496f12ccc420.tar.bz2
am a9c47f32: Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev
* commit 'a9c47f327373cbe48e187442c7f9554d24a75c08': GLConsumer: start using EGL_ANDROID_image_crop
Diffstat (limited to 'opengl/specs')
-rw-r--r--opengl/specs/README6
1 files changed, 5 insertions, 1 deletions
diff --git a/opengl/specs/README b/opengl/specs/README
index eb86869..f4de1b3 100644
--- a/opengl/specs/README
+++ b/opengl/specs/README
@@ -14,4 +14,8 @@ for use by Android extensions.
0x3145 EGL_SYNC_NATIVE_FENCE_FD_ANDROID (EGL_ANDROID_native_fence_sync)
0x3146 EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID (EGL_ANDROID_native_fence_sync)
0x3147 EGL_FRAMEBUFFER_TARGET_ANDROID (EGL_ANDROID_framebuffer_target)
-0x3148 - 0x314F (unused)
+0x3148 EGL_IMAGE_CROP_LEFT_ANDROID (EGL_ANDROID_image_crop)
+0x3149 EGL_IMAGE_CROP_TOP_ANDROID (EGL_ANDROID_image_crop)
+0x314A EGL_IMAGE_CROP_RIGHT_ANDROID (EGL_ANDROID_image_crop)
+0x314B EGL_IMAGE_CROP_BOTTOM_ANDROID (EGL_ANDROID_image_crop)
+0x314C - 0x314F (unused)