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.y | |
| 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.y')
| -rw-r--r-- | src/mesa/shader/program_parse.y | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y index 46f300408be..2f5d3037f42 100644 --- a/src/mesa/shader/program_parse.y +++ b/src/mesa/shader/program_parse.y @@ -159,9 +159,9 @@ static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op, %token MATERIAL MAT_PROGRAM MATRIX MATRIXINDEX MODELVIEW MVP %token NORMAL %token OBJECT -%token PALETTE PARAMS PLANE POINT POINTSIZE POSITION PRIMARY PROGRAM PROJECTION +%token PALETTE PARAMS PLANE POINT_TOK POINTSIZE POSITION PRIMARY PROGRAM PROJECTION %token RANGE RESULT ROW -%token SCENECOLOR SECONDARY SHININESS SIZE SPECULAR SPOT STATE +%token SCENECOLOR SECONDARY SHININESS SIZE_TOK SPECULAR SPOT STATE %token TEXCOORD TEXENV TEXGEN TEXGEN_Q TEXGEN_R TEXGEN_S TEXGEN_T TEXTURE TRANSPOSE %token TEXTURE_UNIT TEX_1D TEX_2D TEX_3D TEX_CUBE TEX_RECT %token TEX_SHADOW1D TEX_SHADOW2D TEX_SHADOWRECT @@ -1353,14 +1353,14 @@ stateClipPlaneNum: INTEGER } ; -statePointItem: POINT statePointProperty +statePointItem: POINT_TOK statePointProperty { memset($$, 0, sizeof($$)); $$[0] = $2; } ; -statePointProperty: SIZE +statePointProperty: SIZE_TOK { $$ = STATE_POINT_SIZE; } |