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 si_get_strmout_en -> si_get_streamout_enable_state

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:33:28 -04:00 • committed by Marge Bot
parent fb4010e641
commit cec9402542
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1894,7 +1894,7 @@ static inline struct si_shader_ctx_state *si_get_vs(struct si_context *sctx)
return &sctx->ms_shader_state;
}
static inline bool si_get_strmout_en(struct si_context *sctx)
static inline bool si_get_streamout_enable_state(struct si_context *sctx)
{
return sctx->streamout.streamout_enabled || sctx->streamout.prims_gen_query_enabled;
}

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

@ -2458,7 +2458,7 @@ static void si_draw(struct pipe_context *ctx,
* It must be done after drawing. */
if (((GFX_VERSION == GFX7 && sctx->family == CHIP_HAWAII) ||
(GFX_VERSION == GFX8 && (sctx->family == CHIP_TONGA || sctx->family == CHIP_FIJI))) &&
si_get_strmout_en(sctx)) {
si_get_streamout_enable_state(sctx)) {
radeon_begin(&sctx->gfx_cs);
radeon_event_write(V_028A90_VGT_STREAMOUT_SYNC);
radeon_end();

16
src/gallium/drivers/radeonsi/si_state_streamout.c
View file

@ -423,11 +423,11 @@ static void si_emit_streamout_enable(struct si_context *sctx, unsigned index)
radeon_begin(&sctx->gfx_cs);
radeon_set_context_reg_seq(R_028B94_VGT_STRMOUT_CONFIG, 2);
radeon_emit(S_028B94_STREAMOUT_0_EN(si_get_strmout_en(sctx)) |
radeon_emit(S_028B94_STREAMOUT_0_EN(si_get_streamout_enable_state(sctx)) |
S_028B94_RAST_STREAM(0) |
S_028B94_STREAMOUT_1_EN(si_get_strmout_en(sctx)) |
S_028B94_STREAMOUT_2_EN(si_get_strmout_en(sctx)) |
S_028B94_STREAMOUT_3_EN(si_get_strmout_en(sctx)));
S_028B94_STREAMOUT_1_EN(si_get_streamout_enable_state(sctx)) |
S_028B94_STREAMOUT_2_EN(si_get_streamout_enable_state(sctx)) |
S_028B94_STREAMOUT_3_EN(si_get_streamout_enable_state(sctx)));
radeon_emit(sctx->streamout.hw_enabled_mask & sctx->streamout.enabled_stream_buffers_mask);
radeon_end();
}
@ -437,7 +437,7 @@ static void si_set_streamout_enable(struct si_context *sctx, bool enable)
if (sctx->gfx_level >= GFX11)
return;
bool old_strmout_en = si_get_strmout_en(sctx);
bool old_strmout_en = si_get_streamout_enable_state(sctx);
unsigned old_hw_enabled_mask = sctx->streamout.hw_enabled_mask;
sctx->streamout.streamout_enabled = enable;
@ -446,7 +446,7 @@ static void si_set_streamout_enable(struct si_context *sctx, bool enable)
sctx->streamout.enabled_mask | (sctx->streamout.enabled_mask << 4) |
(sctx->streamout.enabled_mask << 8) | (sctx->streamout.enabled_mask << 12);
if ((old_strmout_en != si_get_strmout_en(sctx)) ||
if ((old_strmout_en != si_get_streamout_enable_state(sctx)) ||
(old_hw_enabled_mask != sctx->streamout.hw_enabled_mask))
si_mark_atom_dirty(sctx, &sctx->atoms.s.streamout_enable);
}
@ -454,14 +454,14 @@ static void si_set_streamout_enable(struct si_context *sctx, bool enable)
void si_update_prims_generated_query_state(struct si_context *sctx, unsigned type, int diff)
{
if (sctx->gfx_level < GFX11 && type == PIPE_QUERY_PRIMITIVES_GENERATED) {
bool old_strmout_en = si_get_strmout_en(sctx);
bool old_strmout_en = si_get_streamout_enable_state(sctx);
sctx->streamout.num_prims_gen_queries += diff;
assert(sctx->streamout.num_prims_gen_queries >= 0);
sctx->streamout.prims_gen_query_enabled = sctx->streamout.num_prims_gen_queries != 0;
if (old_strmout_en != si_get_strmout_en(sctx))
if (old_strmout_en != si_get_streamout_enable_state(sctx))
si_mark_atom_dirty(sctx, &sctx->atoms.s.streamout_enable);
if (si_update_ngg(sctx)) {