blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Simon Ser 2020-11-18 13:58:58 +01:00
parent c15ca3793e
commit 61612ecb36
4 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/render/interface.h
View File

@ -46,8 +46,6 @@ struct wlr_renderer_impl {
const float color[static 4], const float matrix[static 9]); const float color[static 4], const float matrix[static 9]);
const enum wl_shm_format *(*formats)( const enum wl_shm_format *(*formats)(
struct wlr_renderer *renderer, size_t *len); 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, bool (*resource_is_wl_drm_buffer)(struct wlr_renderer *renderer,
struct wl_resource *resource); struct wl_resource *resource);
void (*wl_drm_buffer_get_size)(struct wlr_renderer *renderer, void (*wl_drm_buffer_get_size)(struct wlr_renderer *renderer,

5
include/wlr/render/wlr_renderer.h
View File

@ -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, bool wlr_renderer_blit_dmabuf(struct wlr_renderer *r,
struct wlr_dmabuf_attributes *dst, struct wlr_dmabuf_attributes *src); 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. * Creates necessary shm and invokes the initialization of the implementation.
* *

6
render/gles2/renderer.c
View File

@ -401,11 +401,6 @@ static const enum wl_shm_format *gles2_renderer_formats(
return get_gles2_wl_formats(len); 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, static bool gles2_resource_is_wl_drm_buffer(struct wlr_renderer *wlr_renderer,
struct wl_resource *resource) { struct wl_resource *resource) {
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); 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_quad_with_matrix = gles2_render_quad_with_matrix,
.render_ellipse_with_matrix = gles2_render_ellipse_with_matrix, .render_ellipse_with_matrix = gles2_render_ellipse_with_matrix,
.formats = gles2_renderer_formats, .formats = gles2_renderer_formats,
.format_supported = gles2_format_supported,
.resource_is_wl_drm_buffer = gles2_resource_is_wl_drm_buffer, .resource_is_wl_drm_buffer = gles2_resource_is_wl_drm_buffer,
.wl_drm_buffer_get_size = gles2_wl_drm_buffer_get_size, .wl_drm_buffer_get_size = gles2_wl_drm_buffer_get_size,
.get_dmabuf_formats = gles2_get_dmabuf_formats, .get_dmabuf_formats = gles2_get_dmabuf_formats,

6
render/wlr_renderer.c
View File

@ -18,7 +18,6 @@ void wlr_renderer_init(struct wlr_renderer *renderer,
assert(impl->render_quad_with_matrix); assert(impl->render_quad_with_matrix);
assert(impl->render_ellipse_with_matrix); assert(impl->render_ellipse_with_matrix);
assert(impl->formats); assert(impl->formats);
assert(impl->format_supported);
assert(impl->texture_from_pixels); assert(impl->texture_from_pixels);
renderer->impl = impl; renderer->impl = impl;
@ -195,11 +194,6 @@ bool wlr_renderer_blit_dmabuf(struct wlr_renderer *r,
return r->impl->blit_dmabuf(r, dst, src); 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, bool wlr_renderer_init_wl_display(struct wlr_renderer *r,
struct wl_display *wl_display) { struct wl_display *wl_display) {
if (wl_display_init_shm(wl_display)) { if (wl_display_init_shm(wl_display)) {