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

render/drm_format_set: add wlr_drm_format_has

This commit is contained in:
Simon Ser 2021-03-31 16:50:17 +02:00 committed by Simon Zeni
parent 744a5c2fef
commit 833437d592
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/render/drm_format_set.h
View File

@ -4,6 +4,7 @@
#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); struct wlr_drm_format *wlr_drm_format_create(uint32_t format);
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); 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);
/** /**

21
render/drm_format_set.c
View File

@ -48,13 +48,7 @@ bool wlr_drm_format_set_has(const struct wlr_drm_format_set *set,
return true; return true;
} }
for (size_t i = 0; i < fmt->len; ++i) { return wlr_drm_format_has(fmt, modifier);
if (fmt->modifiers[i] == modifier) {
return true;
}
}
return false;
} }
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,
@ -106,6 +100,15 @@ struct wlr_drm_format *wlr_drm_format_create(uint32_t format) {
return fmt; return fmt;
} }
bool wlr_drm_format_has(const struct wlr_drm_format *fmt, uint64_t modifier) {
for (size_t i = 0; i < fmt->len; ++i) {
if (fmt->modifiers[i] == modifier) {
return true;
}
}
return false;
}
bool wlr_drm_format_add(struct wlr_drm_format **fmt_ptr, uint64_t modifier) { bool wlr_drm_format_add(struct wlr_drm_format **fmt_ptr, uint64_t modifier) {
struct wlr_drm_format *fmt = *fmt_ptr; struct wlr_drm_format *fmt = *fmt_ptr;
@ -113,11 +116,9 @@ bool wlr_drm_format_add(struct wlr_drm_format **fmt_ptr, uint64_t modifier) {
return true; return true;
} }
for (size_t i = 0; i < fmt->len; ++i) { if (wlr_drm_format_has(fmt, modifier)) {
if (fmt->modifiers[i] == modifier) {
return true; return true;
} }
}
if (fmt->len == fmt->cap) { if (fmt->len == fmt->cap) {
size_t cap = fmt->cap ? fmt->cap * 2 : 4; size_t cap = fmt->cap ? fmt->cap * 2 : 4;