mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-16 08:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Require INVALID for implicit format modifiers"

Browse source 
This reverts commit ea7357b703.
This commit is contained in:
Simon Ser 2021-10-01 17:22:04 +02:00 • committed by Simon Zeni
parent 61b83441a1
commit 1d7e438d8a
6 changed files with 45 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

31
render/drm_format_set.c
View file

@ -43,6 +43,11 @@ bool wlr_drm_format_set_has(const struct wlr_drm_format_set *set,
if (!fmt) {
return false;
}
if (modifier == DRM_FORMAT_MOD_INVALID) {
return true;
}
return wlr_drm_format_has(fmt, modifier);
}
@ -107,6 +112,10 @@ bool wlr_drm_format_has(const struct wlr_drm_format *fmt, uint64_t modifier) {
bool wlr_drm_format_add(struct wlr_drm_format **fmt_ptr, uint64_t modifier) {
struct wlr_drm_format *fmt = *fmt_ptr;
if (modifier == DRM_FORMAT_MOD_INVALID) {
return true;
}
if (wlr_drm_format_has(fmt, modifier)) {
return true;
}
@ -144,17 +153,15 @@ 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)) {
// Special case: if a format only supports LINEAR and the other doesn't
// support any modifier, force LINEAR. This will force the allocator to
// create a buffer with a LINEAR layout instead of an implicit modifier.
if (a->len == 0 && b->len == 1 && b->modifiers[0] == DRM_FORMAT_MOD_LINEAR) {
return wlr_drm_format_dup(b);
}
if (b->len == 0 && a->len == 1 && a->modifiers[0] == DRM_FORMAT_MOD_LINEAR) {
return wlr_drm_format_dup(a);
}
size_t format_cap = a->len < b->len ? a->len : b->len;
size_t format_size = sizeof(struct wlr_drm_format) +
@ -178,9 +185,9 @@ struct wlr_drm_format *wlr_drm_format_intersect(
}
}
// If the intersection is empty, then the formats aren't compatible with
// each other.
if (format->len == 0) {
// If both formats support modifiers, but the intersection is empty, then
// the formats aren't compatible with each other
if (format->len == 0 && a->len > 0 && b->len > 0) {
free(format);
return NULL;
}