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

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

14
render/allocator/gbm.c
View file

@ -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;