Mesa (master): radv: reset pending_reset_query when flushing caches

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e8997287695119e61709daa89ded28e393ece533
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8997287695119e61709daa89ded28e393ece533

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Dec  5 11:34:39 2018 +0100

radv: reset pending_reset_query when flushing caches

If the driver used a compute shader for resetting a query pool,
it should be completed when caches are flushed.

This might reduce the number of stalls if operations are done
between vkCmdResetQueryPool() and vkCmdBeginQuery()
(or vkCmdWriteTimestamp()).

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Reviewed-by: Alex Smith <asmith at feralinteractive.com>

---

 src/amd/vulkan/radv_query.c    | 1 -
 src/amd/vulkan/si_cmd_buffer.c | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index e226bcef6a..276cc1c42d 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -1447,7 +1447,6 @@ static void emit_query_flush(struct radv_cmd_buffer *cmd_buffer,
 			 * because we use a CP dma clear.
 			 */
 			si_emit_cache_flush(cmd_buffer);
-			cmd_buffer->pending_reset_query = false;
 		}
 	}
 }
diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c
index a9f2572541..2f57584bf8 100644
--- a/src/amd/vulkan/si_cmd_buffer.c
+++ b/src/amd/vulkan/si_cmd_buffer.c
@@ -992,6 +992,11 @@ si_emit_cache_flush(struct radv_cmd_buffer *cmd_buffer)
 		radv_cmd_buffer_trace_emit(cmd_buffer);
 
 	cmd_buffer->state.flush_bits = 0;
+
+	/* If the driver used a compute shader for resetting a query pool, it
+	 * should be finished at this point.
+	 */
+	cmd_buffer->pending_reset_query = false;
 }
 
 /* sets the CP predication state using a boolean stored at va */