From b792b3ebd70ccebb95207ec15662850a24c44c58 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sat, 22 Jun 2019 22:31:26 +0100 Subject: [PATCH] egl: move eglQueryContext() 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 | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 7309eb08d1c..32951c96c0f 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -900,7 +900,11 @@ eglQueryContext(EGLDisplay dpy, EGLContext ctx, _EGL_FUNC_START(disp, EGL_OBJECT_CONTEXT_KHR, context, EGL_FALSE); _EGL_CHECK_CONTEXT(disp, context, EGL_FALSE, drv); - ret = drv->API.QueryContext(drv, disp, context, attribute, value); + + if (drv->API.QueryContext) + ret = drv->API.QueryContext(drv, disp, context, attribute, value); + else + ret = _eglQueryContext(drv, disp, context, attribute, value); RETURN_EGL_EVAL(disp, ret); } diff --git a/src/egl/main/eglfallbacks.c b/src/egl/main/eglfallbacks.c index 1e679625934..135c9c1229c 100644 --- a/src/egl/main/eglfallbacks.c +++ b/src/egl/main/eglfallbacks.c @@ -42,8 +42,6 @@ void _eglInitDriverFallbacks(_EGLDriver *drv) { - drv->API.QueryContext = _eglQueryContext; - drv->API.QuerySurface = _eglQuerySurface; drv->API.SurfaceAttrib = _eglSurfaceAttrib; -- 2.30.2