summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-01-16 18:03:55 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-16 18:03:55 -0800
commit237827387d0a1a71293868925359ff43f9930d38 (patch)
tree16ffc0c587864a1298d878dc6a4da2caf6308e7b
parentde5527d9198207c7a23e9e612a29ef8e7666b383 (diff)
parentca41e362662a50383679b18d9832f6120dc721d9 (diff)
downloadframeworks_native-237827387d0a1a71293868925359ff43f9930d38.zip
frameworks_native-237827387d0a1a71293868925359ff43f9930d38.tar.gz
frameworks_native-237827387d0a1a71293868925359ff43f9930d38.tar.bz2
Merge "egl: expose EGLimage extensions" into honeycomb
-rw-r--r--opengl/libs/EGL/egl.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
index 386cc5d..0e3de06 100644
--- a/opengl/libs/EGL/egl.cpp
+++ b/opengl/libs/EGL/egl.cpp
@@ -62,6 +62,8 @@ static char const * const gExtensionString =
"EGL_KHR_image_base "
"EGL_KHR_image_pixmap "
"EGL_KHR_gl_texture_2D_image "
+ "EGL_KHR_gl_texture_cubemap_image "
+ "EGL_KHR_gl_renderbuffer_image "
"EGL_KHR_fence_sync "
"EGL_ANDROID_image_native_buffer "
"EGL_ANDROID_swap_rectangle "