From c32facfb3e779c5d8faac016d9dab4a0ca970cf3 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 22 Aug 2025 16:15:03 +0200 Subject: [PATCH] radv: add radv_cmd_set_rasterization_samples() Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index e4b7691fe4d..dbb928ba386 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -307,6 +307,16 @@ radv_cmd_set_sample_mask(struct radv_cmd_buffer *cmd_buffer, uint32_t sample_mas state->dirty_dynamic |= RADV_DYNAMIC_SAMPLE_MASK; } +ALWAYS_INLINE static void +radv_cmd_set_rasterization_samples(struct radv_cmd_buffer *cmd_buffer, VkSampleCountFlagBits rasterization_samples) +{ + struct radv_cmd_state *state = &cmd_buffer->state; + + state->dynamic.vk.ms.rasterization_samples = rasterization_samples; + + state->dirty_dynamic |= RADV_DYNAMIC_RASTERIZATION_SAMPLES; +} + static void radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dynamic_state *src) { @@ -566,7 +576,12 @@ radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dy } } - RADV_CMP_COPY(vk.ms.rasterization_samples, RADV_DYNAMIC_RASTERIZATION_SAMPLES); + if (copy_mask & RADV_DYNAMIC_RASTERIZATION_SAMPLES) { + if (dest->vk.ms.rasterization_samples != src->vk.ms.rasterization_samples) { + radv_cmd_set_rasterization_samples(cmd_buffer, src->vk.ms.rasterization_samples); + } + } + RADV_CMP_COPY(vk.ms.sample_locations_enable, RADV_DYNAMIC_SAMPLE_LOCATIONS_ENABLE); RADV_CMP_COPY(vk.ds.depth.bounds_test.min, RADV_DYNAMIC_DEPTH_BOUNDS); @@ -8784,11 +8799,7 @@ VKAPI_ATTR void VKAPI_CALL radv_CmdSetRasterizationSamplesEXT(VkCommandBuffer commandBuffer, VkSampleCountFlagBits rasterizationSamples) { VK_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); - struct radv_cmd_state *state = &cmd_buffer->state; - - state->dynamic.vk.ms.rasterization_samples = rasterizationSamples; - - state->dirty_dynamic |= RADV_DYNAMIC_RASTERIZATION_SAMPLES; + radv_cmd_set_rasterization_samples(cmd_buffer, rasterizationSamples); } VKAPI_ATTR void VKAPI_CALL