From 429e936948045d6314235581b79d29755b8bdc8c 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 QueryBufferAge() 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/drivers/dri2/egl_dri2.h | 3 +-- src/egl/drivers/dri2/platform_android.c | 3 +-- src/egl/drivers/dri2/platform_drm.c | 3 +-- src/egl/drivers/dri2/platform_wayland.c | 3 +-- src/egl/drivers/dri2/platform_x11_dri3.c | 2 +- src/egl/main/egldriver.h | 3 +-- src/egl/main/eglsurface.c | 3 +-- 8 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 3f8209f413a..91ad57794d5 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2083,12 +2083,12 @@ dri2_copy_buffers(_EGLDisplay *disp, _EGLSurface *surf, void *native_pixmap_targ } static EGLint -dri2_query_buffer_age(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri2_query_buffer_age(_EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); if (!dri2_dpy->vtbl->query_buffer_age) return 0; - return dri2_dpy->vtbl->query_buffer_age(drv, disp, surf); + return dri2_dpy->vtbl->query_buffer_age(disp, surf); } static EGLBoolean diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 7e66a967796..b81a3292023 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -138,8 +138,7 @@ struct dri2_egl_display_vtbl { void *native_pixmap_target); /* optional */ - EGLint (*query_buffer_age)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSurface *surf); + EGLint (*query_buffer_age)(_EGLDisplay *disp, _EGLSurface *surf); /* optional */ EGLBoolean (*query_surface)(_EGLDisplay *disp, _EGLSurface *surf, diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 97f9741678a..602d48cc199 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -698,8 +698,7 @@ droid_image_get_buffers(__DRIdrawable *driDrawable, } static EGLint -droid_query_buffer_age(const _EGLDriver *drv, - _EGLDisplay *disp, _EGLSurface *surface) +droid_query_buffer_age(_EGLDisplay *disp, _EGLSurface *surface) { struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surface); diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index d0b6929e836..a0760dfebbb 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -446,8 +446,7 @@ dri2_drm_swap_buffers(_EGLDisplay *disp, _EGLSurface *draw) } static EGLint -dri2_drm_query_buffer_age(const _EGLDriver *drv, - _EGLDisplay *disp, _EGLSurface *surface) +dri2_drm_query_buffer_age(_EGLDisplay *disp, _EGLSurface *surface) { struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surface); diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 699401a4cf5..a443ee0e3f9 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -1149,8 +1149,7 @@ dri2_wl_swap_buffers_with_damage(_EGLDisplay *disp, } static EGLint -dri2_wl_query_buffer_age(const _EGLDriver *drv, - _EGLDisplay *disp, _EGLSurface *surface) +dri2_wl_query_buffer_age(_EGLDisplay *disp, _EGLSurface *surface) { struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surface); diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c index 0a003c307a2..d645a2c027f 100644 --- a/src/egl/drivers/dri2/platform_x11_dri3.c +++ b/src/egl/drivers/dri2/platform_x11_dri3.c @@ -437,7 +437,7 @@ dri3_copy_buffers(_EGLDisplay *disp, _EGLSurface *surf, void *native_pixmap_targ } static int -dri3_query_buffer_age(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri3_query_buffer_age(_EGLDisplay *disp, _EGLSurface *surf) { struct dri3_egl_surface *dri3_surf = dri3_egl_surface(surf); diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 69efae7eb38..82dde96c257 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -164,8 +164,7 @@ struct _egl_driver EGLBoolean (*PostSubBufferNV)(_EGLDisplay *disp, _EGLSurface *surface, EGLint x, EGLint y, EGLint width, EGLint height); - EGLint (*QueryBufferAge)(const _EGLDriver *drv, - _EGLDisplay *disp, _EGLSurface *surface); + EGLint (*QueryBufferAge)(_EGLDisplay *disp, _EGLSurface *surface); EGLBoolean (*GetSyncValuesCHROMIUM)(_EGLDisplay *disp, _EGLSurface *surface, EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc); diff --git a/src/egl/main/eglsurface.c b/src/egl/main/eglsurface.c index e38f377dc8d..62f2aa869d2 100644 --- a/src/egl/main/eglsurface.c +++ b/src/egl/main/eglsurface.c @@ -534,8 +534,7 @@ _eglQuerySurface(_EGLDisplay *disp, _EGLSurface *surface, return _eglError(EGL_BAD_ATTRIBUTE, "eglQuerySurface"); _EGLContext *ctx = _eglGetCurrentContext(); - const _EGLDriver *drv = disp->Driver; - EGLint result = drv->QueryBufferAge(drv, disp, surface); + EGLint result = disp->Driver->QueryBufferAge(disp, surface); /* error happened */ if (result < 0) return EGL_FALSE; -- 2.30.2