diff options
| author | Jesse Hall <jessehall@google.com> | 2015-05-12 17:31:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-12 17:31:25 +0000 |
| commit | 2a7dde58036e02b2417e49c8965d4a518d981b0b (patch) | |
| tree | 35f12a9d42ed72bc77f4310d7046d69bb2fe9a6d /opengl | |
| parent | dc13c5b85b099050c73297a19f1ef89308f7620b (diff) | |
| parent | 408e59f63aaaba30fb6db1477e985025dda085cd (diff) | |
| download | frameworks_native-2a7dde58036e02b2417e49c8965d4a518d981b0b.zip frameworks_native-2a7dde58036e02b2417e49c8965d4a518d981b0b.tar.gz frameworks_native-2a7dde58036e02b2417e49c8965d4a518d981b0b.tar.bz2 | |
Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension" into mnc-dev
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/include/EGL/eglext.h | 5 | ||||
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/opengl/include/EGL/eglext.h b/opengl/include/EGL/eglext.h index 25f7607..b2abdb1 100644 --- a/opengl/include/EGL/eglext.h +++ b/opengl/include/EGL/eglext.h @@ -444,6 +444,11 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMTIMEKHRPROC)(EGLDisplay dpy, E #define EGL_OPENGL_ES3_BIT_KHR 0x00000040 #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 #define EGL_KHR_surfaceless_context 1 /* No tokens/entry points, just relaxes an error condition */ diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index f5b90dd..5444631 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -103,6 +103,7 @@ extern char const * const gExtensionString = "EGL_ANDROID_recordable " // mandatory "EGL_KHR_partial_update " // strongly recommended "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 |