From ce3b84cc62f7e10dbf5a62ff8c5a50b3c8074cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Tue, 6 Jun 2023 10:17:16 +0200 Subject: [PATCH] radv: Remove primitive reset index from late scissor workaround. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Primitive reset has a corresponding dirty state which is already included the used_states so it is not necessary to also check the primitive reset index here. Signed-off-by: Timur Kristóf Reviewed-by: Bas Nieuwenhuizen Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 563f97c1cab..3da98d7a066 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -8925,8 +8925,6 @@ static bool radv_need_late_scissor_emission(struct radv_cmd_buffer *cmd_buffer, const struct radv_draw_info *info) { - struct radv_cmd_state *state = &cmd_buffer->state; - if (cmd_buffer->state.context_roll_without_scissor_emitted || info->strmout_buffer) return true; @@ -8939,16 +8937,7 @@ radv_need_late_scissor_emission(struct radv_cmd_buffer *cmd_buffer, used_states &= ~(RADV_CMD_DIRTY_INDEX_BUFFER | RADV_CMD_DIRTY_VERTEX_BUFFER | RADV_CMD_DIRTY_DYNAMIC_VERTEX_INPUT | RADV_CMD_DIRTY_STREAMOUT_BUFFER); - if (cmd_buffer->state.dirty & used_states) - return true; - - uint32_t primitive_reset_index = radv_get_primitive_reset_index(cmd_buffer); - - if (info->indexed && state->dynamic.vk.ia.primitive_restart_enable && - primitive_reset_index != state->last_primitive_reset_index) - return true; - - return false; + return cmd_buffer->state.dirty & used_states; } ALWAYS_INLINE static uint32_t