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

radeonsi: don't ref and unref an index buffer uploaded from a user buffer

Browse source 
This replaces u_upload_data_ref with u_upload_data.

No effect since TC ensures we don't get user buffers.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37566>
This commit is contained in:
Marek Olšák 2025-09-12 20:52:44 -04:00 • committed by Marge Bot
parent f140b96edc
commit cc29c41f06
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/drivers/radeonsi/si_state_draw.cpp
View file

@ -2077,7 +2077,7 @@ static void si_emit_all_states(struct si_context *sctx, uint64_t skip_atom_mask)
} }
#define DRAW_CLEANUP do { \ #define DRAW_CLEANUP do { \
if (index_size && indexbuf != info->index.resource) \ if (release_indexbuf) \
pipe_resource_reference(&indexbuf, NULL); \ pipe_resource_reference(&indexbuf, NULL); \
} while (0) } while (0)
@ -2171,6 +2171,7 @@ static void si_draw(struct pipe_context *ctx,
} }
struct pipe_resource *indexbuf = info->index.resource; struct pipe_resource *indexbuf = info->index.resource;
bool release_indexbuf = false;
unsigned index_size = info->index_size; unsigned index_size = info->index_size;
unsigned index_offset = indirect && indirect->buffer ? draws[0].start * index_size : 0; unsigned index_offset = indirect && indirect->buffer ? draws[0].start * index_size : 0;
@ -2189,6 +2190,7 @@ static void si_draw(struct pipe_context *ctx,
if (unlikely(!indexbuf)) if (unlikely(!indexbuf))
return; return;
release_indexbuf = true;
si_compute_shorten_ubyte_buffer(sctx, indexbuf, info->index.resource, start_offset, si_compute_shorten_ubyte_buffer(sctx, indexbuf, info->index.resource, start_offset,
index_offset + start, count, sctx->render_cond_enabled); index_offset + start, count, sctx->render_cond_enabled);
si_barrier_after_simple_buffer_op(sctx, 0, indexbuf, info->index.resource); si_barrier_after_simple_buffer_op(sctx, 0, indexbuf, info->index.resource);
@ -2201,6 +2203,7 @@ static void si_draw(struct pipe_context *ctx,
si_mark_atom_dirty(sctx, &sctx->atoms.s.barrier); si_mark_atom_dirty(sctx, &sctx->atoms.s.barrier);
si_resource(indexbuf)->L2_cache_dirty = false; si_resource(indexbuf)->L2_cache_dirty = false;
} else if (!IS_DRAW_VERTEX_STATE && info->has_user_indices) { } else if (!IS_DRAW_VERTEX_STATE && info->has_user_indices) {
struct pipe_resource *release_buf = NULL;
unsigned start_offset; unsigned start_offset;
assert(!indirect); assert(!indirect);
@ -2208,9 +2211,14 @@ static void si_draw(struct pipe_context *ctx,
start_offset = draws[0].start * index_size; start_offset = draws[0].start * index_size;
indexbuf = NULL; indexbuf = NULL;
u_upload_data_ref(ctx->stream_uploader, start_offset, draws[0].count * index_size, /* Note that stream_uploader mustn't be used by si_draw in any other place because
* the next use of stream_uploader could release indexbuf before si_draw finishes.
*/
u_upload_data(ctx->stream_uploader, start_offset, draws[0].count * index_size,
sctx->screen->info.tcc_cache_line_size, sctx->screen->info.tcc_cache_line_size,
(char *)info->index.user + start_offset, &index_offset, &indexbuf); (char *)info->index.user + start_offset, &index_offset, &indexbuf,
&release_buf);
pipe_resource_release(ctx, release_buf);
if (unlikely(!indexbuf)) if (unlikely(!indexbuf))
return; return;