From: Eric Engestrom <eric.engestrom@intel.com>
Date: Sat, 22 Jun 2019 21:32:26 +0000 (+0100)
Subject: egl: move eglSurfaceAttrib() fallback to eglapi.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9dc00c84332cec660803f0e5dc2b52c4a8a26ae0;p=mesa.git

egl: move eglSurfaceAttrib() fallback to eglapi.c

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

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;