egl: drop unused _EGLDriver from Terminate()
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 8280493..f8c3a69 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1311,7 +1311,7 @@
* called many times (without a eglInitialize in between).
*/
static EGLBoolean
-dri2_terminate(const _EGLDriver *drv, _EGLDisplay *disp)
+dri2_terminate(_EGLDisplay *disp)
{
/* Release all non-current Context/Surfaces. */
_eglReleaseDisplayResources(disp);
diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp
index ac59882..5887243 100644
--- a/src/egl/drivers/haiku/egl_haiku.cpp
+++ b/src/egl/drivers/haiku/egl_haiku.cpp
@@ -229,7 +229,7 @@
extern "C"
EGLBoolean
-haiku_terminate(const _EGLDriver* drv,_EGLDisplay *disp)
+haiku_terminate(_EGLDisplay *disp)
{
return EGL_TRUE;
}
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index d135c94..b5c5e79 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -672,9 +672,7 @@
RETURN_EGL_ERROR(NULL, EGL_BAD_DISPLAY, EGL_FALSE);
if (disp->Initialized) {
- const _EGLDriver *drv = disp->Driver;
-
- drv->Terminate(drv, disp);
+ disp->Driver->Terminate(disp);
/* do not reset disp->Driver */
disp->ClientAPIsString[0] = 0;
disp->Initialized = EGL_FALSE;
diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h
index 49d26b1..21dd422 100644
--- a/src/egl/main/egldriver.h
+++ b/src/egl/main/egldriver.h
@@ -86,7 +86,7 @@
{
/* driver funcs */
EGLBoolean (*Initialize)(_EGLDisplay *disp);
- EGLBoolean (*Terminate)(const _EGLDriver *, _EGLDisplay *disp);
+ EGLBoolean (*Terminate)(_EGLDisplay *disp);
const char *(*QueryDriverName)(_EGLDisplay *disp);
char *(*QueryDriverConfig)(_EGLDisplay *disp);