fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 02:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

zink: fix qbo sync

Browse source 
this shouldn't be using bespoke handling to avoid sync

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13434

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36057>
This commit is contained in:
Mike Blumenkrantz 2025-07-10 13:50:35 -04:00 • committed by Marge Bot
parent d6e89787ed
commit 485b520cf2
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt
View file

@ -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.

5
src/gallium/drivers/zink/zink_query.c
View file

@ -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);