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

[GitLab Mirror]

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

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

egl: move eglGetConfigAttrib() 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 | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 394207b9151..7309eb08d1c 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -772,7 +772,11 @@ eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
    _EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE);
 
    _EGL_CHECK_CONFIG(disp, conf, EGL_FALSE, drv);
-   ret = drv->API.GetConfigAttrib(drv, disp, conf, attribute, value);
+
+   if (drv->API.GetConfigAttrib)
+      ret = drv->API.GetConfigAttrib(drv, disp, conf, attribute, value);
+   else
+      ret = _eglGetConfigAttrib(drv, disp, conf, attribute, value);
 
    RETURN_EGL_EVAL(disp, ret);
 }
diff --git a/src/egl/main/eglfallbacks.c b/src/egl/main/eglfallbacks.c
index f2c8bc43bdd..1e679625934 100644
--- a/src/egl/main/eglfallbacks.c
+++ b/src/egl/main/eglfallbacks.c
@@ -42,8 +42,6 @@
 void
 _eglInitDriverFallbacks(_EGLDriver *drv)
 {
-   drv->API.GetConfigAttrib = _eglGetConfigAttrib;
-
    drv->API.QueryContext = _eglQueryContext;
 
    drv->API.QuerySurface = _eglQuerySurface;