mtypes.h: Modify gl_geom_result to refer to new gl_varying_slot enum.

This paves the way for eliminating the gl_geom_result enum entirely.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index c01d584e2ab0e7ce586e784d35cf4f7f85dbf851..d760d2130470ef1fb78c6e7bb8cfa3844c5b039e 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -290,27 +290,26 @@ typedef enum
  */
 typedef enum
 {
-   GEOM_RESULT_POS  = 0,
-   GEOM_RESULT_COL0  = 1,
-   GEOM_RESULT_COL1  = 2,
-   GEOM_RESULT_SCOL0 = 3,
-   GEOM_RESULT_SCOL1 = 4,
-   GEOM_RESULT_FOGC = 5,
-   GEOM_RESULT_TEX0 = 6,
-   GEOM_RESULT_TEX1 = 7,
-   GEOM_RESULT_TEX2 = 8,
-   GEOM_RESULT_TEX3 = 9,
-   GEOM_RESULT_TEX4 = 10,
-   GEOM_RESULT_TEX5 = 11,
-   GEOM_RESULT_TEX6 = 12,
-   GEOM_RESULT_TEX7 = 13,
-   GEOM_RESULT_PSIZ = 14,
-   GEOM_RESULT_CLPV = 15,
-   GEOM_RESULT_PRID = 16,
-   GEOM_RESULT_LAYR = 17,
-   GEOM_RESULT_VAR0 = 18,  /**< shader varying, should really be 16 */
-   /* ### we need to -2 because var0 is 18 instead 16 like in the others */
-   GEOM_RESULT_MAX  =  (GEOM_RESULT_VAR0 + MAX_VARYING - 2)
+   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;