From 58be9d50a77c2f5d5d680b841ca1f0a16e06499b Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sat, 22 Jun 2019 22:31:53 +0100 Subject: [PATCH] egl: move eglQuerySurface() fallback to eglapi.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Engestrom Reviewed-by: Tapani Pälli --- src/egl/main/eglapi.c | 6 +++++- src/egl/main/eglfallbacks.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 32951c96c0f..4585540437b 100644 --- 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 135c9c1229c..8829a4e80d7 100644 --- 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; -- 2.11.0