From 42138a073bcfa3f18d5467cf6f2ded19c3667e96 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 1 Oct 2021 17:22:04 +0200 Subject: [PATCH] Revert "render/drm_format_set: remove special LINEAR case" This reverts commit 6d281d96cb93b8de972039d5cb00bfce49d9a58c. --- render/drm_format_set.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/render/drm_format_set.c b/render/drm_format_set.c index 36cdcd5d4..8dc486751 100644 --- a/render/drm_format_set.c +++ b/render/drm_format_set.c @@ -144,6 +144,18 @@ struct wlr_drm_format *wlr_drm_format_intersect( const struct wlr_drm_format *a, const struct wlr_drm_format *b) { assert(a->format == b->format); + // Special case: if a format only supports LINEAR and the other supports + // implicit modifiers, force LINEAR. This will force the allocator to + // create a buffer with a linear layout instead of an implicit modifier. + if (a->len == 1 && a->modifiers[0] == DRM_FORMAT_MOD_LINEAR && + wlr_drm_format_has(b, DRM_FORMAT_MOD_INVALID)) { + return wlr_drm_format_dup(a); + } + if (b->len == 1 && b->modifiers[0] == DRM_FORMAT_MOD_LINEAR && + wlr_drm_format_has(a, DRM_FORMAT_MOD_INVALID)) { + return wlr_drm_format_dup(b); + } + size_t format_cap = a->len < b->len ? a->len : b->len; size_t format_size = sizeof(struct wlr_drm_format) + format_cap * sizeof(a->modifiers[0]);