blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

render/drm_format_set: add wlr_drm_format_{create,add}

This commit is contained in:
Simon Ser 2020-12-12 22:26:14 +01:00 committed by Ilia Bozhinov
parent 253f447329
commit d37214cb16
2 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/render/drm_format_set.h
View File

@ -3,6 +3,8 @@
#include <wlr/render/drm_format_set.h> #include <wlr/render/drm_format_set.h>
struct wlr_drm_format *wlr_drm_format_create(uint32_t format);
bool wlr_drm_format_add(struct wlr_drm_format **fmt_ptr, uint64_t modifier);
struct wlr_drm_format *wlr_drm_format_dup(const struct wlr_drm_format *format); struct wlr_drm_format *wlr_drm_format_dup(const struct wlr_drm_format *format);
/** /**
* Intersect modifiers for two DRM formats. * Intersect modifiers for two DRM formats.

87
render/drm_format_set.c
View File

@ -60,52 +60,18 @@ bool wlr_drm_format_set_has(const struct wlr_drm_format_set *set,
bool wlr_drm_format_set_add(struct wlr_drm_format_set *set, uint32_t format, bool wlr_drm_format_set_add(struct wlr_drm_format_set *set, uint32_t format,
uint64_t modifier) { uint64_t modifier) {
assert(format != DRM_FORMAT_INVALID); assert(format != DRM_FORMAT_INVALID);
struct wlr_drm_format **ptr = format_set_get_ref(set, format); struct wlr_drm_format **ptr = format_set_get_ref(set, format);
if (ptr) { if (ptr) {
struct wlr_drm_format *fmt = *ptr; return wlr_drm_format_add(ptr, modifier);
if (modifier == DRM_FORMAT_MOD_INVALID) {
return true;
}
for (size_t i = 0; i < fmt->len; ++i) {
if (fmt->modifiers[i] == modifier) {
return true;
}
}
if (fmt->len == fmt->cap) {
size_t cap = fmt->cap ? fmt->cap * 2 : 4;
fmt = realloc(fmt, sizeof(*fmt) + sizeof(fmt->modifiers[0]) * cap);
if (!fmt) {
wlr_log_errno(WLR_ERROR, "Allocation failed");
return false;
}
fmt->cap = cap;
*ptr = fmt;
}
fmt->modifiers[fmt->len++] = modifier;
return true;
} }
size_t cap = modifier != DRM_FORMAT_MOD_INVALID ? 4 : 0; struct wlr_drm_format *fmt = wlr_drm_format_create(format);
struct wlr_drm_format *fmt =
calloc(1, sizeof(*fmt) + sizeof(fmt->modifiers[0]) * cap);
if (!fmt) { if (!fmt) {
wlr_log_errno(WLR_ERROR, "Allocation failed");
return false; return false;
} }
if (!wlr_drm_format_add(&fmt, modifier)) {
fmt->format = format; return false;
if (cap) {
fmt->cap = cap;
fmt->len = 1;
fmt->modifiers[0] = modifier;
} }
if (set->len == set->cap) { if (set->len == set->cap) {
@ -127,6 +93,49 @@ bool wlr_drm_format_set_add(struct wlr_drm_format_set *set, uint32_t format,
return true; return true;
} }
struct wlr_drm_format *wlr_drm_format_create(uint32_t format) {
size_t cap = 4;
struct wlr_drm_format *fmt =
calloc(1, sizeof(*fmt) + sizeof(fmt->modifiers[0]) * cap);
if (!fmt) {
wlr_log_errno(WLR_ERROR, "Allocation failed");
return NULL;
}
fmt->format = format;
fmt->cap = cap;
return fmt;
}
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;
}
for (size_t i = 0; i < fmt->len; ++i) {
if (fmt->modifiers[i] == modifier) {
return true;
}
}
if (fmt->len == fmt->cap) {
size_t cap = fmt->cap ? fmt->cap * 2 : 4;
fmt = realloc(fmt, sizeof(*fmt) + sizeof(fmt->modifiers[0]) * cap);
if (!fmt) {
wlr_log_errno(WLR_ERROR, "Allocation failed");
return false;
}
fmt->cap = cap;
*fmt_ptr = fmt;
}
fmt->modifiers[fmt->len++] = modifier;
return true;
}
struct wlr_drm_format *wlr_drm_format_dup(const struct wlr_drm_format *format) { struct wlr_drm_format *wlr_drm_format_dup(const struct wlr_drm_format *format) {
assert(format->len <= format->cap); assert(format->len <= format->cap);
size_t format_size = sizeof(struct wlr_drm_format) + size_t format_size = sizeof(struct wlr_drm_format) +