egl: move eglQuerySurface() 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 32951c96c0fd6965d41e9f78f4776f3ea4ca54b0..4585540437b72518ae280f3790f6acc1b801d417 100644 (file)
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -1208,7 +1208,11 @@ eglQuerySurface(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.QuerySurface(drv, disp, surf, attribute, value);
+
+   if (drv->API.QuerySurface)
+      ret = drv->API.QuerySurface(drv, disp, surf, attribute, value);
+   else
+      ret = _eglQuerySurface(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 135c9c1229cfcd58e26e7213037e54abd5ccef5f..8829a4e80d7045af4ce48df824cc90faff7a2658 100644 (file)
--- a/src/egl/main/eglfallbacks.c
+++ b/src/egl/main/eglfallbacks.c
@@ -42,7 +42,6 @@
 void
 _eglInitDriverFallbacks(_EGLDriver *drv)
 {
-   drv->API.QuerySurface = _eglQuerySurface;
    drv->API.SurfaceAttrib = _eglSurfaceAttrib;
 
    drv->API.SwapInterval = _eglSwapInterval;