diff options
| author | Simon Ser <contact@emersion.fr> | 2022-11-29 10:19:10 +0100 |
|---|---|---|
| committer | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-12-02 15:18:59 +0000 |
| commit | db9d277614aa8fb84871cd01f2233ecd6e4f5ef2 (patch) | |
| tree | 3a5abe75d03dc70403d74792b628cc4aad715602 | |
| parent | b4ad4671dc9a2136bebff279c4b15879dad9b795 (diff) | |
render/vulkan: make vulkan_format_props_find_modifier() return value const
| -rw-r--r-- | include/render/vulkan.h | 2 | ||||
| -rw-r--r-- | render/vulkan/pixel_format.c | 2 | ||||
| -rw-r--r-- | render/vulkan/texture.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/render/vulkan.h b/include/render/vulkan.h index d5c8190e..931e5e5f 100644 --- a/include/render/vulkan.h +++ b/include/render/vulkan.h @@ -108,7 +108,7 @@ struct wlr_vk_format_props { void vulkan_format_props_query(struct wlr_vk_device *dev, const struct wlr_vk_format *format); -struct wlr_vk_format_modifier_props *vulkan_format_props_find_modifier( +const struct wlr_vk_format_modifier_props *vulkan_format_props_find_modifier( struct wlr_vk_format_props *props, uint64_t mod, bool render); void vulkan_format_props_finish(struct wlr_vk_format_props *props); diff --git a/render/vulkan/pixel_format.c b/render/vulkan/pixel_format.c index 9362294a..3966ce7f 100644 --- a/render/vulkan/pixel_format.c +++ b/render/vulkan/pixel_format.c @@ -414,7 +414,7 @@ void vulkan_format_props_finish(struct wlr_vk_format_props *props) { free(props->render_mods); } -struct wlr_vk_format_modifier_props *vulkan_format_props_find_modifier( +const struct wlr_vk_format_modifier_props *vulkan_format_props_find_modifier( struct wlr_vk_format_props *props, uint64_t mod, bool render) { if (render) { for (unsigned i = 0u; i < props->render_mod_count; ++i) { diff --git a/render/vulkan/texture.c b/render/vulkan/texture.c index 131e03ba..0c066830 100644 --- a/render/vulkan/texture.c +++ b/render/vulkan/texture.c @@ -451,7 +451,7 @@ VkImage vulkan_import_dmabuf(struct wlr_vk_renderer *renderer, uint32_t plane_count = attribs->n_planes; assert(plane_count < WLR_DMABUF_MAX_PLANES); - struct wlr_vk_format_modifier_props *mod = + const struct wlr_vk_format_modifier_props *mod = vulkan_format_props_find_modifier(fmt, attribs->modifier, for_render); if (!mod) { wlr_log(WLR_ERROR, "Format %"PRIx32" (%.4s) can't be used with modifier " |