Mesa (master): egl: move eglGetSyncAttrib() fallback to eglapi.c

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Jun 25 06:40:06 UTC 2019


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

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Sat Jun 22 22:33:00 2019 +0100

egl: move eglGetSyncAttrib() fallback to eglapi.c

Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/egl/main/eglapi.c       | 6 +++++-
 src/egl/main/eglfallbacks.c | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 60f59bb165a..cfc61dba80f 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -2112,7 +2112,11 @@ _eglGetSyncAttribCommon(_EGLDisplay *disp, _EGLSync *s, EGLint attribute, EGLAtt
    assert(disp->Extensions.KHR_reusable_sync ||
           disp->Extensions.KHR_fence_sync ||
           disp->Extensions.ANDROID_native_fence_sync);
-   ret = drv->API.GetSyncAttrib(drv, disp, s, attribute, value);
+
+   if (drv->API.GetSyncAttrib)
+      ret = drv->API.GetSyncAttrib(drv, disp, s, attribute, value);
+   else
+      ret = _eglGetSyncAttrib(drv, disp, s, attribute, value);
 
    RETURN_EGL_EVAL(disp, ret);
 }
diff --git a/src/egl/main/eglfallbacks.c b/src/egl/main/eglfallbacks.c
index 891c6fc3b71..7dca5f6bdf8 100644
--- a/src/egl/main/eglfallbacks.c
+++ b/src/egl/main/eglfallbacks.c
@@ -42,5 +42,4 @@
 void
 _eglInitDriverFallbacks(_EGLDriver *drv)
 {
-   drv->API.GetSyncAttrib = _eglGetSyncAttrib;
 }




More information about the mesa-commit mailing list