Get rid of TGSI_SEMANTIC_TEXCOORD and just use TGSI_SEMANTIC_GENERIC.

6 files changed, 10 insertions, 14 deletions

diff --git a/src/mesa/pipe/i915simple/i915_fpc_translate.c b/src/mesa/pipe/i915simple/i915_fpc_translate.c
index f8266f6adb..24f21f6633 100644
--- a/src/mesa/pipe/i915simple/i915_fpc_translate.c
+++ b/src/mesa/pipe/i915simple/i915_fpc_translate.c
@@ -178,7 +178,8 @@ src_vector(struct i915_fp_compile *p,
          src = i915_emit_decl(p, REG_TYPE_T, T_FOG_W, D0_CHANNEL_W);
          src = swizzle(src, W, W, W, W);
          break;
-      case TGSI_SEMANTIC_TEXCOORD:
+      case TGSI_SEMANTIC_GENERIC:
+         /* usually a texcoord */
          src = i915_emit_decl(p, REG_TYPE_T, T_TEX0 + sem_ind, D0_CHANNEL_ALL);
          break;
       default:
diff --git a/src/mesa/pipe/i915simple/i915_state_derived.c b/src/mesa/pipe/i915simple/i915_state_derived.c
index e825971199..30a11f1ef2 100644
--- a/src/mesa/pipe/i915simple/i915_state_derived.c
+++ b/src/mesa/pipe/i915simple/i915_state_derived.c
@@ -74,7 +74,8 @@ static void calculate_vertex_layout( struct i915_context *i915 )
             vinfo->hwfmt[0] |= S4_VFMT_SPEC_FOG;
          }
          break;
-      case TGSI_SEMANTIC_TEXCOORD:
+      case TGSI_SEMANTIC_GENERIC:
+         /* usually a texcoord */
          {
             const uint unit = fs->input_semantic_index[i];
             uint hwtc;
diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c
index 66e5cc48f6..0e78209e30 100644
--- a/src/mesa/pipe/softpipe/sp_state_derived.c
+++ b/src/mesa/pipe/softpipe/sp_state_derived.c
@@ -99,13 +99,8 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe )
 #endif
          softpipe->psize_slot = i;
          /*case TGSI_SEMANTIC_TEXCOORD:*/
-      case TGSI_SEMANTIC_TEXCOORD:
-         /* unit = fs->input_semantic_index[i] */
-         draw_emit_vertex_attr(vinfo,
-                               FORMAT_4F, INTERP_PERSPECTIVE);
-         softpipe->need_w = TRUE;
-         break;
       case TGSI_SEMANTIC_GENERIC:
+         /* this includes texcoords and varying vars */
          draw_emit_vertex_attr(vinfo, FORMAT_4F, INTERP_PERSPECTIVE);
          softpipe->need_w = TRUE;
          break;
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_token.h b/src/mesa/pipe/tgsi/exec/tgsi_token.h
index 2d468b801e..e6f884c5cf 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_token.h
+++ b/src/mesa/pipe/tgsi/exec/tgsi_token.h
@@ -107,9 +107,8 @@ struct tgsi_declaration_interpolation
 #define TGSI_SEMANTIC_COLOR    1
 #define TGSI_SEMANTIC_BCOLOR   2 /**< back-face color */
 #define TGSI_SEMANTIC_FOG      3
-#define TGSI_SEMANTIC_TEXCOORD 4
-#define TGSI_SEMANTIC_GENERIC  5
-#define TGSI_SEMANTIC_COUNT    6 /**< number of semantic values */
+#define TGSI_SEMANTIC_GENERIC  4
+#define TGSI_SEMANTIC_COUNT    5 /**< number of semantic values */
 
 struct tgsi_declaration_semantic
 {
diff --git a/src/mesa/state_tracker/st_atom_fs.c b/src/mesa/state_tracker/st_atom_fs.c
index dd9d2476ba..20042fc6dc 100644
--- a/src/mesa/state_tracker/st_atom_fs.c
+++ b/src/mesa/state_tracker/st_atom_fs.c
@@ -102,7 +102,7 @@ st_translate_fragment_shader(struct st_context *st,
          case FRAG_ATTRIB_TEX5:
          case FRAG_ATTRIB_TEX6:
          case FRAG_ATTRIB_TEX7:
-            fs.input_semantic_name[fs.num_inputs] = TGSI_SEMANTIC_TEXCOORD;
+            fs.input_semantic_name[fs.num_inputs] = TGSI_SEMANTIC_GENERIC;
             fs.input_semantic_index[fs.num_inputs] = attr - FRAG_ATTRIB_TEX0;
             interpMode[fs.num_inputs] = TGSI_INTERPOLATE_PERSPECTIVE;
             break;
diff --git a/src/mesa/state_tracker/st_atom_vs.c b/src/mesa/state_tracker/st_atom_vs.c
index 2add3dcfef..ef3ed802d7 100644
--- a/src/mesa/state_tracker/st_atom_vs.c
+++ b/src/mesa/state_tracker/st_atom_vs.c
@@ -99,7 +99,7 @@ st_translate_vertex_shader(struct st_context *st,
          case VERT_ATTRIB_TEX5:
          case VERT_ATTRIB_TEX6:
          case VERT_ATTRIB_TEX7:
-            vs.input_semantic_name[vs.num_inputs] = TGSI_SEMANTIC_TEXCOORD;
+            vs.input_semantic_name[vs.num_inputs] = TGSI_SEMANTIC_GENERIC;
             vs.input_semantic_index[vs.num_inputs] = attr - VERT_ATTRIB_TEX0;
             break;
          case VERT_ATTRIB_GENERIC0:
@@ -164,7 +164,7 @@ st_translate_vertex_shader(struct st_context *st,
          case VERT_RESULT_TEX5:
          case VERT_RESULT_TEX6:
          case VERT_RESULT_TEX7:
-            vs.output_semantic_name[vs.num_outputs] = TGSI_SEMANTIC_TEXCOORD;
+            vs.output_semantic_name[vs.num_outputs] = TGSI_SEMANTIC_GENERIC;
             vs.output_semantic_index[vs.num_outputs] = attr - VERT_RESULT_TEX0;
             break;
          case VERT_RESULT_VAR0: