diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-10 15:33:45 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-10 15:33:45 -0700 |
| commit | b8e1e8d2d8ae6ffbf8f271b46ee89788a926b3b0 (patch) | |
| tree | 5db502ab80287bfc8ff61082784017c7448464f5 /src/mesa/shader/program_lexer.l | |
| parent | 81722c5d7e8e93d837510b9e6e5d014ec64cf4b3 (diff) | |
| parent | d9dc4cb0e4f578da9e50c9d1ba6fd9c22ea2fca6 (diff) | |
Merge branch 'master' into asm-shader-rework-2
Conflicts:
src/mesa/shader/lex.yy.c
src/mesa/shader/program_parse.tab.c
src/mesa/shader/program_parse.tab.h
Diffstat (limited to 'src/mesa/shader/program_lexer.l')
| -rw-r--r-- | src/mesa/shader/program_lexer.l | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mesa/shader/program_lexer.l b/src/mesa/shader/program_lexer.l index a0d1af1e07..750c6acf42 100644 --- a/src/mesa/shader/program_lexer.l +++ b/src/mesa/shader/program_lexer.l @@ -23,6 +23,7 @@ */ #include "main/glheader.h" #include "prog_instruction.h" +#include "prog_statevars.h" #include "symbol_table.h" #include "program_parser.h" @@ -35,6 +36,10 @@ #define require_rect (yyextra->option.TexRect) #define require_texarray (yyextra->option.TexArray) +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif + #define return_token_or_IDENTIFIER(condition, token) \ do { \ if (condition) { \ @@ -269,7 +274,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; } @@ -279,7 +284,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; } |