[Mesa-dev,09/15] egl: add EGL 1.5 functions that don't need any changes from extensions

Submitted by Marek Olšák on May 12, 2015, 10:54 p.m.

Details

Message ID 1431471290-7299-10-git-send-email-maraeo@gmail.com
State New
Headers show

Not browsing as part of any series.

Commit Message

Marek Olšák May 12, 2015, 10:54 p.m.
From: Marek Olšák <marek.olsak@amd.com>

Declare the functions without the suffix, so that the core names are exported.
---
 src/egl/main/eglapi.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 9f09466..60df297 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -1158,16 +1158,20 @@  eglGetProcAddress(const char *procname)
       { "eglWaitClient", (_EGLProc) eglWaitClient },
       { "eglWaitGL", (_EGLProc) eglWaitGL },
       { "eglWaitNative", (_EGLProc) eglWaitNative },
+      { "eglCreateSync", (_EGLProc) eglCreateSync },
+      { "eglDestroySync", (_EGLProc) eglDestroySync },
+      { "eglClientWaitSync", (_EGLProc) eglClientWaitSync },
+      { "eglDestroyImage", (_EGLProc) eglDestroyImage },
 #endif /* _EGL_GET_CORE_ADDRESSES */
 #ifdef EGL_MESA_drm_display
       { "eglGetDRMDisplayMESA", (_EGLProc) eglGetDRMDisplayMESA },
 #endif
       { "eglCreateImageKHR", (_EGLProc) eglCreateImageKHR },
-      { "eglDestroyImageKHR", (_EGLProc) eglDestroyImageKHR },
+      { "eglDestroyImageKHR", (_EGLProc) eglDestroyImage },
       { "eglCreateSyncKHR", (_EGLProc) eglCreateSyncKHR },
-      { "eglCreateSync64KHR", (_EGLProc) eglCreateSync64KHR },
-      { "eglDestroySyncKHR", (_EGLProc) eglDestroySyncKHR },
-      { "eglClientWaitSyncKHR", (_EGLProc) eglClientWaitSyncKHR },
+      { "eglCreateSync64KHR", (_EGLProc) eglCreateSync },
+      { "eglDestroySyncKHR", (_EGLProc) eglDestroySync },
+      { "eglClientWaitSyncKHR", (_EGLProc) eglClientWaitSync },
       { "eglWaitSyncKHR", (_EGLProc) eglWaitSyncKHR },
       { "eglSignalSyncKHR", (_EGLProc) eglSignalSyncKHR },
       { "eglGetSyncAttribKHR", (_EGLProc) eglGetSyncAttribKHR },
@@ -1365,7 +1369,7 @@  eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target,
 
 
 EGLBoolean EGLAPIENTRY
-eglDestroyImageKHR(EGLDisplay dpy, EGLImage image)
+eglDestroyImage(EGLDisplay dpy, EGLImage image)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
    _EGLImage *img = _eglLookupImage(image, disp);
@@ -1437,14 +1441,14 @@  eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list)
 
 
 EGLSync EGLAPIENTRY
-eglCreateSync64KHR(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list)
+eglCreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list)
 {
    return _eglCreateSync(dpy, type, NULL, attrib_list, EGL_TRUE);
 }
 
 
 EGLBoolean EGLAPIENTRY
-eglDestroySyncKHR(EGLDisplay dpy, EGLSync sync)
+eglDestroySync(EGLDisplay dpy, EGLSync sync)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
    _EGLSync *s = _eglLookupSync(sync, disp);
@@ -1463,7 +1467,7 @@  eglDestroySyncKHR(EGLDisplay dpy, EGLSync sync)
 
 
 EGLint EGLAPIENTRY
-eglClientWaitSyncKHR(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout)
+eglClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
    _EGLSync *s = _eglLookupSync(sync, disp);

Comments

On 12/05/15 22:54, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak@amd.com>
> 
> Declare the functions without the suffix, so that the core names are exported.
> ---
>  src/egl/main/eglapi.c | 20 ++++++++++++--------
>  1 file changed, 12 insertions(+), 8 deletions(-)
> 
> diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
> index 9f09466..60df297 100644
> --- a/src/egl/main/eglapi.c
> +++ b/src/egl/main/eglapi.c
> @@ -1158,16 +1158,20 @@ eglGetProcAddress(const char *procname)
>        { "eglWaitClient", (_EGLProc) eglWaitClient },
>        { "eglWaitGL", (_EGLProc) eglWaitGL },
>        { "eglWaitNative", (_EGLProc) eglWaitNative },
> +      { "eglCreateSync", (_EGLProc) eglCreateSync },
> +      { "eglDestroySync", (_EGLProc) eglDestroySync },
> +      { "eglClientWaitSync", (_EGLProc) eglClientWaitSync },
> +      { "eglDestroyImage", (_EGLProc) eglDestroyImage },
>  #endif /* _EGL_GET_CORE_ADDRESSES */
>  #ifdef EGL_MESA_drm_display
>        { "eglGetDRMDisplayMESA", (_EGLProc) eglGetDRMDisplayMESA },
>  #endif
>        { "eglCreateImageKHR", (_EGLProc) eglCreateImageKHR },
> -      { "eglDestroyImageKHR", (_EGLProc) eglDestroyImageKHR },
> +      { "eglDestroyImageKHR", (_EGLProc) eglDestroyImage },
>        { "eglCreateSyncKHR", (_EGLProc) eglCreateSyncKHR },
> -      { "eglCreateSync64KHR", (_EGLProc) eglCreateSync64KHR },
> -      { "eglDestroySyncKHR", (_EGLProc) eglDestroySyncKHR },
> -      { "eglClientWaitSyncKHR", (_EGLProc) eglClientWaitSyncKHR },
> +      { "eglCreateSync64KHR", (_EGLProc) eglCreateSync },
> +      { "eglDestroySyncKHR", (_EGLProc) eglDestroySync },
> +      { "eglClientWaitSyncKHR", (_EGLProc) eglClientWaitSync },
Just a heads-up there will be some conflicts when rebasing this patch.
The _EGL_GET_CORE_ADDRESSES macro is gone, plus the four renamed
functions have a static notation.

-Emil
On Wed 13 May 2015, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak@amd.com>
> 
> Declare the functions without the suffix, so that the core names are exported.
> ---
>  src/egl/main/eglapi.c | 20 ++++++++++++--------
>  1 file changed, 12 insertions(+), 8 deletions(-)

Patches 5-9 are
Reviewed-by: Chad Versace <chad.versace@intel.com>

I'm still reading through the remaining patches.