From 768cd5715def2ee69b5084e9da83fcbe3228cdaa Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Tue, 10 May 2022 13:44:05 +0900 Subject: [PATCH] radv: Fix vkCmdCopyQueryResults -> vkCmdResetPool hazard. The Vulkan specification states: > Query commands, for the same query and submitted to the same queue, > execute in their entirety in submission order, relative to each other. In > effect there is an implicit execution dependency from each such query > command to all query commands previously submitted to the same queue. Fixes dEQP-VK.query_pool.statistics_query.reset_after_copy.* Reviewed-by: Samuel Pitoiset Cc: mesa-stable Part-of: --- src/amd/vulkan/radv_query.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index d897e8103a5..c38385a23f5 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -1046,6 +1046,13 @@ radv_query_shader(struct radv_cmd_buffer *cmd_buffer, VkPipeline *pipeline, radv_unaligned_dispatch(cmd_buffer, count, 1, 1); + /* Ensure that the query copy dispatch is complete before a potential vkCmdResetPool because + * there is an implicit execution dependency from each such query command to all query commands + * previously submitted to the same queue. + */ + cmd_buffer->active_query_flush_bits |= + RADV_CMD_FLAG_CS_PARTIAL_FLUSH | RADV_CMD_FLAG_INV_L2 | RADV_CMD_FLAG_INV_VCACHE; + /* Restore conditional rendering. */ cmd_buffer->state.predicating = old_predicating;