mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-17 06:46:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/allocator/gbm: use gbm_bo_create_with_modifiers2() if available

Browse source 
The flags are not really used now but will be exposed soon.
This commit is contained in:
Simon Ser 2023-11-30 20:22:41 +01:00
parent a165261f7f
commit b992930ebe
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
render/allocator/gbm.c
View file

@ -97,20 +97,26 @@ static struct wlr_gbm_buffer *create_buffer(struct wlr_gbm_allocator *alloc,
bool has_modifier = true;
uint64_t fallback_modifier = DRM_FORMAT_MOD_INVALID;
struct gbm_bo *bo = gbm_bo_create_with_modifiers(gbm_device, width, height,
uint32_t flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING;
struct gbm_bo *bo;
#if HAVE_GBM_BO_CREATE_WITH_MODIFIERS2
bo = gbm_bo_create_with_modifiers2(gbm_device, width, height,
format->format, format->modifiers, format->len, flags);
#else
bo = gbm_bo_create_with_modifiers(gbm_device, width, height,
format->format, format->modifiers, format->len);
#endif
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;
flags |= 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);
bo = gbm_bo_create(gbm_device, width, height, format->format, flags);
has_modifier = false;
}
if (bo == NULL) {

3
render/allocator/meson.build
View file

@ -22,4 +22,7 @@ if gbm.found()
has = cc.has_function('gbm_bo_get_fd_for_plane', dependencies: [gbm])
internal_config.set10('HAVE_GBM_BO_GET_FD_FOR_PLANE', has)
has = cc.has_function('gbm_bo_create_with_modifiers2', dependencies: [gbm])
internal_config.set10('HAVE_GBM_BO_CREATE_WITH_MODIFIERS2', has)
endif