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

egl: drop unused _EGLDriver from CreateWaylandBufferFromImageWL()

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 845a37ce35
commit f010568ea2
5 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

4
src/egl/drivers/dri2/egl_dri2.h
View file

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

4
src/egl/drivers/dri2/platform_wayland.c
View file

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

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

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

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

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