diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-09-24 18:20:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-24 18:20:51 -0700 |
| commit | 363847d498bffe0e2d8e7b8aba693bb402513413 (patch) | |
| tree | 1e9beca2b5f1d98af94c42c756f833168404785c | |
| parent | 500407a2c07ced40c36e7356574a47bcec9c2fd9 (diff) | |
| parent | 09b11432b64d368dee7be69480ab54256058376a (diff) | |
| download | frameworks_native-363847d498bffe0e2d8e7b8aba693bb402513413.zip frameworks_native-363847d498bffe0e2d8e7b8aba693bb402513413.tar.gz frameworks_native-363847d498bffe0e2d8e7b8aba693bb402513413.tar.bz2 | |
Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev
| -rw-r--r-- | opengl/include/EGL/eglext.h | 10 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl_display.cpp | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/opengl/include/EGL/eglext.h b/opengl/include/EGL/eglext.h index 5cfa0db..3348039 100644 --- a/opengl/include/EGL/eglext.h +++ b/opengl/include/EGL/eglext.h @@ -234,6 +234,16 @@ struct ANativeWindowBuffer; #define EGL_RECORDABLE_ANDROID 0x3142 /* EGLConfig attribute */ #endif +/* EGL_EXT_create_context_robustness + */ +#ifndef EGL_EXT_create_context_robustness +#define EGL_EXT_create_context_robustness 1 +#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT 0x30BF +#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT 0x3138 +#define EGL_NO_RESET_NOTIFICATION_EXT 0x31BE +#define EGL_LOSE_CONTEXT_ON_RESET_EXT 0x31BF +#endif + /* EGL_NV_system_time */ #ifndef EGL_NV_system_time 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 ; |