From 094bcf399c9630707c92ccd8f78e2ade29323a4d Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Sat, 23 Feb 2013 07:31:33 -0800 Subject: [PATCH] mtypes.h: Modify gl_geom_attrib to refer to new gl_varying_slot enum. This paves the way for eliminating the gl_geom_attrib enum entirely. Reviewed-by: Kenneth Graunke Reviewed-by: Eric Anholt Tested-by: Brian Paul --- src/mesa/main/mtypes.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 1e62e19d69d..b39c9c51437 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -290,19 +290,19 @@ typedef enum */ typedef enum { - GEOM_ATTRIB_POSITION = 0, - GEOM_ATTRIB_COLOR0 = 1, - GEOM_ATTRIB_COLOR1 = 2, - GEOM_ATTRIB_SECONDARY_COLOR0 = 3, - GEOM_ATTRIB_SECONDARY_COLOR1 = 4, - GEOM_ATTRIB_FOG_FRAG_COORD = 5, - GEOM_ATTRIB_POINT_SIZE = 6, - GEOM_ATTRIB_CLIP_VERTEX = 7, - GEOM_ATTRIB_PRIMITIVE_ID = 8, - GEOM_ATTRIB_TEX_COORD = 9, - - GEOM_ATTRIB_VAR0 = 16, - GEOM_ATTRIB_MAX = (GEOM_ATTRIB_VAR0 + MAX_VARYING) + GEOM_ATTRIB_POSITION = VARYING_SLOT_POS, + GEOM_ATTRIB_COLOR0 = VARYING_SLOT_COL0, + GEOM_ATTRIB_COLOR1 = VARYING_SLOT_COL1, + GEOM_ATTRIB_SECONDARY_COLOR0 = VARYING_SLOT_BFC0, + GEOM_ATTRIB_SECONDARY_COLOR1 = VARYING_SLOT_BFC1, + GEOM_ATTRIB_FOG_FRAG_COORD = VARYING_SLOT_FOGC, + GEOM_ATTRIB_POINT_SIZE = VARYING_SLOT_PNTC, + GEOM_ATTRIB_CLIP_VERTEX = VARYING_SLOT_CLIP_VERTEX, + GEOM_ATTRIB_PRIMITIVE_ID = VARYING_SLOT_PRIMITIVE_ID, + GEOM_ATTRIB_TEX_COORD = VARYING_SLOT_TEX0, + + GEOM_ATTRIB_VAR0 = VARYING_SLOT_VAR0, + GEOM_ATTRIB_MAX = VARYING_SLOT_MAX } gl_geom_attrib; /** -- 2.30.2