From 61612ecb3688431b85a55d046a49b3700826990d Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 18 Nov 2020 13:58:58 +0100 Subject: [PATCH] render: remove wlr_renderer_format_supported Instead, callers can just use wlr_renderer_get_formats and iterate over the list. This function was unused in wlroots. --- include/wlr/render/interface.h | 2 -- include/wlr/render/wlr_renderer.h | 5 ----- render/gles2/renderer.c | 6 ------ render/wlr_renderer.c | 6 ------ 4 files changed, 19 deletions(-) diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index 70e954f8..625ab198 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -46,8 +46,6 @@ struct wlr_renderer_impl { const float color[static 4], const float matrix[static 9]); const enum wl_shm_format *(*formats)( struct wlr_renderer *renderer, size_t *len); - bool (*format_supported)(struct wlr_renderer *renderer, - enum wl_shm_format fmt); bool (*resource_is_wl_drm_buffer)(struct wlr_renderer *renderer, struct wl_resource *resource); void (*wl_drm_buffer_get_size)(struct wlr_renderer *renderer, diff --git a/include/wlr/render/wlr_renderer.h b/include/wlr/render/wlr_renderer.h index 1de69e16..c992ded5 100644 --- a/include/wlr/render/wlr_renderer.h +++ b/include/wlr/render/wlr_renderer.h @@ -120,11 +120,6 @@ bool wlr_renderer_read_pixels(struct wlr_renderer *r, enum wl_shm_format fmt, */ bool wlr_renderer_blit_dmabuf(struct wlr_renderer *r, struct wlr_dmabuf_attributes *dst, struct wlr_dmabuf_attributes *src); -/** - * Checks if a format is supported. - */ -bool wlr_renderer_format_supported(struct wlr_renderer *r, - enum wl_shm_format fmt); /** * Creates necessary shm and invokes the initialization of the implementation. * diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index b679eb7e..fbf27e49 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -401,11 +401,6 @@ static const enum wl_shm_format *gles2_renderer_formats( return get_gles2_wl_formats(len); } -static bool gles2_format_supported(struct wlr_renderer *wlr_renderer, - enum wl_shm_format wl_fmt) { - return get_gles2_format_from_wl(wl_fmt) != NULL; -} - static bool gles2_resource_is_wl_drm_buffer(struct wlr_renderer *wlr_renderer, struct wl_resource *resource) { struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); @@ -705,7 +700,6 @@ static const struct wlr_renderer_impl renderer_impl = { .render_quad_with_matrix = gles2_render_quad_with_matrix, .render_ellipse_with_matrix = gles2_render_ellipse_with_matrix, .formats = gles2_renderer_formats, - .format_supported = gles2_format_supported, .resource_is_wl_drm_buffer = gles2_resource_is_wl_drm_buffer, .wl_drm_buffer_get_size = gles2_wl_drm_buffer_get_size, .get_dmabuf_formats = gles2_get_dmabuf_formats, diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c index 81b0a557..0fb7fbda 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -18,7 +18,6 @@ void wlr_renderer_init(struct wlr_renderer *renderer, assert(impl->render_quad_with_matrix); assert(impl->render_ellipse_with_matrix); assert(impl->formats); - assert(impl->format_supported); assert(impl->texture_from_pixels); renderer->impl = impl; @@ -195,11 +194,6 @@ bool wlr_renderer_blit_dmabuf(struct wlr_renderer *r, return r->impl->blit_dmabuf(r, dst, src); } -bool wlr_renderer_format_supported(struct wlr_renderer *r, - enum wl_shm_format fmt) { - return r->impl->format_supported(r, fmt); -} - bool wlr_renderer_init_wl_display(struct wlr_renderer *r, struct wl_display *wl_display) { if (wl_display_init_shm(wl_display)) {