From b8d1c4647f2ed42170e1ec4780dba9bf1f1b4c0c Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sun, 22 Apr 2018 16:48:15 +0200 Subject: [PATCH] egl: drop unused _EGLDriver & _EGLDisplay from WaitNative() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Engestrom Reviewed-by: Marek Olšák Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 5 +---- src/egl/main/eglapi.c | 4 +--- src/egl/main/egldriver.h | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 35c4824..abf4c15 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2108,11 +2108,8 @@ dri2_wait_client(_EGLDisplay *disp, _EGLContext *ctx) } static EGLBoolean -dri2_wait_native(const _EGLDriver *drv, _EGLDisplay *disp, EGLint engine) +dri2_wait_native(EGLint engine) { - (void) drv; - (void) disp; - if (engine != EGL_CORE_NATIVE_ENGINE) return _eglError(EGL_BAD_PARAMETER, "eglWaitNative"); /* glXWaitX(); */ diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 8319b2b..decec9a 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -1530,7 +1530,6 @@ eglWaitNative(EGLint engine) { _EGLContext *ctx = _eglGetCurrentContext(); _EGLDisplay *disp; - const _EGLDriver *drv; EGLBoolean ret; if (!ctx) @@ -1548,8 +1547,7 @@ eglWaitNative(EGLint engine) /* a valid current context implies an initialized current display */ assert(disp->Initialized); - drv = disp->Driver; - ret = drv->WaitNative(drv, disp, engine); + ret = disp->Driver->WaitNative(engine); RETURN_EGL_EVAL(disp, ret); } diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 1e0d0df..03757da 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -125,8 +125,7 @@ struct _egl_driver /* misc functions */ EGLBoolean (*WaitClient)(_EGLDisplay *disp, _EGLContext *ctx); - EGLBoolean (*WaitNative)(const _EGLDriver *drv, _EGLDisplay *disp, - EGLint engine); + EGLBoolean (*WaitNative)(EGLint engine); /* this function may be called from multiple threads at the same time */ _EGLProc (*GetProcAddress)(const _EGLDriver *drv, const char *procname); -- 2.7.4