From 174f3a4ab7ca331ac10e10938d958a84acd68dde Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 6 Feb 2018 22:16:41 -0700 Subject: [PATCH] st/mesa: use tgsi_semantic enum type Reviewed-by: Roland Scheidegger --- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 10 ++++++---- src/mesa/state_tracker/st_glsl_to_tgsi.h | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 5e1674c9159..39a81fad628 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -5456,7 +5456,7 @@ struct st_translate { }; /** Map Mesa's SYSTEM_VALUE_x to TGSI_SEMANTIC_x */ -unsigned +enum tgsi_semantic _mesa_sysval_to_semantic(unsigned sysval) { switch (sysval) { @@ -6379,7 +6379,8 @@ st_translate_program( } src = ureg_DECL_fs_input_cyl_centroid_layout(ureg, - inputSemanticName[slot], inputSemanticIndex[slot], + (enum tgsi_semantic) inputSemanticName[slot], + inputSemanticIndex[slot], interp_mode, 0, interp_location, slot, tgsi_usage_mask, decl->array_id, decl->size); @@ -6433,7 +6434,8 @@ st_translate_program( } dst = ureg_DECL_output_layout(ureg, - outputSemanticName[slot], outputSemanticIndex[slot], + (enum tgsi_semantic) outputSemanticName[slot], + outputSemanticIndex[slot], decl->gs_out_streams, slot, tgsi_usage_mask, decl->array_id, decl->size); @@ -6535,7 +6537,7 @@ st_translate_program( for (i = 0; sysInputs; i++) { if (sysInputs & (1 << i)) { - unsigned semName = _mesa_sysval_to_semantic(i); + enum tgsi_semantic semName = _mesa_sysval_to_semantic(i); t->systemValues[i] = ureg_DECL_system_value(ureg, semName, 0); diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.h b/src/mesa/state_tracker/st_glsl_to_tgsi.h index 37dfdb3c140..f38d41d6c76 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.h +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.h @@ -23,6 +23,7 @@ */ #include "pipe/p_defines.h" +#include "pipe/p_shader_tokens.h" #include "main/mtypes.h" #ifdef __cplusplus @@ -66,7 +67,7 @@ st_translate_stream_output_info2(struct gl_transform_feedback_info *info, const ubyte outputMapping[], struct pipe_stream_output_info *so); -unsigned +enum tgsi_semantic _mesa_sysval_to_semantic(unsigned sysval); #ifdef __cplusplus -- 2.30.2