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

radeonsi: rename num_active_shader_queries -> streamout.num_ngg_queries

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37849>
This commit is contained in:
Marek Olšák 2025-10-12 22:42:59 -04:00 • committed by Marge Bot
parent cec9402542
commit d9408eec59
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/radeonsi/gfx11_query.c
View file

@ -101,7 +101,7 @@ static bool gfx11_alloc_query_buffer(struct si_context *sctx)
list_addtail(&qbuf->list, &sctx->shader_query_buffers);
qbuf->head = 0;
qbuf->refcount = sctx->num_active_shader_queries;
qbuf->refcount = sctx->streamout.num_ngg_queries;
success:;
struct pipe_shader_buffer sbuf;
@ -135,7 +135,7 @@ static bool gfx11_sh_query_begin(struct si_context *sctx, struct si_query *rquer
query->first = list_last_entry(&sctx->shader_query_buffers, struct gfx11_sh_query_buffer, list);
query->first_begin = query->first->head;
sctx->num_active_shader_queries++;
sctx->streamout.num_ngg_queries++;
query->first->refcount++;
return true;
@ -161,9 +161,9 @@ static bool gfx11_sh_query_end(struct si_context *sctx, struct si_query *rquery)
0xffffffff, PIPE_QUERY_GPU_FINISHED);
}
sctx->num_active_shader_queries--;
sctx->streamout.num_ngg_queries--;
if (sctx->num_active_shader_queries <= 0 || !si_is_atom_dirty(sctx, &sctx->atoms.s.shader_query)) {
if (sctx->streamout.num_ngg_queries <= 0 || !si_is_atom_dirty(sctx, &sctx->atoms.s.shader_query)) {
si_set_internal_shader_buffer(sctx, SI_GS_QUERY_BUF, NULL);
SET_FIELD(sctx->current_gs_state, GS_STATE_STREAMOUT_QUERY_ENABLED, 0);

2
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -838,6 +838,7 @@ struct si_streamout {
bool streamout_enabled;
bool prims_gen_query_enabled;
int num_prims_gen_queries;
int num_ngg_queries;
};
/* A shader state consists of the shader selector, which is a constant state
@ -1346,7 +1347,6 @@ struct si_context {
/* Shader-based queries. */
struct list_head shader_query_buffers;
unsigned num_active_shader_queries;
struct {
bool with_cb;