Merge branch 'github/fork/emersion/renderer-get-texture-formats' into 'master'

render: unify texture format enumeration

See merge request wlroots/wlroots!3112
This commit is contained in:
Simon Ser 2022-05-24 20:46:32 +00:00
commit 43b4f9e446
12 changed files with 55 additions and 74 deletions

View file

@ -161,7 +161,7 @@ static void drm_bind(struct wl_client *client, void *data,
wl_drm_send_capabilities(resource, WL_DRM_CAPABILITY_PRIME);
const struct wlr_drm_format_set *formats =
wlr_renderer_get_dmabuf_texture_formats(drm->renderer);
wlr_renderer_get_texture_formats(drm->renderer, WLR_BUFFER_CAP_DMABUF);
if (formats == NULL) {
return;
}

View file

@ -880,8 +880,8 @@ static void linux_dmabuf_send_modifiers(struct wl_resource *resource,
static void linux_dmabuf_send_formats(struct wlr_linux_dmabuf_v1 *linux_dmabuf,
struct wl_resource *resource) {
const struct wlr_drm_format_set *formats =
wlr_renderer_get_dmabuf_texture_formats(linux_dmabuf->renderer);
const struct wlr_drm_format_set *formats = wlr_renderer_get_texture_formats(
linux_dmabuf->renderer, WLR_BUFFER_CAP_DMABUF);
if (formats == NULL) {
return;
}