egl: drop unused _EGLDriver from QuerySurface()
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 128c412..81df0d9 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -2473,13 +2473,13 @@
}
static EGLBoolean
-dri2_query_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
+dri2_query_surface(_EGLDisplay *disp, _EGLSurface *surf,
EGLint attribute, EGLint *value)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
if (!dri2_dpy->vtbl->query_surface)
- return _eglQuerySurface(drv, disp, surf, attribute, value);
- return dri2_dpy->vtbl->query_surface(drv, disp, surf, attribute, value);
+ return _eglQuerySurface(disp, surf, attribute, value);
+ return dri2_dpy->vtbl->query_surface(disp, surf, attribute, value);
}
static struct wl_buffer*
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index cb66f7e..65fad57 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -147,9 +147,8 @@
_EGLSurface *surf);
/* optional */
- EGLBoolean (*query_surface)(const _EGLDriver *drv, _EGLDisplay *disp,
- _EGLSurface *surf, EGLint attribute,
- EGLint *value);
+ EGLBoolean (*query_surface)(_EGLDisplay *disp, _EGLSurface *surf,
+ EGLint attribute, EGLint *value);
/* optional */
struct wl_buffer* (*create_wayland_buffer_from_image)(
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 730229e..0519b74 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -1004,7 +1004,7 @@
#endif /* HAVE_DRM_GRALLOC */
static EGLBoolean
-droid_query_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
+droid_query_surface(_EGLDisplay *disp, _EGLSurface *surf,
EGLint attribute, EGLint *value)
{
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
@@ -1026,7 +1026,7 @@
default:
break;
}
- return _eglQuerySurface(drv, disp, surf, attribute, value);
+ return _eglQuerySurface(disp, surf, attribute, value);
}
static _EGLImage *
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 2c0ab60..1bf7933 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -430,9 +430,8 @@
* have.
*/
static EGLBoolean
-dri2_query_surface(const _EGLDriver *drv, _EGLDisplay *disp,
- _EGLSurface *surf, EGLint attribute,
- EGLint *value)
+dri2_query_surface(_EGLDisplay *disp, _EGLSurface *surf,
+ EGLint attribute, EGLint *value)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
@@ -451,7 +450,7 @@
default:
break;
}
- return _eglQuerySurface(drv, disp, surf, attribute, value);
+ return _eglQuerySurface(disp, surf, attribute, value);
}
/**
diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c
index 8c7ef38..23374f9 100644
--- a/src/egl/drivers/dri2/platform_x11_dri3.c
+++ b/src/egl/drivers/dri2/platform_x11_dri3.c
@@ -448,9 +448,8 @@
}
static EGLBoolean
-dri3_query_surface(const _EGLDriver *drv, _EGLDisplay *disp,
- _EGLSurface *surf, EGLint attribute,
- EGLint *value)
+dri3_query_surface(_EGLDisplay *disp, _EGLSurface *surf,
+ EGLint attribute, EGLint *value)
{
struct dri3_egl_surface *dri3_surf = dri3_egl_surface(surf);
@@ -463,7 +462,7 @@
break;
}
- return _eglQuerySurface(drv, disp, surf, attribute, value);
+ return _eglQuerySurface(disp, surf, attribute, value);
}
static __DRIdrawable *
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 77099a7..492201e 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -1202,9 +1202,9 @@
_EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
if (drv->QuerySurface)
- ret = drv->QuerySurface(drv, disp, surf, attribute, value);
+ ret = drv->QuerySurface(disp, surf, attribute, value);
else
- ret = _eglQuerySurface(drv, disp, surf, attribute, value);
+ ret = _eglQuerySurface(disp, surf, attribute, value);
RETURN_EGL_EVAL(disp, ret);
}
diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h
index daf41e7..1c02578 100644
--- a/src/egl/main/egldriver.h
+++ b/src/egl/main/egldriver.h
@@ -109,9 +109,8 @@
_EGLSurface *(*CreatePbufferSurface)(_EGLDisplay *disp, _EGLConfig *config,
const EGLint *attrib_list);
EGLBoolean (*DestroySurface)(_EGLDisplay *disp, _EGLSurface *surface);
- EGLBoolean (*QuerySurface)(const _EGLDriver *drv, _EGLDisplay *disp,
- _EGLSurface *surface, EGLint attribute,
- EGLint *value);
+ EGLBoolean (*QuerySurface)(_EGLDisplay *disp, _EGLSurface *surface,
+ EGLint attribute, EGLint *value);
EGLBoolean (*BindTexImage)(const _EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surface, EGLint buffer);
EGLBoolean (*ReleaseTexImage)(const _EGLDriver *drv, _EGLDisplay *disp,
diff --git a/src/egl/main/eglsurface.c b/src/egl/main/eglsurface.c
index d75af7a..38f273b 100644
--- a/src/egl/main/eglsurface.c
+++ b/src/egl/main/eglsurface.c
@@ -429,7 +429,7 @@
EGLBoolean
-_eglQuerySurface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface,
+_eglQuerySurface(_EGLDisplay *disp, _EGLSurface *surface,
EGLint attribute, EGLint *value)
{
switch (attribute) {
diff --git a/src/egl/main/eglsurface.h b/src/egl/main/eglsurface.h
index c57159e..aef2c39 100644
--- a/src/egl/main/eglsurface.h
+++ b/src/egl/main/eglsurface.h
@@ -182,7 +182,7 @@
extern EGLBoolean
-_eglQuerySurface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint attribute, EGLint *value);
+_eglQuerySurface(_EGLDisplay *disp, _EGLSurface *surf, EGLint attribute, EGLint *value);
extern EGLBoolean
