egl: drop unused _EGLDriver & _EGLDisplay from WaitNative()

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 35c48242ce26395e8b2ff4796ec365cb9b7a5cc5..abf4c15f9e69243b4d6dc0546ea03b88df098987 100644 (file)
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -2108,11 +2108,8 @@ dri2_wait_client(_EGLDisplay *disp, _EGLContext *ctx)
 }
 
 static EGLBoolean
-dri2_wait_native(const _EGLDriver *drv, _EGLDisplay *disp, EGLint engine)
+dri2_wait_native(EGLint engine)
 {
-   (void) drv;
-   (void) disp;
-
    if (engine != EGL_CORE_NATIVE_ENGINE)
       return _eglError(EGL_BAD_PARAMETER, "eglWaitNative");
    /* glXWaitX(); */

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 8319b2bc5602a2cd0de162641f986f2bb79f5f6b..decec9a5cf8a30f566bece0fd850e65812dca11f 100644 (file)
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -1530,7 +1530,6 @@ eglWaitNative(EGLint engine)
 {
    _EGLContext *ctx = _eglGetCurrentContext();
    _EGLDisplay *disp;
-   const _EGLDriver *drv;
    EGLBoolean ret;
 
    if (!ctx)
@@ -1548,8 +1547,7 @@ eglWaitNative(EGLint engine)
 
    /* a valid current context implies an initialized current display */
    assert(disp->Initialized);
-   drv = disp->Driver;
-   ret = drv->WaitNative(drv, disp, engine);
+   ret = disp->Driver->WaitNative(engine);
 
    RETURN_EGL_EVAL(disp, ret);
 }

diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h
index 1e0d0dfe5cd7b1770e9eefc2cf285862622c3dd5..03757da780b9762ab99809ae391e42d26d062dc5 100644 (file)
--- a/src/egl/main/egldriver.h
+++ b/src/egl/main/egldriver.h
@@ -125,8 +125,7 @@ struct _egl_driver
 
    /* misc functions */
    EGLBoolean (*WaitClient)(_EGLDisplay *disp, _EGLContext *ctx);
-   EGLBoolean (*WaitNative)(const _EGLDriver *drv, _EGLDisplay *disp,
-                            EGLint engine);
+   EGLBoolean (*WaitNative)(EGLint engine);
 
    /* this function may be called from multiple threads at the same time */
    _EGLProc (*GetProcAddress)(const _EGLDriver *drv, const char *procname);