diff options
| -rw-r--r-- | src/egl/main/eglapi.c | 17 | ||||
| -rw-r--r-- | src/egl/main/egldisplay.h | 1 | ||||
| -rw-r--r-- | src/egl/main/eglglobals.c | 4 | ||||
| -rw-r--r-- | src/egl/main/eglglobals.h | 1 | ||||
| -rw-r--r-- | src/egl/main/eglmisc.c | 1 |
5 files changed, 23 insertions, 1 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 096c3d8f5d8..511848f93c5 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -357,6 +357,23 @@ eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor) /* limit to APIs supported by core */ disp->ClientAPIs &= _EGL_API_ALL_BITS; + + /* EGL_KHR_get_all_proc_addresses is a corner-case extension. The spec + * classifies it as an EGL display extension, though conceptually it's an + * EGL client extension. + * + * From the EGL_KHR_get_all_proc_addresses spec: + * + * The EGL implementation must expose the name + * EGL_KHR_client_get_all_proc_addresses if and only if it exposes + * EGL_KHR_get_all_proc_addresses and supports + * EGL_EXT_client_extensions. + * + * Mesa unconditionally exposes both client extensions mentioned above, + * so the spec requires that each EGLDisplay unconditionally expose + * EGL_KHR_get_all_proc_addresses also. + */ + disp->Extensions.KHR_get_all_proc_addresses = EGL_TRUE; } /* Update applications version of major and minor if not NULL */ diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index 13b95327bc1..d4b9602de8a 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -97,6 +97,7 @@ struct _egl_extensions EGLBoolean KHR_image_base; EGLBoolean KHR_image_pixmap; EGLBoolean KHR_vg_parent_image; + EGLBoolean KHR_get_all_proc_addresses; EGLBoolean KHR_gl_texture_2D_image; EGLBoolean KHR_gl_texture_cubemap_image; EGLBoolean KHR_gl_texture_3D_image; diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c index cf669cff681..56fe9e29d8b 100644 --- a/src/egl/main/eglglobals.c +++ b/src/egl/main/eglglobals.c @@ -55,7 +55,8 @@ struct _egl_global _eglGlobal = true, /* EGL_EXT_platform_base */ true, /* EGL_EXT_platform_x11 */ true, /* EGL_EXT_platform_wayland */ - true /* EGL_MESA_platform_gbm */ + true, /* EGL_MESA_platform_gbm */ + true, /* EGL_KHR_client_get_all_proc_addresses */ }, /* ClientExtensionsString */ @@ -64,6 +65,7 @@ struct _egl_global _eglGlobal = " EGL_EXT_platform_x11" " EGL_EXT_platform_wayland" " EGL_MESA_platform_gbm" + " EGL_KHR_client_get_all_proc_addresses" }; diff --git a/src/egl/main/eglglobals.h b/src/egl/main/eglglobals.h index 9046ea25c3c..a8cf6d69124 100644 --- a/src/egl/main/eglglobals.h +++ b/src/egl/main/eglglobals.h @@ -56,6 +56,7 @@ struct _egl_global bool EXT_platform_x11; bool EXT_platform_wayland; bool MESA_platform_gbm; + bool KHR_get_all_proc_addresses; } ClientExtensions; const char *ClientExtensionString; diff --git a/src/egl/main/eglmisc.c b/src/egl/main/eglmisc.c index 388e4b51b7a..2f498095ebb 100644 --- a/src/egl/main/eglmisc.c +++ b/src/egl/main/eglmisc.c @@ -101,6 +101,7 @@ _eglUpdateExtensionsString(_EGLDisplay *dpy) _eglAppendExtension(&exts, "EGL_KHR_image"); _EGL_CHECK_EXTENSION(KHR_vg_parent_image); + _EGL_CHECK_EXTENSION(KHR_get_all_proc_addresses); _EGL_CHECK_EXTENSION(KHR_gl_texture_2D_image); _EGL_CHECK_EXTENSION(KHR_gl_texture_cubemap_image); _EGL_CHECK_EXTENSION(KHR_gl_texture_3D_image); |