diff options
author | Paul Berry <[email protected]> | 2013-02-23 07:49:04 -0800 |
---|---|---|
committer | Paul Berry <[email protected]> | 2013-03-15 09:25:36 -0700 |
commit | a6d807c86f9972335048ad21c33277385eec08e8 (patch) | |
tree | 08d8048c31bb7d2db62220dab1ff513983bc5f6a /src/mesa/main | |
parent | d453225efcfe9d8854e5dd58e4feb7cd753248b9 (diff) |
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]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/context.c | 2 | ||||
-rw-r--r-- | src/mesa/main/mtypes.h | 28 |
2 files changed, 0 insertions, 30 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. |