NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

zink: ignore tc buffer replacement info

Browse source 
without tc tracking cross-context buffer usage, this is intensely broken

Fixes: 96cf4531e1 ("Revert "gallium/u_threaded: buffer sharedness tracking"")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26959>
This commit is contained in:
Mike Blumenkrantz 2024-01-09 15:10:51 -05:00 • committed by Marge Bot
parent 6e4d901a2e
commit 0444d057ae
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
View file

@ -692,6 +692,3 @@ KHR-GL46.sparse_texture_tests.SparseTextureCommitment,Crash
# Assertion `size % ZINK_SPARSE_BUFFER_PAGE_SIZE == 0 || offset + size == bo->base.size' failed.
spec@arb_sparse_buffer@basic,Crash
spec@arb_sparse_buffer@buffer-data,Crash
# re-enable farm mesa!26900
glx@glx-multithread-buffer,Crash

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

@ -4961,6 +4961,11 @@ zink_context_replace_buffer_storage(struct pipe_context *pctx, struct pipe_resou
zink_resource_copies_reset(d);
/* force counter buffer reset */
d->so_valid = false;
/* FIXME: tc buffer sharedness tracking */
if (!num_rebinds) {
num_rebinds = d->bind_count[0] + d->bind_count[1];
rebind_mask = 0;
}
if (num_rebinds && rebind_buffer(ctx, d, rebind_mask, num_rebinds) < num_rebinds)
ctx->buffer_rebind_counter = p_atomic_inc_return(&screen->buffer_rebind_counter);
}