From 6fc5bfcbaab7a12a68c1667ef6e8e77c0adcbaa5 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 22 Aug 2025 18:07:18 +0200 Subject: [PATCH] radv: add radv_cmd_set_scissor_with_count() Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index e67f1f7009a..9362b6c74b4 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -590,6 +590,16 @@ radv_cmd_set_viewport_with_count(struct radv_cmd_buffer *cmd_buffer, uint32_t vi state->dirty |= RADV_CMD_DIRTY_GUARDBAND; } +ALWAYS_INLINE static void +radv_cmd_set_scissor_with_count(struct radv_cmd_buffer *cmd_buffer, uint32_t scissor_count) +{ + struct radv_cmd_state *state = &cmd_buffer->state; + + state->dynamic.vk.vp.scissor_count = scissor_count; + + state->dirty_dynamic |= RADV_DYNAMIC_SCISSOR_WITH_COUNT; +} + static void radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dynamic_state *src) { @@ -624,8 +634,7 @@ radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dy if (copy_mask & RADV_DYNAMIC_SCISSOR_WITH_COUNT) { if (dest->vk.vp.scissor_count != src->vk.vp.scissor_count) { - dest->vk.vp.scissor_count = src->vk.vp.scissor_count; - dest_mask |= RADV_DYNAMIC_SCISSOR_WITH_COUNT; + radv_cmd_set_scissor_with_count(cmd_buffer, src->vk.vp.scissor_count); } } @@ -8715,11 +8724,8 @@ VKAPI_ATTR void VKAPI_CALL radv_CmdSetScissorWithCount(VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D *pScissors) { VK_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); - struct radv_cmd_state *state = &cmd_buffer->state; - state->dynamic.vk.vp.scissor_count = scissorCount; - - state->dirty_dynamic |= RADV_DYNAMIC_SCISSOR_WITH_COUNT; + radv_cmd_set_scissor_with_count(cmd_buffer, scissorCount); radv_CmdSetScissor(commandBuffer, 0, scissorCount, pScissors); }