Mesa (master): egl/main: fix EGL_KHR_get_all_proc_addresses

Emil Velikov evelikov at kemper.freedesktop.org
Thu May 14 20:02:00 UTC 2015


Module: Mesa
Branch: master
Commit: 448e01b2918c76dfff8abfbd56a606fdff8c356c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=448e01b2918c76dfff8abfbd56a606fdff8c356c

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Tue May 12 00:30:16 2015 +0100

egl/main: fix EGL_KHR_get_all_proc_addresses

The extension requires that the address of the core functions should be
available via eglGetProcAddress. Currently the list is guarded by
_EGL_GET_CORE_ADDRESSES, which was only set for the scons (windows)
build.

Unconditionally enable it for all the builds (automake, android and
haiku) considering that the extension is not platform specific and is
always enabled.

v2: Drop the _EGL_GET_CORE_ADDRESSES macro altogether.

Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/egl/main/eglapi.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index e4d098c..dbfad63 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -1674,8 +1674,9 @@ eglGetProcAddress(const char *procname)
       const char *name;
       _EGLProc function;
    } egl_functions[] = {
-      /* core functions should not be queryable, but, well... */
-#ifdef _EGL_GET_CORE_ADDRESSES
+      /* core functions queryable in the presence of
+       * EGL_KHR_get_all_proc_addresses or EGL 1.5
+       */
       /* alphabetical order */
       { "eglBindAPI", (_EGLProc) eglBindAPI },
       { "eglBindTexImage", (_EGLProc) eglBindTexImage },
@@ -1711,7 +1712,6 @@ eglGetProcAddress(const char *procname)
       { "eglWaitClient", (_EGLProc) eglWaitClient },
       { "eglWaitGL", (_EGLProc) eglWaitGL },
       { "eglWaitNative", (_EGLProc) eglWaitNative },
-#endif /* _EGL_GET_CORE_ADDRESSES */
 #ifdef EGL_MESA_drm_display
       { "eglGetDRMDisplayMESA", (_EGLProc) eglGetDRMDisplayMESA },
 #endif




More information about the mesa-commit mailing list