From b78cf192f04895e57dd3fa3b6168a5a381c834d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Tue, 16 May 2023 13:12:00 +0200 Subject: [PATCH] radv: Clear query dirty flags when flushing them. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is just to make their code consistent with other similar functions. Signed-off-by: Timur Kristóf Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 652c8c71798..d189d8d437d 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -3749,6 +3749,8 @@ radv_flush_occlusion_query_state(struct radv_cmd_buffer *cmd_buffer) cmd_buffer->state.last_db_count_control = db_count_control; } + + cmd_buffer->state.dirty &= ~RADV_CMD_DIRTY_OCCLUSION_QUERY; } unsigned @@ -5274,6 +5276,8 @@ radv_flush_ngg_query_state(struct radv_cmd_buffer *cmd_buffer) enum radv_ngg_query_state ngg_query_state = radv_ngg_query_none; uint32_t base_reg; + cmd_buffer->state.dirty &= ~RADV_CMD_DIRTY_NGG_QUERY; + if (loc->sgpr_idx == -1) return; @@ -9088,15 +9092,11 @@ radv_emit_all_graphics_states(struct radv_cmd_buffer *cmd_buffer, const struct r if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_RBPLUS) radv_emit_rbplus_state(cmd_buffer); - if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_NGG_QUERY) { - cmd_buffer->state.dirty &= ~RADV_CMD_DIRTY_NGG_QUERY; + if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_NGG_QUERY) radv_flush_ngg_query_state(cmd_buffer); - } - if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_OCCLUSION_QUERY) { + if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_OCCLUSION_QUERY) radv_flush_occlusion_query_state(cmd_buffer); - cmd_buffer->state.dirty &= ~RADV_CMD_DIRTY_OCCLUSION_QUERY; - } if ((cmd_buffer->state.dirty & (RADV_CMD_DIRTY_PIPELINE | RADV_CMD_DIRTY_DYNAMIC_CULL_MODE |