aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2021-02-02 23:38:42 +0100
committerSimon Zeni <simon@bl4ckb0ne.ca>2021-07-05 11:13:41 -0400
commite5b5592a95e3f12afc90cc9fcf5adc3664bf79a3 (patch)
tree63de24befd7b020d618c4bb317fc2b309ea85855 /include
parent4e07d4cbf9c104625d419b9123dca0ef402472e7 (diff)
render: remove wl_drm support from wlr_renderer
Everything needs to go through the unified wlr_buffer interface now. If necessary, there are two ways support for EGL_WL_bind_wayland_display could be restored by compositors: - Either by using GBM to convert back EGL Wayland buffers to DMA-BUFs, then wrap the DMA-BUF into a wlr_buffer. - Or by wrapping the EGL Wayland buffer into a special wlr_buffer that doesn't implement any wlr_buffer_impl hook, and special-case that buffer type in the renderer.
Diffstat (limited to 'include')
-rw-r--r--include/wlr/render/interface.h10
-rw-r--r--include/wlr/render/wlr_renderer.h10
2 files changed, 2 insertions, 18 deletions
diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h
index bb96674c..1e355d43 100644
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@@ -30,12 +30,8 @@ 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]);
- const uint32_t *(*get_shm_texture_formats)(struct wlr_renderer *renderer,
- size_t *len);
- bool (*resource_is_wl_drm_buffer)(struct wlr_renderer *renderer,
- struct wl_resource *resource);
- void (*wl_drm_buffer_get_size)(struct wlr_renderer *renderer,
- struct wl_resource *buffer, int *width, int *height);
+ const uint32_t *(*get_shm_texture_formats)(
+ struct wlr_renderer *renderer, size_t *len);
const struct wlr_drm_format_set *(*get_dmabuf_texture_formats)(
struct wlr_renderer *renderer);
const struct wlr_drm_format_set *(*get_render_formats)(
@@ -45,8 +41,6 @@ struct wlr_renderer_impl {
uint32_t *flags, uint32_t stride, uint32_t width, uint32_t height,
uint32_t src_x, uint32_t src_y, uint32_t dst_x, uint32_t dst_y,
void *data);
- struct wlr_texture *(*texture_from_wl_drm)(struct wlr_renderer *renderer,
- struct wl_resource *data);
void (*destroy)(struct wlr_renderer *renderer);
bool (*init_wl_display)(struct wlr_renderer *renderer,
struct wl_display *wl_display);
diff --git a/include/wlr/render/wlr_renderer.h b/include/wlr/render/wlr_renderer.h
index e9f8c4e2..4a98443f 100644
--- a/include/wlr/render/wlr_renderer.h
+++ b/include/wlr/render/wlr_renderer.h
@@ -81,16 +81,6 @@ void wlr_render_quad_with_matrix(struct wlr_renderer *r,
const uint32_t *wlr_renderer_get_shm_texture_formats(
struct wlr_renderer *r, size_t *len);
/**
- * Returns true if this wl_buffer is a wl_drm buffer.
- */
-bool wlr_renderer_resource_is_wl_drm_buffer(struct wlr_renderer *renderer,
- struct wl_resource *buffer);
-/**
- * Gets the width and height of a wl_drm buffer.
- */
-void wlr_renderer_wl_drm_buffer_get_size(struct wlr_renderer *renderer,
- struct wl_resource *buffer, int *width, int *height);
-/**
* Get the DMA-BUF formats supporting sampling usage. Buffers allocated with
* a format from this list may be imported via wlr_texture_from_dmabuf.
*/