From: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Date: Thu, 11 Feb 2021 20:30:19 +0000 (-0800)
Subject: freedreno/ir3: Use gl_varying_slot_name_for_stage()
X-Git-Tag: upstream/21.2.3~7946
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4e962cbe0ac5224dfb72c02ed3a89534cec74d5;p=platform%2Fupstream%2Fmesa.git

freedreno/ir3: Use gl_varying_slot_name_for_stage()

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8998>
---

diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c
index 4e3594b..0694bd8 100644
--- a/src/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/freedreno/ir3/ir3_compiler_nir.c
@@ -3255,7 +3255,7 @@ setup_output(struct ir3_context *ctx, nir_intrinsic_instr *intr)
 				break;
 			ir3_context_error(ctx, "unknown %s shader output name: %s\n",
 					_mesa_shader_stage_to_string(ctx->so->type),
-					gl_varying_slot_name(slot));
+					gl_varying_slot_name_for_stage(slot, ctx->so->type));
 		}
 	} else {
 		ir3_context_error(ctx, "unknown shader type: %d\n", ctx->so->type);
diff --git a/src/freedreno/ir3/ir3_shader.c b/src/freedreno/ir3/ir3_shader.c
index 835b67c..68ee2b9 100644
--- a/src/freedreno/ir3/ir3_shader.c
+++ b/src/freedreno/ir3/ir3_shader.c
@@ -590,7 +590,7 @@ input_name(struct ir3_shader_variant *so, int i)
 	} else if (so->type == MESA_SHADER_VERTEX) {
 		return gl_vert_attrib_name(so->inputs[i].slot);
 	} else {
-		return gl_varying_slot_name(so->inputs[i].slot);
+		return gl_varying_slot_name_for_stage(so->inputs[i].slot, so->type);
 	}
 }
 
@@ -608,7 +608,7 @@ output_name(struct ir3_shader_variant *so, int i)
 		case VARYING_SLOT_TCS_HEADER_IR3:
 			return "TCS_HEADER";
 		default:
-			return gl_varying_slot_name(so->outputs[i].slot);
+			return gl_varying_slot_name_for_stage(so->outputs[i].slot, so->type);
 		}
 	}
 }