From 4e65469c706184fc900fcfbae046ee0a645160c6 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 from WaitClient() 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 | 4 +--- src/egl/main/eglapi.c | 4 +--- src/egl/main/egldriver.h | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 7dc0720ed02..35c48242ce2 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2092,14 +2092,12 @@ dri2_query_buffer_age(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *sur } static EGLBoolean -dri2_wait_client(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx) +dri2_wait_client(_EGLDisplay *disp, _EGLContext *ctx) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); _EGLSurface *surf = ctx->DrawSurface; __DRIdrawable *dri_drawable = dri2_dpy->vtbl->get_dri_drawable(surf); - (void) drv; - /* FIXME: If EGL allows frontbuffer rendering for window surfaces, * we need to copy fake to real here.*/ diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 604bbf787dd..8319b2bc560 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -1489,7 +1489,6 @@ _eglWaitClientCommon(void) { _EGLContext *ctx = _eglGetCurrentContext(); _EGLDisplay *disp; - const _EGLDriver *drv; EGLBoolean ret; if (!ctx) @@ -1505,8 +1504,7 @@ _eglWaitClientCommon(void) /* a valid current context implies an initialized current display */ assert(disp->Initialized); - drv = disp->Driver; - ret = drv->WaitClient(drv, disp, ctx); + ret = disp->Driver->WaitClient(disp, ctx); RETURN_EGL_EVAL(disp, ret); } diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index e6ceb4bc846..1e0d0dfe5cd 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -124,8 +124,7 @@ struct _egl_driver EGLint *rects, EGLint n_rects); /* misc functions */ - EGLBoolean (*WaitClient)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLContext *ctx); + EGLBoolean (*WaitClient)(_EGLDisplay *disp, _EGLContext *ctx); EGLBoolean (*WaitNative)(const _EGLDriver *drv, _EGLDisplay *disp, EGLint engine); -- 2.30.2