From a109a80dca502bd36d61f1d1b3ad1c708ea5ad09 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 26 Mar 2021 12:21:23 +0100 Subject: render: drop support for ellipses For anything more complicated than quads, compositors can easily ship their own shaders. Closes: https://github.com/swaywm/wlroots/issues/2759 --- include/render/gles2.h | 7 ------- include/wlr/render/interface.h | 2 -- include/wlr/render/wlr_renderer.h | 10 ---------- 3 files changed, 19 deletions(-) (limited to 'include') diff --git a/include/render/gles2.h b/include/render/gles2.h index 7bfd6235..be9a5a7d 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -61,13 +61,6 @@ struct wlr_gles2_renderer { GLint color; GLint pos_attrib; } quad; - struct { - GLuint program; - GLint proj; - GLint color; - GLint pos_attrib; - GLint tex_attrib; - } ellipse; struct wlr_gles2_tex_shader tex_rgba; struct wlr_gles2_tex_shader tex_rgbx; struct wlr_gles2_tex_shader tex_ext; diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index f00a8d76..5159e83b 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -30,8 +30,6 @@ struct wlr_renderer_impl { const float matrix[static 9], float alpha); void (*render_quad_with_matrix)(struct wlr_renderer *renderer, const float color[static 4], const float matrix[static 9]); - void (*render_ellipse_with_matrix)(struct wlr_renderer *renderer, - const float color[static 4], const float matrix[static 9]); const uint32_t *(*get_shm_texture_formats)(struct wlr_renderer *renderer, size_t *len); bool (*resource_is_wl_drm_buffer)(struct wlr_renderer *renderer, diff --git a/include/wlr/render/wlr_renderer.h b/include/wlr/render/wlr_renderer.h index 8369e0f2..56b03c1b 100644 --- a/include/wlr/render/wlr_renderer.h +++ b/include/wlr/render/wlr_renderer.h @@ -71,16 +71,6 @@ void wlr_render_rect(struct wlr_renderer *r, const struct wlr_box *box, */ void wlr_render_quad_with_matrix(struct wlr_renderer *r, const float color[static 4], const float matrix[static 9]); -/** - * Renders a solid ellipse in the specified color. - */ -void wlr_render_ellipse(struct wlr_renderer *r, const struct wlr_box *box, - const float color[static 4], const float projection[static 9]); -/** - * Renders a solid ellipse in the specified color with the specified matrix. - */ -void wlr_render_ellipse_with_matrix(struct wlr_renderer *r, - const float color[static 4], const float matrix[static 9]); /** * Get the shared-memory formats supporting import usage. Buffers allocated * with a format from this list may be imported via wlr_texture_from_pixels. -- cgit v1.2.3