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

[GitLab Mirror]

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

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

egl: move eglChooseConfig() 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       | 8 ++++++--
 src/egl/main/eglfallbacks.c | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 8f3e741ebc4..394207b9151 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -749,8 +749,12 @@ eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs,
    if (!num_config)
       RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
 
-   ret = drv->API.ChooseConfig(drv, disp, attrib_list, configs,
-                               config_size, num_config);
+   if (drv->API.ChooseConfig)
+      ret = drv->API.ChooseConfig(drv, disp, attrib_list, configs,
+                                  config_size, num_config);
+   else
+      ret = _eglChooseConfig(drv, disp, attrib_list, 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 696a08c56db..f2c8bc43bdd 100644
--- a/src/egl/main/eglfallbacks.c
+++ b/src/egl/main/eglfallbacks.c
@@ -42,7 +42,6 @@
 void
 _eglInitDriverFallbacks(_EGLDriver *drv)
 {
-   drv->API.ChooseConfig = _eglChooseConfig;
    drv->API.GetConfigAttrib = _eglGetConfigAttrib;
 
    drv->API.QueryContext = _eglQueryContext;