X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fshader%2Fprogram_lexer.l;h=612f99a42d05c7ad884d307ac432ba1580625ace;hb=81c7561d9d3faf70ac22c6a5f3fbea18f53eed92;hp=c50c7c57399c18c36511e5c89afdad5562c33ed0;hpb=e363ec1d08858735c6f2b1454c43f39c96d5bab6;p=mesa.git

diff --git a/src/mesa/shader/program_lexer.l b/src/mesa/shader/program_lexer.l
index c50c7c57399..612f99a42d0 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 "program_parser.h"
 #include "program_parse.tab.h"
@@ -33,6 +34,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) {					\
@@ -267,7 +272,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 +282,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; }