am 364ed954: Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension"

* commit '364ed9545382539ab9875555947bc18ec94bb82b':
  libEGL: whitelist the EGL_KHR_create_context_no_error extension
This commit is contained in:
Jesse Hall 2015-05-11 21:42:24 +00:00 committed by Android Git Automerger
commit eec21aeec9
2 changed files with 6 additions and 0 deletions

View File

@ -444,6 +444,11 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMTIMEKHRPROC)(EGLDisplay dpy, E
#define EGL_OPENGL_ES3_BIT_KHR 0x00000040 #define EGL_OPENGL_ES3_BIT_KHR 0x00000040
#endif #endif
#ifndef EGL_KHR_create_context_no_error
#define EGL_KHR_create_context_no_error 1
#define EGL_CONTEXT_OPENGL_NO_ERROR_KHR 0x31B3
#endif /* EGL_KHR_create_context_no_error */
#ifndef EGL_KHR_surfaceless_context #ifndef EGL_KHR_surfaceless_context
#define EGL_KHR_surfaceless_context 1 #define EGL_KHR_surfaceless_context 1
/* No tokens/entry points, just relaxes an error condition */ /* No tokens/entry points, just relaxes an error condition */

View File

@ -103,6 +103,7 @@ extern char const * const gExtensionString =
"EGL_ANDROID_recordable " // mandatory "EGL_ANDROID_recordable " // mandatory
"EGL_KHR_partial_update " // strongly recommended "EGL_KHR_partial_update " // strongly recommended
"EGL_EXT_buffer_age " // strongly recommended with partial_update "EGL_EXT_buffer_age " // strongly recommended with partial_update
"EGL_KHR_create_context_no_error "
; ;
// extensions not exposed to applications but used by the ANDROID system // extensions not exposed to applications but used by the ANDROID system