From 5bb9c1cca94f4aa47e669c769c08af4aabf31e71 Mon Sep 17 00:00:00 2001 From: Rohan Garg Date: Wed, 10 Jul 2024 11:43:49 +0200 Subject: [PATCH] anv: reuse existing macro to query for flushes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rohan Garg Reviewed-by: José Roberto de Souza Part-of: --- src/intel/vulkan/genX_query.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/src/intel/vulkan/genX_query.c b/src/intel/vulkan/genX_query.c index 8c293f47ee4..39b3a284b01 100644 --- a/src/intel/vulkan/genX_query.c +++ b/src/intel/vulkan/genX_query.c @@ -1604,28 +1604,12 @@ copy_query_results_with_cs(struct anv_cmd_buffer *cmd_buffer, * to ensure proper ordering of the commands from the 3d pipe and the * command streamer. */ - if ((cmd_buffer->state.queries.buffer_write_bits | - cmd_buffer->state.queries.clear_bits) & - ANV_QUERY_WRITES_RT_FLUSH) - needed_flushes |= ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT; - if ((cmd_buffer->state.queries.buffer_write_bits | - cmd_buffer->state.queries.clear_bits) & - ANV_QUERY_WRITES_TILE_FLUSH) - needed_flushes |= ANV_PIPE_TILE_CACHE_FLUSH_BIT; + const enum anv_query_bits query_bits = + cmd_buffer->state.queries.buffer_write_bits | + cmd_buffer->state.queries.clear_bits; - if ((cmd_buffer->state.queries.buffer_write_bits | - cmd_buffer->state.queries.clear_bits) & - ANV_QUERY_WRITES_DATA_FLUSH) { - needed_flushes |= (ANV_PIPE_DATA_CACHE_FLUSH_BIT | - ANV_PIPE_HDC_PIPELINE_FLUSH_BIT | - ANV_PIPE_UNTYPED_DATAPORT_CACHE_FLUSH_BIT); - } - - if ((cmd_buffer->state.queries.buffer_write_bits | - cmd_buffer->state.queries.clear_bits) & - ANV_QUERY_WRITES_CS_STALL) - needed_flushes |= ANV_PIPE_CS_STALL_BIT; + needed_flushes |= ANV_PIPE_QUERY_BITS(query_bits); /* Occlusion & timestamp queries are written using a PIPE_CONTROL and * because we're about to copy values from MI commands, we need to stall