From 2b7906ea74b1cda9e777ee6e637b45b2d555f603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 5 May 2022 21:07:12 -0400 Subject: [PATCH] radeonsi: get rid of the ambiguous "prologue" word It has nothing to do with our "prolog" shader parts. Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/gfx10_shader_ngg.c | 2 +- src/gallium/drivers/radeonsi/si_shader_internal.h | 2 +- src/gallium/drivers/radeonsi/si_shader_llvm.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c index 5db01034852..1f0bfce52f8 100644 --- a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c +++ b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c @@ -1835,7 +1835,7 @@ void gfx10_ngg_gs_emit_vertex(struct si_shader_context *ctx, unsigned stream, LL ac_build_endif(&ctx->ac, 9001); } -void gfx10_ngg_gs_emit_prologue(struct si_shader_context *ctx) +void gfx10_ngg_gs_emit_begin(struct si_shader_context *ctx) { /* Zero out the part of LDS scratch that is used to accumulate the * per-stream generated primitive count. diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/si_shader_internal.h index 46a9f1f4cf0..1e1f1b52f93 100644 --- a/src/gallium/drivers/radeonsi/si_shader_internal.h +++ b/src/gallium/drivers/radeonsi/si_shader_internal.h @@ -193,7 +193,7 @@ void gfx10_ngg_build_export_prim(struct si_shader_context *ctx, LLVMValueRef use void gfx10_ngg_culling_build_end(struct si_shader_context *ctx); void gfx10_ngg_build_end(struct si_shader_context *ctx); void gfx10_ngg_gs_emit_vertex(struct si_shader_context *ctx, unsigned stream, LLVMValueRef *addrs); -void gfx10_ngg_gs_emit_prologue(struct si_shader_context *ctx); +void gfx10_ngg_gs_emit_begin(struct si_shader_context *ctx); void gfx10_ngg_gs_build_end(struct si_shader_context *ctx); unsigned gfx10_ngg_get_scratch_dw_size(struct si_shader *shader); bool gfx10_ngg_calculate_subgroup_info(struct si_shader *shader); diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm.c b/src/gallium/drivers/radeonsi/si_shader_llvm.c index 7f8da2c836a..700fb141e25 100644 --- a/src/gallium/drivers/radeonsi/si_shader_llvm.c +++ b/src/gallium/drivers/radeonsi/si_shader_llvm.c @@ -870,7 +870,7 @@ bool si_llvm_translate_nir(struct si_shader_context *ctx, struct si_shader *shad /* NGG GS: Initialize LDS and insert s_barrier, which must not be inside the if statement. */ if (ctx->stage == MESA_SHADER_GEOMETRY && shader->key.ge.as_ngg) - gfx10_ngg_gs_emit_prologue(ctx); + gfx10_ngg_gs_emit_begin(ctx); if (ctx->stage == MESA_SHADER_GEOMETRY || (ctx->stage == MESA_SHADER_TESS_CTRL && !shader->is_monolithic)) { @@ -928,7 +928,7 @@ bool si_llvm_translate_nir(struct si_shader_context *ctx, struct si_shader *shad ac_build_s_barrier(&ctx->ac, ctx->stage); } } else if (ctx->stage == MESA_SHADER_GEOMETRY && !shader->key.ge.as_ngg) { - /* gfx10_ngg_gs_emit_prologue inserts the barrier for NGG. */ + /* gfx10_ngg_gs_emit_begin inserts the barrier for NGG. */ ac_build_waitcnt(&ctx->ac, AC_WAIT_LGKM); ac_build_s_barrier(&ctx->ac, ctx->stage); }