diff options
| author | Eric Engestrom <eric@engestrom.ch> | 2018-04-22 16:48:15 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-08-16 13:49:18 +0000 |
| commit | f010568ea25d4d6fe75d5764c42c24285a529dc3 (patch) | |
| tree | 1c6fe83cac290819dedac9a488372fffcb689d8b /src | |
| parent | 845a37ce355805f524ccb36ac0bfe668dda3be6d (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 5 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.h | 4 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/platform_wayland.c | 4 | ||||
| -rw-r--r-- | src/egl/main/eglapi.c | 2 | ||||
| -rw-r--r-- | src/egl/main/egldriver.h | 5 |
5 files changed, 7 insertions, 13 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 2e378beb853..877f0133369 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2472,13 +2472,12 @@ dri2_query_surface(_EGLDisplay *disp, _EGLSurface *surf, } 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 diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index daef43285de..0df270a3737 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -147,8 +147,8 @@ struct dri2_egl_display_vtbl { 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, diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 8cfacce1f34..699401a4cf5 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -1169,9 +1169,7 @@ dri2_wl_swap_buffers(_EGLDisplay *disp, _EGLSurface *draw) } 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); diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 42944d44e11..2b69c47fae7 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -2317,7 +2317,7 @@ eglCreateWaylandBufferFromImageWL(EGLDisplay dpy, EGLImage image) 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); } diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 4abd05736bb..b5344d24666 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -156,10 +156,7 @@ struct _egl_driver 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); |