mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr_drm_format: Don't take double pointer in wlr_drm_format_add

Browse source
This commit is contained in:
Alexander Orzechowski 2023-05-04 18:17:55 -04:00
parent e6879616e7
commit e427e019c4
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/render/drm_format_set.h
View file

@ -5,7 +5,7 @@
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_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, 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.

8
render/drm_format_set.c
View file

@ -61,14 +61,14 @@ bool wlr_drm_format_set_add(struct wlr_drm_format_set *set, uint32_t format,
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) {
return wlr_drm_format_add(ptr, modifier); return wlr_drm_format_add(*ptr, modifier);
} }
struct wlr_drm_format *fmt = wlr_drm_format_create(format); struct wlr_drm_format *fmt = wlr_drm_format_create(format);
if (!fmt) { if (!fmt) {
return false; return false;
} }
if (!wlr_drm_format_add(&fmt, modifier)) { if (!wlr_drm_format_add(fmt, modifier)) {
wlr_drm_format_finish(fmt); wlr_drm_format_finish(fmt);
return false; return false;
} }
@ -114,9 +114,7 @@ bool wlr_drm_format_has(const struct wlr_drm_format *fmt, uint64_t modifier) {
return false; 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, uint64_t modifier) {
struct wlr_drm_format *fmt = *fmt_ptr;
if (wlr_drm_format_has(fmt, modifier)) { if (wlr_drm_format_has(fmt, modifier)) {
return true; return true;
} }

2
types/output/swapchain.c
View file

@ -38,7 +38,7 @@ static struct wlr_swapchain *create_swapchain(struct wlr_output *output,
} }
format->len = 0; format->len = 0;
wlr_drm_format_add(&format, DRM_FORMAT_MOD_INVALID); wlr_drm_format_add(format, DRM_FORMAT_MOD_INVALID);
} }
struct wlr_swapchain *swapchain = wlr_swapchain_create(allocator, width, height, format); struct wlr_swapchain *swapchain = wlr_swapchain_create(allocator, width, height, format);