From 5907dbfc091371ac4a4a42eb0254d0305cfbdc14 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 29 Aug 2025 09:26:19 +0200 Subject: [PATCH] radv: remove redundant RADV_DYNAMIC_RASTERIZATION_SAMPLES Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 069e52b1e5f..99251ac79ad 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -11944,16 +11944,12 @@ radv_validate_dynamic_states(struct radv_cmd_buffer *cmd_buffer, uint64_t dynami cmd_buffer->state.dirty |= RADV_CMD_DIRTY_VIEWPORT_STATE; } - if (dynamic_states & RADV_DYNAMIC_RASTERIZATION_SAMPLES) - cmd_buffer->state.dirty |= RADV_CMD_DIRTY_PS_STATE; - if (dynamic_states & RADV_DYNAMIC_PROVOKING_VERTEX_MODE) cmd_buffer->state.dirty |= RADV_CMD_DIRTY_NGG_STATE; - if (dynamic_states & - (RADV_DYNAMIC_CULL_MODE | RADV_DYNAMIC_FRONT_FACE | RADV_DYNAMIC_RASTERIZER_DISCARD_ENABLE | - RADV_DYNAMIC_VIEWPORT | RADV_DYNAMIC_VIEWPORT_WITH_COUNT | RADV_DYNAMIC_CONSERVATIVE_RAST_MODE | - RADV_DYNAMIC_RASTERIZATION_SAMPLES | RADV_DYNAMIC_SAMPLE_LOCATIONS_ENABLE)) + if (dynamic_states & (RADV_DYNAMIC_CULL_MODE | RADV_DYNAMIC_FRONT_FACE | RADV_DYNAMIC_RASTERIZER_DISCARD_ENABLE | + RADV_DYNAMIC_VIEWPORT | RADV_DYNAMIC_VIEWPORT_WITH_COUNT | + RADV_DYNAMIC_CONSERVATIVE_RAST_MODE | RADV_DYNAMIC_SAMPLE_LOCATIONS_ENABLE)) cmd_buffer->state.dirty |= RADV_CMD_DIRTY_NGGC_SETTINGS; if (dynamic_states & (RADV_DYNAMIC_VIEWPORT | RADV_DYNAMIC_VIEWPORT_WITH_COUNT | RADV_DYNAMIC_RASTERIZATION_SAMPLES)) @@ -11980,8 +11976,7 @@ radv_validate_dynamic_states(struct radv_cmd_buffer *cmd_buffer, uint64_t dynami if (dynamic_states & (RADV_DYNAMIC_LINE_STIPPLE_ENABLE | RADV_DYNAMIC_CONSERVATIVE_RAST_MODE | RADV_DYNAMIC_SAMPLE_LOCATIONS | - RADV_DYNAMIC_SAMPLE_LOCATIONS_ENABLE | RADV_DYNAMIC_RASTERIZATION_SAMPLES | - RADV_DYNAMIC_ALPHA_TO_COVERAGE_ENABLE | RADV_DYNAMIC_SAMPLE_MASK)) + RADV_DYNAMIC_SAMPLE_LOCATIONS_ENABLE | RADV_DYNAMIC_ALPHA_TO_COVERAGE_ENABLE | RADV_DYNAMIC_SAMPLE_MASK)) cmd_buffer->state.dirty |= RADV_CMD_DIRTY_MSAA_STATE; if (dynamic_states & @@ -11997,21 +11992,18 @@ radv_validate_dynamic_states(struct radv_cmd_buffer *cmd_buffer, uint64_t dynami (RADV_DYNAMIC_VIEWPORT | RADV_DYNAMIC_VIEWPORT_WITH_COUNT | RADV_DYNAMIC_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE)) cmd_buffer->state.dirty |= RADV_CMD_DIRTY_VIEWPORT_STATE; - if (dynamic_states & (RADV_DYNAMIC_COLOR_WRITE_MASK | RADV_DYNAMIC_RASTERIZATION_SAMPLES)) + if (dynamic_states & RADV_DYNAMIC_COLOR_WRITE_MASK) cmd_buffer->state.dirty |= RADV_CMD_DIRTY_BINNING_STATE; - if (pdev->info.gfx_level < GFX12 && (dynamic_states & RADV_DYNAMIC_RASTERIZATION_SAMPLES)) - cmd_buffer->state.dirty |= RADV_CMD_DIRTY_OCCLUSION_QUERY; - - if (dynamic_states & (RADV_DYNAMIC_COLOR_WRITE_MASK | RADV_DYNAMIC_COLOR_BLEND_ENABLE | - RADV_DYNAMIC_RASTERIZATION_SAMPLES | RADV_DYNAMIC_ATTACHMENT_FEEDBACK_LOOP_ENABLE | - RADV_DYNAMIC_ALPHA_TO_COVERAGE_ENABLE | RADV_DYNAMIC_ALPHA_TO_ONE_ENABLE)) + if (dynamic_states & + (RADV_DYNAMIC_COLOR_WRITE_MASK | RADV_DYNAMIC_COLOR_BLEND_ENABLE | RADV_DYNAMIC_ATTACHMENT_FEEDBACK_LOOP_ENABLE | + RADV_DYNAMIC_ALPHA_TO_COVERAGE_ENABLE | RADV_DYNAMIC_ALPHA_TO_ONE_ENABLE)) cmd_buffer->state.dirty |= RADV_CMD_DIRTY_DB_SHADER_CONTROL; if (dynamic_states & RADV_DYNAMIC_FRAGMENT_SHADING_RATE) cmd_buffer->state.dirty |= RADV_CMD_DIRTY_FSR_STATE; - if (dynamic_states & (RADV_DYNAMIC_RASTERIZATION_SAMPLES | RADV_DYNAMIC_SAMPLE_LOCATIONS_ENABLE)) + if (dynamic_states & RADV_DYNAMIC_SAMPLE_LOCATIONS_ENABLE) cmd_buffer->state.dirty |= RADV_CMD_DIRTY_RAST_SAMPLES_STATE; if (dynamic_states & RADV_DYNAMIC_DEPTH_BIAS)