mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Require INVALID for implicit format modifiers

Browse source 
See [1] for the motivation.

[1]: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/75
This commit is contained in:
Simon Ser 2021-03-31 17:07:55 +02:00 • committed by Simon Zeni
parent d78cb808b1
commit affe9eda57
7 changed files with 43 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

18
render/allocator/gbm.c
View file

@ -10,6 +10,7 @@
#include <xf86drm.h>
#include "render/allocator/gbm.h"
#include "render/drm_format_set.h"
static const struct wlr_buffer_impl buffer_impl;
@ -89,17 +90,22 @@ 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;
struct gbm_bo *bo = NULL;
assert(format->len > 0);
bool has_modifier = true;
if (format->len > 0) {
bo = gbm_bo_create_with_modifiers(gbm_device, width, height,
format->format, format->modifiers, format->len);
}
uint64_t fallback_modifier = DRM_FORMAT_MOD_INVALID;
struct gbm_bo *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;
fallback_modifier = DRM_FORMAT_MOD_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;
@ -128,7 +134,7 @@ static struct wlr_gbm_buffer *create_buffer(struct wlr_gbm_allocator *alloc,
// don't populate the modifier field: other parts of the stack may not
// understand modifiers, and they can't strip the modifier.
if (!has_modifier) {
buffer->dmabuf.modifier = DRM_FORMAT_MOD_INVALID;
buffer->dmabuf.modifier = fallback_modifier;
}
wlr_log(WLR_DEBUG, "Allocated %dx%d GBM buffer (format 0x%"PRIX32", "