Replace gl_geom_result enum with gl_varying_slot.

This patch makes the following search-and-replace changes:

gl_geom_result -> gl_varying_slot
GEOM_RESULT_* -> VARYING_SLOT_*

Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Tested-by: Brian Paul <[email protected]>

6 files changed, 22 insertions, 52 deletions

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index a0d34dc9c69..40950ccc63a 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -349,7 +349,6 @@ dummy_enum_func(void)
    gl_texture_index ti = TEXTURE_2D_ARRAY_INDEX;
    gl_vert_attrib va = VERT_ATTRIB_POS;
    gl_varying_slot vs = VARYING_SLOT_POS;
-   gl_geom_result gr = GEOM_RESULT_POS;
 
    (void) bi;
    (void) fi;
@@ -358,7 +357,6 @@ dummy_enum_func(void)
    (void) ti;
    (void) va;
    (void) vs;
-   (void) gr;
 }
 
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index d760d213047..d88d3d355a9 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -286,34 +286,6 @@ typedef enum
 /*********************************************/
 
 /**
- * Indexes for geometry program result attributes
- */
-typedef enum
-{
-   GEOM_RESULT_POS  = VARYING_SLOT_POS,
-   GEOM_RESULT_COL0  = VARYING_SLOT_COL0,
-   GEOM_RESULT_COL1  = VARYING_SLOT_COL1,
-   GEOM_RESULT_SCOL0 = VARYING_SLOT_BFC0,
-   GEOM_RESULT_SCOL1 = VARYING_SLOT_BFC1,
-   GEOM_RESULT_FOGC = VARYING_SLOT_FOGC,
-   GEOM_RESULT_TEX0 = VARYING_SLOT_TEX0,
-   GEOM_RESULT_TEX1 = VARYING_SLOT_TEX1,
-   GEOM_RESULT_TEX2 = VARYING_SLOT_TEX2,
-   GEOM_RESULT_TEX3 = VARYING_SLOT_TEX3,
-   GEOM_RESULT_TEX4 = VARYING_SLOT_TEX4,
-   GEOM_RESULT_TEX5 = VARYING_SLOT_TEX5,
-   GEOM_RESULT_TEX6 = VARYING_SLOT_TEX6,
-   GEOM_RESULT_TEX7 = VARYING_SLOT_TEX7,
-   GEOM_RESULT_PSIZ = VARYING_SLOT_PSIZ,
-   GEOM_RESULT_CLPV = VARYING_SLOT_CLIP_VERTEX,
-   GEOM_RESULT_PRID = VARYING_SLOT_PRIMITIVE_ID,
-   GEOM_RESULT_LAYR = VARYING_SLOT_LAYER,
-   GEOM_RESULT_VAR0 = VARYING_SLOT_VAR0,
-   GEOM_RESULT_MAX  = VARYING_SLOT_MAX
-} gl_geom_result;
-
-
-/**
  * Indexes for fragment program input attributes.  Note that
  * _mesa_vert_result_to_frag_attrib() and frag_attrib_to_vert_result() make
  * assumptions about the layout of this enum.
diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index 5cc18d4099c..bc7ab1ef814 100644
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -951,7 +951,7 @@ _mesa_valid_register_index(const struct gl_context *ctx,
       case MESA_SHADER_FRAGMENT:
          return index < FRAG_RESULT_DATA0 + (GLint) ctx->Const.MaxDrawBuffers;
       case MESA_SHADER_GEOMETRY:
-         return index < GEOM_RESULT_VAR0 + (GLint) ctx->Const.MaxVarying;
+         return index < VARYING_SLOT_VAR0 + (GLint) ctx->Const.MaxVarying;
       default:
          return GL_FALSE;
       }
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index ebb806864dd..b4f94657ed1 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -4148,7 +4148,7 @@ dst_register(struct st_translate *t,
       else if (t->procType == TGSI_PROCESSOR_FRAGMENT)
          assert(index < FRAG_RESULT_MAX);
       else
-         assert(index < GEOM_RESULT_MAX);
+         assert(index < VARYING_SLOT_MAX);
 
       assert(t->outputMapping[index] < Elements(t->outputs));
 
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index e494f45e8f3..a874e2610e9 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -179,7 +179,7 @@ dst_register( struct st_translate *t,
       else if (t->procType == TGSI_PROCESSOR_FRAGMENT)
          assert(index < FRAG_RESULT_MAX);
       else
-         assert(index < GEOM_RESULT_MAX);
+         assert(index < VARYING_SLOT_MAX);
 
       assert(t->outputMapping[index] < Elements(t->outputs));
 
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 8bc2a12f581..6afad9b4155 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -801,7 +801,7 @@ st_translate_geometry_program(struct st_context *st,
                               const struct st_gp_variant_key *key)
 {
    GLuint inputMapping[VARYING_SLOT_MAX];
-   GLuint outputMapping[GEOM_RESULT_MAX];
+   GLuint outputMapping[VARYING_SLOT_MAX];
    struct pipe_context *pipe = st->pipe;
    GLuint attr;
    GLbitfield64 inputsRead;
@@ -912,7 +912,7 @@ st_translate_geometry_program(struct st_context *st,
     * Determine number of outputs, the (default) output register
     * mapping and the semantic information for each output.
     */
-   for (attr = 0; attr < GEOM_RESULT_MAX; attr++) {
+   for (attr = 0; attr < VARYING_SLOT_MAX; attr++) {
       if (stgp->Base.Base.OutputsWritten & BITFIELD64_BIT(attr)) {
          GLuint slot;
 
@@ -921,45 +921,45 @@ st_translate_geometry_program(struct st_context *st,
          outputMapping[attr] = slot;
 
          switch (attr) {
-         case GEOM_RESULT_POS:
+         case VARYING_SLOT_POS:
             assert(slot == 0);
             gs_output_semantic_name[slot] = TGSI_SEMANTIC_POSITION;
             gs_output_semantic_index[slot] = 0;
             break;
-         case GEOM_RESULT_COL0:
+         case VARYING_SLOT_COL0:
             gs_output_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
             gs_output_semantic_index[slot] = 0;
             break;
-         case GEOM_RESULT_COL1:
+         case VARYING_SLOT_COL1:
             gs_output_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
             gs_output_semantic_index[slot] = 1;
             break;
-         case GEOM_RESULT_SCOL0:
+         case VARYING_SLOT_BFC0:
             gs_output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR;
             gs_output_semantic_index[slot] = 0;
             break;
-         case GEOM_RESULT_SCOL1:
+         case VARYING_SLOT_BFC1:
             gs_output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR;
             gs_output_semantic_index[slot] = 1;
             break;
-         case GEOM_RESULT_FOGC:
+         case VARYING_SLOT_FOGC:
             gs_output_semantic_name[slot] = TGSI_SEMANTIC_FOG;
             gs_output_semantic_index[slot] = 0;
             break;
-         case GEOM_RESULT_PSIZ:
+         case VARYING_SLOT_PSIZ:
             gs_output_semantic_name[slot] = TGSI_SEMANTIC_PSIZE;
             gs_output_semantic_index[slot] = 0;
             break;
-         case GEOM_RESULT_TEX0:
-         case GEOM_RESULT_TEX1:
-         case GEOM_RESULT_TEX2:
-         case GEOM_RESULT_TEX3:
-         case GEOM_RESULT_TEX4:
-         case GEOM_RESULT_TEX5:
-         case GEOM_RESULT_TEX6:
-         case GEOM_RESULT_TEX7:
+         case VARYING_SLOT_TEX0:
+         case VARYING_SLOT_TEX1:
+         case VARYING_SLOT_TEX2:
+         case VARYING_SLOT_TEX3:
+         case VARYING_SLOT_TEX4:
+         case VARYING_SLOT_TEX5:
+         case VARYING_SLOT_TEX6:
+         case VARYING_SLOT_TEX7:
             /* fall-through */
-         case GEOM_RESULT_VAR0:
+         case VARYING_SLOT_VAR0:
             /* fall-through */
          default:
             assert(slot < Elements(gs_output_semantic_name));
@@ -973,7 +973,7 @@ st_translate_geometry_program(struct st_context *st,
    assert(gs_output_semantic_name[0] == TGSI_SEMANTIC_POSITION);
 
    /* find max output slot referenced to compute gs_num_outputs */
-   for (attr = 0; attr < GEOM_RESULT_MAX; attr++) {
+   for (attr = 0; attr < VARYING_SLOT_MAX; attr++) {
       if (outputMapping[attr] != ~0 && outputMapping[attr] > maxSlot)
          maxSlot = outputMapping[attr];
    }