From ddfee63055d53b975039e768cdb5ee3ea92ab5ab Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 16 Feb 2021 19:20:00 +0100 Subject: render: use DRM formats in wlr_renderer_get_shm_texture_formats --- render/wlr_renderer.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'render/wlr_renderer.c') diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c index 4bbbaf59..cc97c20d 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -9,6 +9,7 @@ #include #include #include "util/signal.h" +#include "render/shm_format.h" #include "render/wlr_renderer.h" #include "backend/backend.h" @@ -151,8 +152,8 @@ void wlr_render_ellipse_with_matrix(struct wlr_renderer *r, r->impl->render_ellipse_with_matrix(r, color, matrix); } -const enum wl_shm_format *wlr_renderer_get_shm_texture_formats( - struct wlr_renderer *r, size_t *len) { +const uint32_t *wlr_renderer_get_shm_texture_formats(struct wlr_renderer *r, + size_t *len) { return r->impl->get_shm_texture_formats(r, len); } @@ -217,8 +218,7 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r, } size_t len; - const enum wl_shm_format *formats = - wlr_renderer_get_shm_texture_formats(r, &len); + const uint32_t *formats = wlr_renderer_get_shm_texture_formats(r, &len); if (formats == NULL) { wlr_log(WLR_ERROR, "Failed to initialize shm: cannot get formats"); return false; @@ -228,7 +228,8 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r, for (size_t i = 0; i < len; ++i) { // ARGB8888 and XRGB8888 must be supported and are implicitly // advertised by wl_display_init_shm - switch (formats[i]) { + enum wl_shm_format fmt = convert_drm_format_to_wl_shm(formats[i]); + switch (fmt) { case WL_SHM_FORMAT_ARGB8888: argb8888 = true; break; @@ -236,7 +237,7 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r, xrgb8888 = true; break; default: - wl_display_add_shm_format(wl_display, formats[i]); + wl_display_add_shm_format(wl_display, fmt); } } assert(argb8888 && xrgb8888); -- cgit v1.2.3