From 845a37ce355805f524ccb36ac0bfe668dda3be6d Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sun, 22 Apr 2018 16:48:15 +0200 Subject: [PATCH] egl: drop unused _EGLDriver from {Bind,Unbind,Query}WaylandDisplayWL() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Engestrom Reviewed-by: Marek Olšák Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 13 +++---------- src/egl/main/eglapi.c | 6 +++--- src/egl/main/egldriver.h | 9 +++------ 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 61c2c14ef60..2e378beb853 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -3207,8 +3207,7 @@ dri2_wl_release_buffer(void *user_data, struct wl_drm_buffer *buffer) } static EGLBoolean -dri2_bind_wayland_display_wl(const _EGLDriver *drv, _EGLDisplay *disp, - struct wl_display *wl_dpy) +dri2_bind_wayland_display_wl(_EGLDisplay *disp, struct wl_display *wl_dpy) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); const struct wayland_drm_callbacks wl_drm_callbacks = { @@ -3220,8 +3219,6 @@ dri2_bind_wayland_display_wl(const _EGLDriver *drv, _EGLDisplay *disp, int flags = 0; uint64_t cap; - (void) drv; - if (dri2_dpy->wl_server_drm) return EGL_FALSE; @@ -3249,13 +3246,10 @@ dri2_bind_wayland_display_wl(const _EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_unbind_wayland_display_wl(const _EGLDriver *drv, _EGLDisplay *disp, - struct wl_display *wl_dpy) +dri2_unbind_wayland_display_wl(_EGLDisplay *disp, struct wl_display *wl_dpy) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); - (void) drv; - if (!dri2_dpy->wl_server_drm) return EGL_FALSE; @@ -3266,8 +3260,7 @@ dri2_unbind_wayland_display_wl(const _EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_query_wayland_buffer_wl(const _EGLDriver *drv, _EGLDisplay *disp, - struct wl_resource *buffer_resource, +dri2_query_wayland_buffer_wl(_EGLDisplay *disp, struct wl_resource *buffer_resource, EGLint attribute, EGLint *value) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 4fa85092024..42944d44e11 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -2251,7 +2251,7 @@ eglBindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display) if (!display) RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE); - ret = drv->BindWaylandDisplayWL(drv, disp, display); + ret = drv->BindWaylandDisplayWL(disp, display); RETURN_EGL_EVAL(disp, ret); } @@ -2271,7 +2271,7 @@ eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display) if (!display) RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE); - ret = drv->UnbindWaylandDisplayWL(drv, disp, display); + ret = drv->UnbindWaylandDisplayWL(disp, display); RETURN_EGL_EVAL(disp, ret); } @@ -2292,7 +2292,7 @@ eglQueryWaylandBufferWL(EGLDisplay dpy, struct wl_resource *buffer, if (!buffer) RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE); - ret = drv->QueryWaylandBufferWL(drv, disp, buffer, attribute, value); + ret = drv->QueryWaylandBufferWL(disp, buffer, attribute, value); RETURN_EGL_EVAL(disp, ret); } diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 2aaee01f68e..4abd05736bb 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -152,12 +152,9 @@ struct _egl_driver EGLint *name, EGLint *handle, EGLint *stride); - EGLBoolean (*BindWaylandDisplayWL)(const _EGLDriver *drv, _EGLDisplay *disp, - struct wl_display *display); - EGLBoolean (*UnbindWaylandDisplayWL)(const _EGLDriver *drv, _EGLDisplay *disp, - struct wl_display *display); - EGLBoolean (*QueryWaylandBufferWL)(const _EGLDriver *drv, _EGLDisplay *displ, - struct wl_resource *buffer, + EGLBoolean (*BindWaylandDisplayWL)(_EGLDisplay *disp, struct wl_display *display); + 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, -- 2.30.2