Mesa (master): radeonsi: remove TGSI from comments

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 7f4a54d5bd132dc276ff454f37b1359e91e9942a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f4a54d5bd132dc276ff454f37b1359e91e9942a

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Jan 10 16:57:17 2020 -0500

radeonsi: remove TGSI from comments

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/gallium/drivers/radeonsi/si_pipe.h        |  2 +-
 src/gallium/drivers/radeonsi/si_shader.c      | 10 ++++------
 src/gallium/drivers/radeonsi/si_shader.h      |  6 +++---
 src/gallium/drivers/radeonsi/si_shader_llvm.c |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 9f574368b01..1acb6302c27 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -586,7 +586,7 @@ struct si_screen {
 	 *
 	 * Design & limitations:
 	 * - The shader cache is per screen (= per process), never saved to
-	 *   disk, and skips redundant shader compilations from TGSI to bytecode.
+	 *   disk, and skips redundant shader compilations from NIR to bytecode.
 	 * - It can only be used with one-variant-per-shader support, in which
 	 *   case only the main (typically middle) part of shaders is cached.
 	 * - Only VS, TCS, TES, PS are cached, out of which only the hw VS
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 66065d41620..cfeab51d129 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -687,7 +687,6 @@ static LLVMValueRef get_tcs_tes_buffer_address(struct si_shader_context *ctx,
 	return base_addr;
 }
 
-/* This is a generic helper that can be shared by the NIR and TGSI backends */
 static LLVMValueRef get_tcs_tes_buffer_address_from_generic_indices(
 					struct si_shader_context *ctx,
 					LLVMValueRef vertex_index,
@@ -969,8 +968,7 @@ LLVMValueRef si_nir_load_input_tes(struct ac_shader_abi *abi,
 
 	/* TODO: This will generate rather ordinary llvm code, although it
 	 * should be easy for the optimiser to fix up. In future we might want
-	 * to refactor buffer_load(), but for now this maximises code sharing
-	 * between the NIR and TGSI backends.
+	 * to refactor buffer_load().
 	 */
 	LLVMValueRef value[4];
 	for (unsigned i = 0; i < num_components; i++) {
@@ -2410,7 +2408,7 @@ static void si_write_tess_factors(struct si_shader_context *ctx,
 
 	if (shader->key.part.tcs.epilog.prim_mode == PIPE_PRIM_LINES) {
 		/* For isolines, the hardware expects tess factors in the
-		 * reverse order from what GLSL / TGSI specify.
+		 * reverse order from what NIR specifies.
 		 */
 		LLVMValueRef tmp = out[0];
 		out[0] = out[1];
@@ -5759,7 +5757,7 @@ int si_compile_shader(struct si_screen *sscreen,
 	struct nir_shader *nir = get_nir_shader(sel, &free_nir);
 	int r = -1;
 
-	/* Dump TGSI code before doing TGSI->LLVM conversion in case the
+	/* Dump NIR before doing NIR->LLVM conversion in case the
 	 * conversion fails. */
 	if (si_can_dump_shader(sscreen, sel->type) &&
 	    !(sscreen->debug_flags & DBG(NO_NIR))) {
@@ -7103,7 +7101,7 @@ bool si_shader_create(struct si_screen *sscreen, struct ac_llvm_compiler *compil
 		if (!mainp)
 			return false;
 
-		/* Copy the compiled TGSI shader data over. */
+		/* Copy the compiled shader data over. */
 		shader->is_binary_shared = true;
 		shader->binary = mainp->binary;
 		shader->config = mainp->config;
diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
index 36c6218151c..ced395411c0 100644
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -308,7 +308,7 @@ struct si_compiler_ctx_state {
 };
 
 /* A shader selector is a gallium CSO and contains shader variants and
- * binaries for one TGSI program. This can be shared by multiple contexts.
+ * binaries for one NIR program. This can be shared by multiple contexts.
  */
 struct si_shader_selector {
 	struct pipe_reference	reference;
@@ -320,8 +320,8 @@ struct si_shader_selector {
 	struct si_shader	*first_variant; /* immutable after the first variant */
 	struct si_shader	*last_variant; /* mutable */
 
-	/* The compiled TGSI shader expecting a prolog and/or epilog (not
-	 * uploaded to a buffer).
+	/* The compiled NIR shader without a prolog and/or epilog (not
+	 * uploaded to a buffer object).
 	 */
 	struct si_shader	*main_shader_part;
 	struct si_shader	*main_shader_part_ls; /* as_ls is set in the key */
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm.c b/src/gallium/drivers/radeonsi/si_shader_llvm.c
index 64ceaf7ed34..df33d34076e 100644
--- a/src/gallium/drivers/radeonsi/si_shader_llvm.c
+++ b/src/gallium/drivers/radeonsi/si_shader_llvm.c
@@ -149,7 +149,7 @@ void si_llvm_context_init(struct si_shader_context *ctx,
 	ctx->i1true = LLVMConstInt(ctx->i1, 1, 0);
 }
 
-/* Set the context to a certain TGSI shader. Can be called repeatedly
+/* Set the context to a certain shader. Can be called repeatedly
  * to change the shader. */
 void si_llvm_context_set_ir(struct si_shader_context *ctx,
 			    struct si_shader *shader)