From 8233d9d5711248bfd6dd050b60fdd9ab68d700b5 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 29 Aug 2025 17:09:15 +0200 Subject: [PATCH] radv: rename RADV_CMD_DIRTY_FS_STATE to RADV_CMD_DIRTY_PS_STATE It's called PS everywhere else. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 14 +++++++------- src/amd/vulkan/radv_cmd_buffer.h | 2 +- 2 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 80390753ff3..1afa5f01c04 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -8321,7 +8321,7 @@ radv_bind_fragment_shader(struct radv_cmd_buffer *cmd_buffer, const struct radv_ cmd_buffer->state.dirty |= RADV_CMD_DIRTY_PS_EPILOG_SHADER | RADV_CMD_DIRTY_PS_EPILOG_STATE; if (radv_get_user_sgpr_info(ps, AC_UD_PS_STATE)->sgpr_idx != -1) - cmd_buffer->state.dirty |= RADV_CMD_DIRTY_FS_STATE; + cmd_buffer->state.dirty |= RADV_CMD_DIRTY_PS_STATE; if (!previous_ps || previous_ps->info.ps.reads_fully_covered != ps->info.ps.reads_fully_covered) cmd_buffer->state.dirty |= RADV_CMD_DIRTY_MSAA_STATE; @@ -9849,7 +9849,7 @@ radv_CmdBeginRendering(VkCommandBuffer commandBuffer, const VkRenderingInfo *pRe cmd_buffer->state.dirty |= RADV_CMD_DIRTY_FRAMEBUFFER | RADV_CMD_DIRTY_BINNING_STATE | RADV_CMD_DIRTY_FBFETCH_OUTPUT | RADV_CMD_DIRTY_DEPTH_BIAS_STATE | RADV_CMD_DIRTY_DEPTH_STENCIL_STATE | RADV_CMD_DIRTY_CB_RENDER_STATE | - RADV_CMD_DIRTY_MSAA_STATE | RADV_CMD_DIRTY_RAST_SAMPLES_STATE | RADV_CMD_DIRTY_FS_STATE | + RADV_CMD_DIRTY_MSAA_STATE | RADV_CMD_DIRTY_RAST_SAMPLES_STATE | RADV_CMD_DIRTY_PS_STATE | RADV_CMD_DIRTY_PS_EPILOG_SHADER; if (pdev->info.rbplus_allowed) @@ -10906,7 +10906,7 @@ radv_get_nggc_settings(struct radv_cmd_buffer *cmd_buffer, bool vp_y_inverted) } static void -radv_emit_fs_state(struct radv_cmd_buffer *cmd_buffer) +radv_emit_ps_state(struct radv_cmd_buffer *cmd_buffer) { const struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); const struct radv_physical_device *pdev = radv_device_physical(device); @@ -11238,9 +11238,9 @@ radv_emit_force_vrs_state(struct radv_cmd_buffer *cmd_buffer) static void radv_emit_shaders_state(struct radv_cmd_buffer *cmd_buffer) { - if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_FS_STATE) { - radv_emit_fs_state(cmd_buffer); - cmd_buffer->state.dirty &= ~RADV_CMD_DIRTY_FS_STATE; + if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_PS_STATE) { + radv_emit_ps_state(cmd_buffer); + cmd_buffer->state.dirty &= ~RADV_CMD_DIRTY_PS_STATE; } if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_PS_EPILOG_STATE) { @@ -11930,7 +11930,7 @@ radv_validate_dynamic_states(struct radv_cmd_buffer *cmd_buffer, uint64_t dynami if (dynamic_states & (RADV_DYNAMIC_RASTERIZATION_SAMPLES | RADV_DYNAMIC_LINE_RASTERIZATION_MODE | RADV_DYNAMIC_PRIMITIVE_TOPOLOGY | RADV_DYNAMIC_POLYGON_MODE)) - cmd_buffer->state.dirty |= RADV_CMD_DIRTY_FS_STATE; + cmd_buffer->state.dirty |= RADV_CMD_DIRTY_PS_STATE; if (dynamic_states & (RADV_DYNAMIC_PRIMITIVE_TOPOLOGY | RADV_DYNAMIC_PROVOKING_VERTEX_MODE)) cmd_buffer->state.dirty |= RADV_CMD_DIRTY_NGG_STATE; diff --git a/src/amd/vulkan/radv_cmd_buffer.h b/src/amd/vulkan/radv_cmd_buffer.h index dbaa4ac9032..16d06faa10c 100644 --- a/src/amd/vulkan/radv_cmd_buffer.h +++ b/src/amd/vulkan/radv_cmd_buffer.h @@ -96,7 +96,7 @@ enum radv_cmd_dirty_bits { RADV_CMD_DIRTY_GRAPHICS_SHADERS = 1ull << 10, RADV_CMD_DIRTY_FRAGMENT_OUTPUT = 1ull << 11, RADV_CMD_DIRTY_FBFETCH_OUTPUT = 1ull << 12, - RADV_CMD_DIRTY_FS_STATE = 1ull << 13, + RADV_CMD_DIRTY_PS_STATE = 1ull << 13, RADV_CMD_DIRTY_NGG_STATE = 1ull << 14, RADV_CMD_DIRTY_TASK_STATE = 1ull << 15, RADV_CMD_DIRTY_DEPTH_STENCIL_STATE = 1ull << 16,