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

[GitLab Mirror]

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

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

egl: move eglGetConfigs() 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       | 5 ++++-
 src/egl/main/eglfallbacks.c | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 93c1da9aac0..8f3e741ebc4 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -725,7 +725,10 @@ eglGetConfigs(EGLDisplay dpy, EGLConfig *configs,
    if (!num_config)
       RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
 
-   ret = drv->API.GetConfigs(drv, disp, configs, config_size, num_config);
+   if (drv->API.GetConfigs)
+      ret = drv->API.GetConfigs(drv, disp, configs, config_size, num_config);
+   else
+      ret = _eglGetConfigs(drv, disp, configs, config_size, num_config);
 
    RETURN_EGL_EVAL(disp, ret);
 }
diff --git a/src/egl/main/eglfallbacks.c b/src/egl/main/eglfallbacks.c
index 08ffab3072c..696a08c56db 100644
--- a/src/egl/main/eglfallbacks.c
+++ b/src/egl/main/eglfallbacks.c
@@ -42,7 +42,6 @@
 void
 _eglInitDriverFallbacks(_EGLDriver *drv)
 {
-   drv->API.GetConfigs = _eglGetConfigs;
    drv->API.ChooseConfig = _eglChooseConfig;
    drv->API.GetConfigAttrib = _eglGetConfigAttrib;