From f090f7186bba7aa9e1fc51366bafec849e81f351 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 3 Apr 2024 15:45:36 +0200 Subject: [PATCH] radv: rename si_cmd_buffer.c to radv_cs.c This file now mostly contain CS related functions. Also move prototypes while we are at it. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/meson.build | 2 +- src/amd/vulkan/{si_cmd_buffer.c => radv_cs.c} | 0 src/amd/vulkan/radv_cs.h | 13 +++++++++++++ src/amd/vulkan/radv_private.h | 12 ------------ 4 files changed, 14 insertions(+), 13 deletions(-) rename src/amd/vulkan/{si_cmd_buffer.c => radv_cs.c} (100%) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 2d91bcbe010..36aec490ab9 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -116,6 +116,7 @@ libradv_files = files( 'radv_cp_dma.h', 'radv_cp_reg_shadowing.c', 'radv_cp_reg_shadowing.h', + 'radv_cs.c', 'radv_cs.h', 'radv_debug.c', 'radv_debug.h', @@ -180,7 +181,6 @@ libradv_files = files( 'radv_video.h', 'radv_wsi.c', 'radv_wsi.h', - 'si_cmd_buffer.c', ) if not with_platform_windows diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/radv_cs.c similarity index 100% rename from src/amd/vulkan/si_cmd_buffer.c rename to src/amd/vulkan/radv_cs.c diff --git a/src/amd/vulkan/radv_cs.h b/src/amd/vulkan/radv_cs.h index a583fd271a5..bacc9895a33 100644 --- a/src/amd/vulkan/radv_cs.h +++ b/src/amd/vulkan/radv_cs.h @@ -270,4 +270,17 @@ radv_cs_write_data(const struct radv_device *device, struct radeon_cmdbuf *cs, c assert(cs->cdw == cdw_end); } +void radv_cs_emit_write_event_eop(struct radeon_cmdbuf *cs, enum amd_gfx_level gfx_level, enum radv_queue_family qf, + unsigned event, unsigned event_flags, unsigned dst_sel, unsigned data_sel, + uint64_t va, uint32_t new_fence, uint64_t gfx9_eop_bug_va); + +void radv_cs_emit_cache_flush(struct radeon_winsys *ws, struct radeon_cmdbuf *cs, enum amd_gfx_level gfx_level, + uint32_t *flush_cnt, uint64_t flush_va, enum radv_queue_family qf, + enum radv_cmd_flush_bits flush_bits, enum rgp_flush_bits *sqtt_flush_bits, + uint64_t gfx9_eop_bug_va); + +void radv_emit_cond_exec(const struct radv_device *device, struct radeon_cmdbuf *cs, uint64_t va, uint32_t count); + +void radv_cs_write_data_imm(struct radeon_cmdbuf *cs, unsigned engine_sel, uint64_t va, uint32_t imm); + #endif /* RADV_CS_H */ diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 05073c316ec..35622217c9c 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -201,18 +201,6 @@ struct radv_shader_binary_part; struct radv_ray_tracing_pipeline; -void radv_cs_emit_write_event_eop(struct radeon_cmdbuf *cs, enum amd_gfx_level gfx_level, enum radv_queue_family qf, - unsigned event, unsigned event_flags, unsigned dst_sel, unsigned data_sel, - uint64_t va, uint32_t new_fence, uint64_t gfx9_eop_bug_va); - -void radv_cs_emit_cache_flush(struct radeon_winsys *ws, struct radeon_cmdbuf *cs, enum amd_gfx_level gfx_level, - uint32_t *flush_cnt, uint64_t flush_va, enum radv_queue_family qf, - enum radv_cmd_flush_bits flush_bits, enum rgp_flush_bits *sqtt_flush_bits, - uint64_t gfx9_eop_bug_va); -void radv_emit_cond_exec(const struct radv_device *device, struct radeon_cmdbuf *cs, uint64_t va, uint32_t count); - -void radv_cs_write_data_imm(struct radeon_cmdbuf *cs, unsigned engine_sel, uint64_t va, uint32_t imm); - struct radv_ray_tracing_group; struct radv_ray_tracing_stage;