From 347840cf43624bdb2a5ce820e1001842e3f75ded Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sun, 22 Apr 2018 16:48:15 +0200 Subject: [PATCH 1/1] egl: drop unused _EGLDriver from SwapInterval() 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/drivers/dri2/egl_dri2.h | 4 ++-- src/egl/drivers/dri2/platform_android.c | 3 +-- src/egl/drivers/dri2/platform_x11.c | 8 +++----- src/egl/drivers/dri2/platform_x11_dri3.c | 5 ++--- src/egl/main/eglapi.c | 4 ++-- src/egl/main/egldriver.h | 4 ++-- src/egl/main/eglsurface.c | 3 +-- src/egl/main/eglsurface.h | 2 +- 9 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index f1babe1e73b..4d1fcad5928 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1934,13 +1934,12 @@ dri2_create_pbuffer_surface(_EGLDisplay *disp, _EGLConfig *conf, } static EGLBoolean -dri2_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, - EGLint interval) +dri2_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); if (!dri2_dpy->vtbl->swap_interval) return EGL_TRUE; - return dri2_dpy->vtbl->swap_interval(drv, disp, surf, interval); + return dri2_dpy->vtbl->swap_interval(disp, surf, interval); } /** diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 65fad57646c..bd4c03a93dc 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -109,8 +109,8 @@ struct dri2_egl_display_vtbl { EGLBoolean (*destroy_surface)(_EGLDisplay *disp, _EGLSurface *surface); /* optional */ - EGLBoolean (*swap_interval)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSurface *surf, EGLint interval); + EGLBoolean (*swap_interval)(_EGLDisplay *disp, _EGLSurface *surf, + EGLint interval); /* mandatory */ _EGLImage* (*create_image)(const _EGLDriver *drv, _EGLDisplay *disp, diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 0519b7438d5..5f2987381fd 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -496,8 +496,7 @@ droid_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf) } static EGLBoolean -droid_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSurface *surf, EGLint interval) +droid_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval) { struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); struct ANativeWindow *window = dri2_surf->window; diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 1bf79339c49..de465f52fd4 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -52,8 +52,7 @@ #endif static EGLBoolean -dri2_x11_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, - EGLint interval); +dri2_x11_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval); uint32_t dri2_format_for_depth(struct dri2_egl_display *dri2_dpy, uint32_t depth); @@ -375,7 +374,7 @@ dri2_x11_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf, surf->SwapInterval = 1; /* Override that with a driconf-set value. */ - dri2_x11_swap_interval(disp->Driver, disp, surf, dri2_dpy->default_swap_interval); + dri2_x11_swap_interval(disp, surf, dri2_dpy->default_swap_interval); } return surf; @@ -982,8 +981,7 @@ dri2_x11_post_sub_buffer(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface * } static EGLBoolean -dri2_x11_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, - EGLint interval) +dri2_x11_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c index 23374f9e96b..c5af9b50834 100644 --- a/src/egl/drivers/dri2/platform_x11_dri3.c +++ b/src/egl/drivers/dri2/platform_x11_dri3.c @@ -122,8 +122,7 @@ dri3_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf) } static EGLBoolean -dri3_set_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, - EGLint interval) +dri3_set_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval) { struct dri3_egl_surface *dri3_surf = dri3_egl_surface(surf); @@ -226,7 +225,7 @@ dri3_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf, surf = dri3_create_surface(disp, EGL_WINDOW_BIT, conf, native_window, attrib_list); if (surf != NULL) - dri3_set_swap_interval(disp->Driver, disp, surf, dri2_dpy->default_swap_interval); + dri3_set_swap_interval(disp, surf, dri2_dpy->default_swap_interval); return surf; } diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 9762a4dad12..f8c881d2923 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -1287,9 +1287,9 @@ eglSwapInterval(EGLDisplay dpy, EGLint interval) if (surf->SwapInterval != interval) { if (drv->SwapInterval) - ret = drv->SwapInterval(drv, disp, surf, interval); + ret = drv->SwapInterval(disp, surf, interval); else - ret = _eglSwapInterval(drv, disp, surf, interval); + ret = _eglSwapInterval(disp, surf, interval); } else { ret = EGL_TRUE; diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 974b021d6df..214eb50d8bc 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -115,8 +115,8 @@ struct _egl_driver EGLint buffer); EGLBoolean (*ReleaseTexImage)(_EGLDisplay *disp, _EGLSurface *surface, EGLint buffer); - EGLBoolean (*SwapInterval)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSurface *surf, EGLint interval); + EGLBoolean (*SwapInterval)(_EGLDisplay *disp, _EGLSurface *surf, + EGLint interval); EGLBoolean (*SwapBuffers)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw); EGLBoolean (*CopyBuffers)(const _EGLDriver *drv, _EGLDisplay *disp, diff --git a/src/egl/main/eglsurface.c b/src/egl/main/eglsurface.c index 0ab6c7c7a5f..e38f377dc8d 100644 --- a/src/egl/main/eglsurface.c +++ b/src/egl/main/eglsurface.c @@ -784,8 +784,7 @@ _eglReleaseTexImage(_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer) EGLBoolean -_eglSwapInterval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, - EGLint interval) +_eglSwapInterval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval) { return EGL_TRUE; } diff --git a/src/egl/main/eglsurface.h b/src/egl/main/eglsurface.h index 5a10e2bc061..3f1ea5d12cb 100644 --- a/src/egl/main/eglsurface.h +++ b/src/egl/main/eglsurface.h @@ -197,7 +197,7 @@ _eglReleaseTexImage(_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer); extern EGLBoolean -_eglSwapInterval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval); +_eglSwapInterval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval); extern EGLBoolean _eglSurfaceHasMutableRenderBuffer(_EGLSurface *surf); -- 2.30.2