diff options
author | Jamie Gennis <jgennis@google.com> | 2012-09-24 18:23:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-24 18:23:04 -0700 |
commit | ca5f79c2bb6c2e3995d9e2427f2600d1b03a84c4 (patch) | |
tree | c6b1e6824a225393ff256f1024c3be08313d361e /opengl/libs | |
parent | 0d45d711976bdca1165536b8948680680d38eb6a (diff) | |
parent | 363847d498bffe0e2d8e7b8aba693bb402513413 (diff) | |
download | frameworks_native-ca5f79c2bb6c2e3995d9e2427f2600d1b03a84c4.zip frameworks_native-ca5f79c2bb6c2e3995d9e2427f2600d1b03a84c4.tar.gz frameworks_native-ca5f79c2bb6c2e3995d9e2427f2600d1b03a84c4.tar.bz2 |
am 363847d4: Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev
* commit '363847d498bffe0e2d8e7b8aba693bb402513413':
EGL: expose the EXT_create_context_robustness ext
Diffstat (limited to 'opengl/libs')
-rw-r--r-- | opengl/libs/EGL/egl_display.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp index 88a17d9..8fd5af1 100644 --- a/opengl/libs/EGL/egl_display.cpp +++ b/opengl/libs/EGL/egl_display.cpp @@ -52,6 +52,7 @@ static char const * const sExtensionString = "EGL_KHR_gl_texture_cubemap_image " "EGL_KHR_gl_renderbuffer_image " "EGL_KHR_fence_sync " + "EGL_EXT_create_context_robustness " "EGL_NV_system_time " "EGL_ANDROID_image_native_buffer " // mandatory ; |