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_lexer.l | |
| 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_lexer.l')
| -rw-r--r-- | src/mesa/shader/program_lexer.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/program_lexer.l b/src/mesa/shader/program_lexer.l index c50c7c57399..bc209435ef1 100644 --- a/src/mesa/shader/program_lexer.l +++ b/src/mesa/shader/program_lexer.l @@ -267,7 +267,7 @@ result { return RESULT; } {dot}palette { return PALETTE; } {dot}params { return PARAMS; } {dot}plane { return PLANE; } -{dot}point { return_token_or_DOT(require_ARB_vp, POINT); } +{dot}point { return_token_or_DOT(require_ARB_vp, POINT_TOK); } {dot}pointsize { return_token_or_DOT(require_ARB_vp, POINTSIZE); } {dot}position { return POSITION; } {dot}primary { return PRIMARY; } @@ -277,7 +277,7 @@ result { return RESULT; } {dot}scenecolor { return SCENECOLOR; } {dot}secondary { return SECONDARY; } {dot}shininess { return SHININESS; } -{dot}size { return_token_or_DOT(require_ARB_vp, SIZE); } +{dot}size { return_token_or_DOT(require_ARB_vp, SIZE_TOK); } {dot}specular { return SPECULAR; } {dot}spot { return SPOT; } {dot}texcoord { return TEXCOORD; } |