commit f010568ea25d4d6fe75d5764c42c24285a529dc3
author Eric Engestrom <eric@engestrom.ch> Sun Apr 22 16:48:15 2018 +0200
committer Marge Bot <eric+marge@anholt.net> Sun Aug 16 13:49:18 2020 +0000
tree 1c6fe83cac290819dedac9a488372fffcb689d8b
parent 845a37ce355805f524ccb36ac0bfe668dda3be6d

egl: drop unused _EGLDriver from CreateWaylandBufferFromImageWL()

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>

src/egl/drivers/dri2/egl_dri2.c

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 2e378be..877f013 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -2472,13 +2472,12 @@
 }
 
 static struct wl_buffer*
-dri2_create_wayland_buffer_from_image(const _EGLDriver *drv, _EGLDisplay *disp,
-                                      _EGLImage *img)
+dri2_create_wayland_buffer_from_image(_EGLDisplay *disp, _EGLImage *img)
 {
    struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
    if (!dri2_dpy->vtbl->create_wayland_buffer_from_image)
       return NULL;
-   return dri2_dpy->vtbl->create_wayland_buffer_from_image(drv, disp, img);
+   return dri2_dpy->vtbl->create_wayland_buffer_from_image(disp, img);
 }
 
 #ifdef HAVE_LIBDRM

src/egl/drivers/dri2/egl_dri2.h

diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index daef432..0df270a 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -147,8 +147,8 @@
                                EGLint attribute, EGLint *value);
 
    /* optional */
-   struct wl_buffer* (*create_wayland_buffer_from_image)(
-                        const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img);
+   struct wl_buffer* (*create_wayland_buffer_from_image)(_EGLDisplay *disp,
+                                                         _EGLImage *img);
 
    /* optional */
    EGLBoolean (*get_sync_values)(_EGLDisplay *display, _EGLSurface *surface,

src/egl/drivers/dri2/platform_wayland.c

diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 8cfacce..699401a 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1169,9 +1169,7 @@
 }
 
 static struct wl_buffer *
-dri2_wl_create_wayland_buffer_from_image(const _EGLDriver *drv,
-                                          _EGLDisplay *disp,
-                                          _EGLImage *img)
+dri2_wl_create_wayland_buffer_from_image(_EGLDisplay *disp, _EGLImage *img)
 {
    struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
    struct dri2_egl_image *dri2_img = dri2_egl_image(img);

src/egl/main/eglapi.c

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 42944d4..2b69c47 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -2317,7 +2317,7 @@
    if (!img)
       RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, NULL);
 
-   ret = drv->CreateWaylandBufferFromImageWL(drv, disp, img);
+   ret = drv->CreateWaylandBufferFromImageWL(disp, img);
 
    RETURN_EGL_EVAL(disp, ret);
 }

src/egl/main/egldriver.h

diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h
index 4abd057..b5344d2 100644
--- a/src/egl/main/egldriver.h
+++ b/src/egl/main/egldriver.h
@@ -156,10 +156,7 @@
    EGLBoolean (*UnbindWaylandDisplayWL)(_EGLDisplay *disp, struct wl_display *display);
    EGLBoolean (*QueryWaylandBufferWL)(_EGLDisplay *displ, struct wl_resource *buffer,
                                       EGLint attribute, EGLint *value);
-
-   struct wl_buffer *(*CreateWaylandBufferFromImageWL)(const _EGLDriver *drv,
-                                                       _EGLDisplay *disp,
-                                                       _EGLImage *img);
+   struct wl_buffer *(*CreateWaylandBufferFromImageWL)(_EGLDisplay *disp, _EGLImage *img);
 
    EGLBoolean (*SwapBuffersWithDamageEXT)(_EGLDisplay *disp, _EGLSurface *surface,
                                           const EGLint *rects, EGLint n_rects);