egl: drop unused _EGLDriver from QueryBufferAge()

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6241>

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 3f8209f413a5a871dd3054d37a1503b664ad0c3c..91ad57794d55a34734c1ea1cb080dc5bffc0deaa 100644 (file)
--- 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 7e66a967796df8de3b454013adb22b785381d6a9..b81a32920237ab40d9153eb67eac73df6a11294e 100644 (file)
--- 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 97f9741678aafce8cfe19c9125500f8bc441e946..602d48cc19955c65a59b2471fd2b5f311ce593a2 100644 (file)
--- 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 d0b6929e83623cc3d9f8bca2e82d08c5aef61677..a0760dfebbb0b81f4d11e4d0791bbc78ec295042 100644 (file)
--- 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 699401a4cf5d6b1858804347e887e393be846acd..a443ee0e3f9d6e3a95cc3e15be8ed6f8dbb8f380 100644 (file)
--- 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 0a003c307a2af94c26c89d87feb5704719006ae4..d645a2c027f6bea333b63c32ac429021a02fd488 100644 (file)
--- 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 69efae7eb3876c5a3cc8edb7cea94a6be9c8a03f..82dde96c2578d8e60369f26f08f8bafa9f9f25ab 100644 (file)
--- 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 e38f377dc8d5797cb828dfd3d20980ad46bd1319..62f2aa869d2f191bc88e08e4a680ea710449c3b1 100644 (file)
--- 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;