From 6e4f26827ca4b0c4b30dc56b356cc6be294fd530 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 4 Apr 2024 15:41:25 +0200 Subject: [PATCH] radv: move radv_get_user_sgpr() to radv_shader.c Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 6 ------ src/amd/vulkan/radv_cmd_buffer.h | 2 -- src/amd/vulkan/radv_shader.c | 6 ++++++ src/amd/vulkan/radv_shader.h | 2 ++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 75834501d33..42af9991f24 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -944,12 +944,6 @@ radv_save_descriptors(struct radv_cmd_buffer *cmd_buffer, VkPipelineBindPoint bi radv_write_data(cmd_buffer, V_370_ME, va, MAX_SETS * 2, data, false); } -const struct radv_userdata_info * -radv_get_user_sgpr(const struct radv_shader *shader, int idx) -{ - return &shader->info.user_sgprs_locs.shader_data[idx]; -} - static void radv_emit_userdata_address(struct radv_device *device, struct radeon_cmdbuf *cs, struct radv_shader *shader, uint32_t base_reg, int idx, uint64_t va) diff --git a/src/amd/vulkan/radv_cmd_buffer.h b/src/amd/vulkan/radv_cmd_buffer.h index b27a251fef7..ec9f21e6bc9 100644 --- a/src/amd/vulkan/radv_cmd_buffer.h +++ b/src/amd/vulkan/radv_cmd_buffer.h @@ -675,8 +675,6 @@ bool radv_gang_init(struct radv_cmd_buffer *cmd_buffer); void radv_set_descriptor_set(struct radv_cmd_buffer *cmd_buffer, VkPipelineBindPoint bind_point, struct radv_descriptor_set *set, unsigned idx); -const struct radv_userdata_info *radv_get_user_sgpr(const struct radv_shader *shader, int idx); - void radv_update_ds_clear_metadata(struct radv_cmd_buffer *cmd_buffer, const struct radv_image_view *iview, VkClearDepthStencilValue ds_clear_value, VkImageAspectFlags aspects); diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index d909c3f208e..769ea14f1c7 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -2965,6 +2965,12 @@ radv_compute_spi_ps_input(const struct radv_graphics_state_key *gfx_state, const return spi_ps_input; } +const struct radv_userdata_info * +radv_get_user_sgpr(const struct radv_shader *shader, int idx) +{ + return &shader->info.user_sgprs_locs.shader_data[idx]; +} + VkResult radv_dump_shader_stats(struct radv_device *device, struct radv_pipeline *pipeline, struct radv_shader *shader, gl_shader_stage stage, FILE *output) diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index 2c67e126b0e..ac7cd205132 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -787,4 +787,6 @@ void radv_shader_combine_cfg_vs_gs(const struct radv_shader *vs, const struct ra void radv_shader_combine_cfg_tes_gs(const struct radv_shader *tes, const struct radv_shader *gs, uint32_t *rsrc1_out, uint32_t *rsrc2_out); +const struct radv_userdata_info *radv_get_user_sgpr(const struct radv_shader *shader, int idx); + #endif /* RADV_SHADER_H */