From 485b520cf29818768a755077adecdeee734e32b4 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 10 Jul 2025 13:50:35 -0400 Subject: [PATCH] zink: fix qbo sync this shouldn't be using bespoke handling to avoid sync Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13434 cc: mesa-stable Part-of: --- src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt | 4 ---- src/gallium/drivers/zink/zink_query.c | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt index 20788be04aa..80d8884c33a 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt @@ -595,10 +595,6 @@ spec@ext_texture_array@copyteximage 1d_array samples=4,Fail spec@ext_texture_array@copyteximage 1d_array samples=6,Fail spec@ext_texture_array@copyteximage 1d_array samples=8,Fail -# https://gitlab.freedesktop.org/mesa/mesa/-/issues/13434 -spec@arb_indirect_parameters@conditional-render,Fail -spec@arb_indirect_parameters@conditional-render@Query result: Pass. Inverted mode: Yes. Points drawn: 4,Fail - # This is a piglit bug: The tests use more GS input components than GL reports. # This started to fail (correctly) when the GLSL linker started checking whether # the max GS input component limit is exceeded. diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c index 00c54da8f62..7938a21552d 100644 --- a/src/gallium/drivers/zink/zink_query.c +++ b/src/gallium/drivers/zink/zink_query.c @@ -774,11 +774,10 @@ copy_pool_results_to_buffer(struct zink_context *ctx, struct zink_query *query, zink_batch_no_rp(ctx); /* if it's a single query that doesn't need special handling, we can copy it and be done */ zink_batch_reference_resource_rw(ctx, res, true); - res->obj->access = VK_ACCESS_TRANSFER_WRITE_BIT; - res->obj->access_stage = VK_PIPELINE_STAGE_TRANSFER_BIT; + res->obj->unordered_read = res->obj->unordered_write = false; + zink_resource_buffer_transfer_dst_barrier(ctx, res, offset, result_size); util_range_add(&res->base.b, &res->valid_buffer_range, offset, offset + result_size); assert(query_id < NUM_QUERIES); - res->obj->unordered_read = res->obj->unordered_write = false; ctx->bs->has_work = true; VKCTX(CmdCopyQueryPoolResults)(ctx->bs->cmdbuf, pool, query_id, num_results, res->obj->buffer, offset, base_result_size, flags);