fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 09:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl: drop unused _EGLDriver from {Bind,Unbind,Query}WaylandDisplayWL()

Browse source 
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>
This commit is contained in:
Eric Engestrom 2018-04-22 16:48:15 +02:00 • committed by Marge Bot
parent 9d5162eddf
commit 845a37ce35
3 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/egl/drivers/dri2/egl_dri2.c
View file

@ -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);

6
src/egl/main/eglapi.c
View file

@ -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);
}

9
src/egl/main/egldriver.h
View file

@ -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,