From 825e5f64828db54bceb672c2189e79f5b303423d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 25 Jul 2022 09:42:16 -0400 Subject: [PATCH] lavapipe: make binding/layout helper functions static inline Reviewed-by: Dave Airlie Part-of: --- src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c | 14 -------------- src/gallium/frontends/lavapipe/lvp_private.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c b/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c index bc34e1c..64dee4d 100644 --- a/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c +++ b/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c @@ -76,20 +76,6 @@ lower_uniform_block_access(const nir_instr *instr, const void *data_cb) return deref->modes == nir_var_mem_ubo; } -static const struct lvp_descriptor_set_layout * -get_set_layout(const struct lvp_pipeline_layout *layout, uint32_t set) -{ - return container_of(layout->vk.set_layouts[set], - const struct lvp_descriptor_set_layout, vk); -} - -static const struct lvp_descriptor_set_binding_layout * -get_binding_layout(const struct lvp_pipeline_layout *layout, - uint32_t set, uint32_t binding) -{ - return &get_set_layout(layout, set)->binding[binding]; -} - static nir_ssa_def * lower_block_instr(nir_builder *b, nir_instr *instr, void *data_cb) { diff --git a/src/gallium/frontends/lavapipe/lvp_private.h b/src/gallium/frontends/lavapipe/lvp_private.h index 0ac180c..64740af 100644 --- a/src/gallium/frontends/lavapipe/lvp_private.h +++ b/src/gallium/frontends/lavapipe/lvp_private.h @@ -521,6 +521,20 @@ struct lvp_cmd_buffer { }; +static inline const struct lvp_descriptor_set_layout * +get_set_layout(const struct lvp_pipeline_layout *layout, uint32_t set) +{ + return container_of(layout->vk.set_layouts[set], + const struct lvp_descriptor_set_layout, vk); +} + +static inline const struct lvp_descriptor_set_binding_layout * +get_binding_layout(const struct lvp_pipeline_layout *layout, + uint32_t set, uint32_t binding) +{ + return &get_set_layout(layout, set)->binding[binding]; +} + #define LVP_FROM_HANDLE(__lvp_type, __name, __handle) \ struct __lvp_type *__name = __lvp_type ## _from_handle(__handle) -- 2.7.4