From 29be2d47e44bd1ac74b91f393f6b1e60f01ffa51 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 29 Jun 2021 21:02:06 +0200 Subject: [PATCH] render: drop wlr_renderer_impl.texture_from_dmabuf --- include/render/gles2.h | 2 -- include/wlr/render/interface.h | 2 -- render/gles2/renderer.c | 1 - render/gles2/texture.c | 3 ++- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/render/gles2.h b/include/render/gles2.h index b32b5708..3e278e32 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -121,8 +121,6 @@ struct wlr_gles2_texture *gles2_get_texture( struct wlr_texture *gles2_texture_from_wl_drm(struct wlr_renderer *wlr_renderer, struct wl_resource *data); -struct wlr_texture *gles2_texture_from_dmabuf(struct wlr_renderer *wlr_renderer, - struct wlr_dmabuf_attributes *attribs); struct wlr_texture *gles2_texture_from_buffer(struct wlr_renderer *wlr_renderer, struct wlr_buffer *buffer); void gles2_texture_destroy(struct wlr_gles2_texture *texture); diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index 54e0fc5c..bb96674c 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -47,8 +47,6 @@ struct wlr_renderer_impl { void *data); struct wlr_texture *(*texture_from_wl_drm)(struct wlr_renderer *renderer, struct wl_resource *data); - struct wlr_texture *(*texture_from_dmabuf)(struct wlr_renderer *renderer, - struct wlr_dmabuf_attributes *attribs); void (*destroy)(struct wlr_renderer *renderer); bool (*init_wl_display)(struct wlr_renderer *renderer, struct wl_display *wl_display); diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 8f1bf883..6862fe7d 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -593,7 +593,6 @@ static const struct wlr_renderer_impl renderer_impl = { .preferred_read_format = gles2_preferred_read_format, .read_pixels = gles2_read_pixels, .texture_from_wl_drm = gles2_texture_from_wl_drm, - .texture_from_dmabuf = gles2_texture_from_dmabuf, .init_wl_display = gles2_init_wl_display, .get_drm_fd = gles2_get_drm_fd, .get_render_buffer_caps = gles2_get_render_buffer_caps, diff --git a/render/gles2/texture.c b/render/gles2/texture.c index 87710a18..6626d0af 100644 --- a/render/gles2/texture.c +++ b/render/gles2/texture.c @@ -309,7 +309,8 @@ error_ctx: return NULL; } -struct wlr_texture *gles2_texture_from_dmabuf(struct wlr_renderer *wlr_renderer, +static struct wlr_texture *gles2_texture_from_dmabuf( + struct wlr_renderer *wlr_renderer, struct wlr_dmabuf_attributes *attribs) { struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);