aboutsummaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2021-10-01 17:22:04 +0200
committerSimon Zeni <simon@bl4ckb0ne.ca>2021-10-01 09:26:05 -0600
commit1d7e438d8ac636a2c90d58875e73a67e5440e4ae (patch)
tree1e42c9eeb72a7e2af478c8db73824968b2b0c109 /render
parent61b83441a195d9500a3c96bd640a756be16b658e (diff)
Revert "Require INVALID for implicit format modifiers"
This reverts commit ea7357b70366588069c83f158e6a4eb2d3a702b3.
Diffstat (limited to 'render')
-rw-r--r--render/allocator/gbm.c14
-rw-r--r--render/drm_format_set.c31
-rw-r--r--render/egl.c11
3 files changed, 30 insertions, 26 deletions
diff --git a/render/allocator/gbm.c b/render/allocator/gbm.c
index 787939f4..86e4749b 100644
--- a/render/allocator/gbm.c
+++ b/render/allocator/gbm.c
@@ -7,7 +7,6 @@
#include <wlr/util/log.h>
#include <xf86drm.h>
#include "render/allocator/gbm.h"
-#include "render/drm_format_set.h"
static const struct wlr_buffer_impl buffer_impl;
@@ -87,20 +86,17 @@ static struct wlr_gbm_buffer *create_buffer(struct wlr_gbm_allocator *alloc,
int width, int height, const struct wlr_drm_format *format) {
struct gbm_device *gbm_device = alloc->gbm_device;
- assert(format->len > 0);
-
+ struct gbm_bo *bo = NULL;
bool has_modifier = true;
- struct gbm_bo *bo = gbm_bo_create_with_modifiers(gbm_device, width, height,
- format->format, format->modifiers, format->len);
+ if (format->len > 0) {
+ bo = gbm_bo_create_with_modifiers(gbm_device, width, height,
+ format->format, format->modifiers, format->len);
+ }
if (bo == NULL) {
uint32_t usage = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING;
if (format->len == 1 &&
format->modifiers[0] == DRM_FORMAT_MOD_LINEAR) {
usage |= GBM_BO_USE_LINEAR;
- } else if (!wlr_drm_format_has(format, DRM_FORMAT_MOD_INVALID)) {
- // If the format doesn't accept an implicit modifier, bail out.
- wlr_log(WLR_ERROR, "gbm_bo_create_with_modifiers failed");
- return NULL;
}
bo = gbm_bo_create(gbm_device, width, height, format->format, usage);
has_modifier = false;
diff --git a/render/drm_format_set.c b/render/drm_format_set.c
index 8dc48675..daded20b 100644
--- a/render/drm_format_set.c
+++ b/render/drm_format_set.c
@@ -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;
}
diff --git a/render/egl.c b/render/egl.c
index 1293c14b..712a61c8 100644
--- a/render/egl.c
+++ b/render/egl.c
@@ -119,11 +119,12 @@ static void init_dmabuf_formats(struct wlr_egl *egl) {
has_modifiers = has_modifiers || modifiers_len > 0;
- // EGL always supports implicit modifiers
- wlr_drm_format_set_add(&egl->dmabuf_texture_formats, fmt,
- DRM_FORMAT_MOD_INVALID);
- wlr_drm_format_set_add(&egl->dmabuf_render_formats, fmt,
- DRM_FORMAT_MOD_INVALID);
+ if (modifiers_len == 0) {
+ wlr_drm_format_set_add(&egl->dmabuf_texture_formats, fmt,
+ DRM_FORMAT_MOD_INVALID);
+ wlr_drm_format_set_add(&egl->dmabuf_render_formats, fmt,
+ DRM_FORMAT_MOD_INVALID);
+ }
for (int j = 0; j < modifiers_len; j++) {
wlr_drm_format_set_add(&egl->dmabuf_texture_formats, fmt,