From 9d55f712e3880927bcbc39bf4da7f4166ea94a91 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 12 Apr 2021 18:38:13 +0200 Subject: [PATCH] render: introduce wlr_texture_from_buffer This adds a a function to create a wlr_texture from a wlr_buffer. The main motivation for this is to allow the renderer to create a single wlr_texture per wlr_buffer. This can avoid needless imports by re-using existing textures. --- include/render/wlr_texture.h | 15 +++++++++++++++ include/wlr/render/interface.h | 2 ++ render/wlr_texture.c | 10 ++++++++++ 3 files changed, 27 insertions(+) create mode 100644 include/render/wlr_texture.h diff --git a/include/render/wlr_texture.h b/include/render/wlr_texture.h new file mode 100644 index 00000000..eb94824f --- /dev/null +++ b/include/render/wlr_texture.h @@ -0,0 +1,15 @@ +#ifndef RENDER_WLR_TEXTURE_H +#define RENDER_WLR_TEXTURE_H + +#include + +/** + * Create a new texture from a buffer. + * + * Should not be called in a rendering block like renderer_begin()/end() or + * between attaching a renderer to an output and committing it. + */ +struct wlr_texture *wlr_texture_from_buffer(struct wlr_renderer *renderer, + struct wlr_buffer *buffer); + +#endif diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index f280852c..251154d8 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -57,6 +57,8 @@ struct wlr_renderer_impl { struct wl_display *wl_display); int (*get_drm_fd)(struct wlr_renderer *renderer); uint32_t (*get_render_buffer_caps)(void); + struct wlr_texture *(*texture_from_buffer)(struct wlr_renderer *renderer, + struct wlr_buffer *buffer); }; void wlr_renderer_init(struct wlr_renderer *renderer, diff --git a/render/wlr_texture.c b/render/wlr_texture.c index db430d82..e9bda215 100644 --- a/render/wlr_texture.c +++ b/render/wlr_texture.c @@ -3,6 +3,7 @@ #include #include #include +#include "render/wlr_texture.h" void wlr_texture_init(struct wlr_texture *texture, const struct wlr_texture_impl *impl, uint32_t width, uint32_t height) { @@ -46,6 +47,15 @@ struct wlr_texture *wlr_texture_from_dmabuf(struct wlr_renderer *renderer, return renderer->impl->texture_from_dmabuf(renderer, attribs); } +struct wlr_texture *wlr_texture_from_buffer(struct wlr_renderer *renderer, + struct wlr_buffer *buffer) { + assert(!renderer->rendering); + if (!renderer->impl->texture_from_buffer) { + return NULL; + } + return renderer->impl->texture_from_buffer(renderer, buffer); +} + bool wlr_texture_is_opaque(struct wlr_texture *texture) { if (!texture->impl->is_opaque) { return false;