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

[GitLab Mirror]

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

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

egl: move eglSurfaceAttrib() 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 4585540437b..b3059465d20 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -1228,7 +1228,11 @@ eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface,
 
    _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
    _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
-   ret = drv->API.SurfaceAttrib(drv, disp, surf, attribute, value);
+
+   if (drv->API.SurfaceAttrib)
+      ret = drv->API.SurfaceAttrib(drv, disp, surf, attribute, value);
+   else
+      ret = _eglSurfaceAttrib(drv, disp, surf, attribute, value);
 
    RETURN_EGL_EVAL(disp, ret);
 }
diff --git a/src/egl/main/eglfallbacks.c b/src/egl/main/eglfallbacks.c
index 8829a4e80d7..05d4515a61d 100644
--- a/src/egl/main/eglfallbacks.c
+++ b/src/egl/main/eglfallbacks.c
@@ -42,8 +42,6 @@
 void
 _eglInitDriverFallbacks(_EGLDriver *drv)
 {
-   drv->API.SurfaceAttrib = _eglSurfaceAttrib;
-
    drv->API.SwapInterval = _eglSwapInterval;
 
    drv->API.GetSyncAttrib = _eglGetSyncAttrib;