diff options
| author | Brian Paul <[email protected]> | 2009-09-04 09:06:40 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-09-04 09:17:59 -0600 |
| commit | 3fedd08779c2bc4a5f02c035e7ca4cab5da649dd (patch) | |
| tree | b559cd2b06d37e18b869ffafb451867e8e7cd72a /src/mesa/shader/program_parse.tab.c | |
| parent | 40636fe6f2763e6be4141516a9eba5004b371915 (diff) | |
ARB prog: rename POINT, SIZE to POINT_TOK, SIZE_TOK
Fixes symbol collisions with typedefs in Microsoft headers.
Perhaps we should prefix/suffix all the lexer tokens to avoid this.
Diffstat (limited to 'src/mesa/shader/program_parse.tab.c')
| -rw-r--r-- | src/mesa/shader/program_parse.tab.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c index 979e574921f..4d99e45fbed 100644 --- a/src/mesa/shader/program_parse.tab.c +++ b/src/mesa/shader/program_parse.tab.c @@ -251,7 +251,7 @@ static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op, PALETTE = 309, PARAMS = 310, PLANE = 311, - POINT = 312, + POINT_TOK = 312, POINTSIZE = 313, POSITION = 314, PRIMARY = 315, @@ -263,7 +263,7 @@ static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op, SCENECOLOR = 321, SECONDARY = 322, SHININESS = 323, - SIZE = 324, + SIZE_TOK = 324, SPECULAR = 325, SPOT = 326, STATE = 327, @@ -806,9 +806,9 @@ static const char *const yytname[] = "EYE", "FOG", "FOGCOORD", "FRAGMENT", "FRONT", "HALF", "INVERSE", "INVTRANS", "LIGHT", "LIGHTMODEL", "LIGHTPROD", "LOCAL", "MATERIAL", "MAT_PROGRAM", "MATRIX", "MATRIXINDEX", "MODELVIEW", "MVP", "NORMAL", - "OBJECT", "PALETTE", "PARAMS", "PLANE", "POINT", "POINTSIZE", "POSITION", - "PRIMARY", "PROGRAM", "PROJECTION", "RANGE", "RESULT", "ROW", - "SCENECOLOR", "SECONDARY", "SHININESS", "SIZE", "SPECULAR", "SPOT", + "OBJECT", "PALETTE", "PARAMS", "PLANE", "POINT_TOK", "POINTSIZE", + "POSITION", "PRIMARY", "PROGRAM", "PROJECTION", "RANGE", "RESULT", "ROW", + "SCENECOLOR", "SECONDARY", "SHININESS", "SIZE_TOK", "SPECULAR", "SPOT", "STATE", "TEXCOORD", "TEXENV", "TEXGEN", "TEXGEN_Q", "TEXGEN_R", "TEXGEN_S", "TEXGEN_T", "TEXTURE", "TRANSPOSE", "TEXTURE_UNIT", "TEX_1D", "TEX_2D", "TEX_3D", "TEX_CUBE", "TEX_RECT", "TEX_SHADOW1D", |