Module: Mesa
Branch: glsl2-win32
Commit: 06b1e73758e26efe56795abb7e362279304c4d19
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=06b1e73758e26efe56795abb7e362279304c4d19
Author: José Fonseca <jfons...@vmware.com>
Date: Fri Aug 13 14:01:52 2010 +0100
glsl: Rename symbols defined in windows headers.
I'm not sure if windows.h include could be avoided. At the moment it's
because windows.h is necessary for GL.h and for mesa/mapi threading
primitives.
Another alternative would be to use some prefix on all tokens.
---
src/glsl/glsl_lexer.cpp | 26 +++++++++++++-------------
src/glsl/glsl_lexer.lpp | 32 ++++++++++++++++----------------
src/glsl/glsl_parser.cpp | 42 +++++++++++++++++++++---------------------
src/glsl/glsl_parser.h | 28 ++++++++++++++--------------
src/glsl/glsl_parser.ypp | 38 +++++++++++++++++++-------------------
5 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/src/glsl/glsl_lexer.cpp b/src/glsl/glsl_lexer.cpp
index f75f7b5..1beafa1 100644
--- a/src/glsl/glsl_lexer.cpp
+++ b/src/glsl/glsl_lexer.cpp
@@ -1415,17 +1415,17 @@ return CONST_TOK;
case 17:
YY_RULE_SETUP
#line 131 "glsl_lexer.lpp"
-return BOOL;
+return BOOL_;
YY_BREAK
case 18:
YY_RULE_SETUP
#line 132 "glsl_lexer.lpp"
-return FLOAT;
+return FLOAT_;
YY_BREAK
case 19:
YY_RULE_SETUP
#line 133 "glsl_lexer.lpp"
-return INT;
+return INT_;
YY_BREAK
case 20:
YY_RULE_SETUP
@@ -1520,7 +1520,7 @@ return VEC4;
case 38:
YY_RULE_SETUP
#line 154 "glsl_lexer.lpp"
-return MAT2;
+return MAT2_;
YY_BREAK
case 39:
YY_RULE_SETUP
@@ -1580,17 +1580,17 @@ TOKEN_OR_IDENTIFIER(120, MAT4X4);
case 50:
YY_RULE_SETUP
#line 167 "glsl_lexer.lpp"
-return IN;
+return IN_;
YY_BREAK
case 51:
YY_RULE_SETUP
#line 168 "glsl_lexer.lpp"
-return OUT;
+return OUT_;
YY_BREAK
case 52:
YY_RULE_SETUP
#line 169 "glsl_lexer.lpp"
-return INOUT;
+return INOUT_;
YY_BREAK
case 53:
YY_RULE_SETUP
@@ -1665,7 +1665,7 @@ return STRUCT;
case 67:
YY_RULE_SETUP
#line 187 "glsl_lexer.lpp"
-return VOID;
+return VOID_;
YY_BREAK
case 68:
YY_RULE_SETUP
@@ -1894,7 +1894,7 @@ RESERVED_WORD(999, THIS);
case 105:
YY_RULE_SETUP
#line 272 "glsl_lexer.lpp"
-RESERVED_WORD(999, PACKED);
+RESERVED_WORD(999, PACKED_);
YY_BREAK
case 106:
YY_RULE_SETUP
@@ -1954,12 +1954,12 @@ RESERVED_WORD(999, INTERFACE);
case 117:
YY_RULE_SETUP
#line 284 "glsl_lexer.lpp"
-RESERVED_WORD(999, LONG);
+RESERVED_WORD(999, LONG_);
YY_BREAK
case 118:
YY_RULE_SETUP
#line 285 "glsl_lexer.lpp"
-RESERVED_WORD(999, SHORT);
+RESERVED_WORD(999, SHORT_);
YY_BREAK
case 119:
YY_RULE_SETUP
@@ -1974,7 +1974,7 @@ RESERVED_WORD(999, HALF);
case 121:
YY_RULE_SETUP
#line 288 "glsl_lexer.lpp"
-RESERVED_WORD(999, FIXED);
+RESERVED_WORD(999, FIXED_);
YY_BREAK
case 122:
YY_RULE_SETUP
@@ -1984,7 +1984,7 @@ RESERVED_WORD(999, UNSIGNED);
case 123:
YY_RULE_SETUP
#line 290 "glsl_lexer.lpp"
-RESERVED_WORD(999, INPUT);
+RESERVED_WORD(999, INPUT_);
YY_BREAK
case 124:
YY_RULE_SETUP
diff --git a/src/glsl/glsl_lexer.lpp b/src/glsl/glsl_lexer.lpp
index 7ef537b..743cac8 100644
--- a/src/glsl/glsl_lexer.lpp
+++ b/src/glsl/glsl_lexer.lpp
@@ -69,7 +69,7 @@
DEC_INT [1-9][0-9]*
HEX_INT 0[xX][0-9a-fA-F]+
OCT_INT 0[0-7]*
-INT ({DEC_INT}|{HEX_INT}|{OCT_INT})
+INT_ ({DEC_INT}|{HEX_INT}|{OCT_INT})
SPC [ \t]*
SPCP [ \t]+
HASH ^{SPC}#{SPC}
@@ -81,7 +81,7 @@ HASH ^{SPC}#{SPC}
^[ \t]*#[ \t]*$ ;
^[ \t]*#[ \t]*version { BEGIN PP; return VERSION; }
^[ \t]*#[ \t]*extension { BEGIN PP; return EXTENSION; }
-{HASH}line{SPCP}{INT}{SPCP}{INT}{SPC}$ {
+{HASH}line{SPCP}{INT_}{SPCP}{INT_}{SPC}$ {
/* Eat characters until the first digit is
* encountered
*/
@@ -96,7 +96,7 @@ HASH ^{SPC}#{SPC}
yylineno = strtol(ptr, &ptr, 0) - 1;
yylloc->source = strtol(ptr, NULL, 0);
}
-{HASH}line{SPCP}{INT}{SPC}$ {
+{HASH}line{SPCP}{INT_}{SPC}$ {
/* Eat characters until the first digit is
* encountered
*/
@@ -128,9 +128,9 @@ HASH ^{SPC}#{SPC}
attribute return ATTRIBUTE;
const return CONST_TOK;
-bool return BOOL;
-float return FLOAT;
-int return INT;
+bool return BOOL_;
+float return FLOAT_;
+int return INT_;
break return BREAK;
continue return CONTINUE;
@@ -151,7 +151,7 @@ ivec4 return IVEC4;
vec2 return VEC2;
vec3 return VEC3;
vec4 return VEC4;
-mat2 return MAT2;
+mat2 return MAT2_;
mat3 return MAT3;
mat4 return MAT4;
mat2x2 TOKEN_OR_IDENTIFIER(120, MAT2X2);
@@ -164,9 +164,9 @@ mat4x2 TOKEN_OR_IDENTIFIER(120, MAT4X2);
mat4x3 TOKEN_OR_IDENTIFIER(120, MAT4X3);
mat4x4 TOKEN_OR_IDENTIFIER(120, MAT4X4);
-in return IN;
-out return OUT;
-inout return INOUT;
+in return IN_;
+out return OUT_;
+inout return INOUT_;
uniform return UNIFORM;
varying return VARYING;
centroid TOKEN_OR_IDENTIFIER(120, CENTROID);
@@ -184,7 +184,7 @@ sampler1DShadow return SAMPLER1DSHADOW;
sampler2DShadow return SAMPLER2DSHADOW;
struct return STRUCT;
-void return VOID;
+void return VOID_;
layout {
if ((yyextra->language_version >= 140)
@@ -269,7 +269,7 @@ enum RESERVED_WORD(999, ENUM);
typedef RESERVED_WORD(999, TYPEDEF);
template RESERVED_WORD(999, TEMPLATE);
this RESERVED_WORD(999, THIS);
-packed RESERVED_WORD(999, PACKED);
+packed RESERVED_WORD(999, PACKED_);
goto RESERVED_WORD(999, GOTO);
switch RESERVED_WORD(130, SWITCH);
default RESERVED_WORD(130, DEFAULT);
@@ -281,13 +281,13 @@ static RESERVED_WORD(999, STATIC);
extern RESERVED_WORD(999, EXTERN);
external RESERVED_WORD(999, EXTERNAL);
interface RESERVED_WORD(999, INTERFACE);
-long RESERVED_WORD(999, LONG);
-short RESERVED_WORD(999, SHORT);
+long RESERVED_WORD(999, LONG_);
+short RESERVED_WORD(999, SHORT_);
double RESERVED_WORD(999, DOUBLE);
half RESERVED_WORD(999, HALF);
-fixed RESERVED_WORD(999, FIXED);
+fixed RESERVED_WORD(999, FIXED_);
unsigned RESERVED_WORD(999, UNSIGNED);
-input RESERVED_WORD(999, INPUT);
+input RESERVED_WORD(999, INPUT_);
output RESERVED_WORD(999, OUTPUT);
hvec2 RESERVED_WORD(999, HVEC2);
hvec3 RESERVED_WORD(999, HVEC3);
diff --git a/src/glsl/glsl_parser.cpp b/src/glsl/glsl_parser.cpp
index 864ab00..9221106 100644
--- a/src/glsl/glsl_parser.cpp
+++ b/src/glsl/glsl_parser.cpp
@@ -143,10 +143,10 @@
enum yytokentype {
ATTRIBUTE = 258,
CONST_TOK = 259,
- BOOL = 260,
- FLOAT = 261,
- INT = 262,
- UINT = 263,
+ BOOL_ = 260,
+ FLOAT_ = 261,
+ INT_ = 262,
+ UINT_ = 263,
BREAK = 264,
CONTINUE = 265,
DO = 266,
@@ -170,13 +170,13 @@
VEC2 = 284,
VEC3 = 285,
VEC4 = 286,
- MAT2 = 287,
+ MAT2_ = 287,
MAT3 = 288,
MAT4 = 289,
CENTROID = 290,
- IN = 291,
- OUT = 292,
- INOUT = 293,
+ IN_ = 291,
+ OUT_ = 292,
+ INOUT_ = 293,
UNIFORM = 294,
VARYING = 295,
NOPERSPECTIVE = 296,
@@ -215,7 +215,7 @@
USAMPLER1DARRAY = 329,
USAMPLER2DARRAY = 330,
STRUCT = 331,
- VOID = 332,
+ VOID_ = 332,
WHILE = 333,
IDENTIFIER = 334,
FLOATCONSTANT = 335,
@@ -266,7 +266,7 @@
TYPEDEF = 380,
TEMPLATE = 381,
THIS = 382,
- PACKED = 383,
+ PACKED_ = 383,
GOTO = 384,
INLINE_TOK = 385,
NOINLINE = 386,
@@ -275,13 +275,13 @@
STATIC = 389,
EXTERN = 390,
EXTERNAL = 391,
- LONG = 392,
- SHORT = 393,
+ LONG_ = 392,
+ SHORT_ = 393,
DOUBLE = 394,
HALF = 395,
- FIXED = 396,
+ FIXED_ = 396,
UNSIGNED = 397,
- INPUT = 398,
+ INPUT_ = 398,
OUPTUT = 399,
HVEC2 = 400,
HVEC3 = 401,
@@ -839,11 +839,11 @@ static const yytype_uint16 yyrline[] =
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
{
- "$end", "error", "$undefined", "ATTRIBUTE", "CONST_TOK", "BOOL",
- "FLOAT", "INT", "UINT", "BREAK", "CONTINUE", "DO", "ELSE", "FOR", "IF",
+ "$end", "error", "$undefined", "ATTRIBUTE", "CONST_TOK", "BOOL_",
+ "FLOAT_", "INT_", "UINT_", "BREAK", "CONTINUE", "DO", "ELSE", "FOR", "IF",
"DISCARD", "RETURN", "SWITCH", "CASE", "DEFAULT", "BVEC2", "BVEC3",
"BVEC4", "IVEC2", "IVEC3", "IVEC4", "UVEC2", "UVEC3", "UVEC4", "VEC2",
- "VEC3", "VEC4", "MAT2", "MAT3", "MAT4", "CENTROID", "IN", "OUT", "INOUT",
+ "VEC3", "VEC4", "MAT2_", "MAT3", "MAT4", "CENTROID", "IN_", "OUT_", "INOUT_",
"UNIFORM", "VARYING", "NOPERSPECTIVE", "FLAT", "SMOOTH", "MAT2X2",
"MAT2X3", "MAT2X4", "MAT3X2", "MAT3X3", "MAT3X4", "MAT4X2", "MAT4X3",
"MAT4X4", "SAMPLER1D", "SAMPLER2D", "SAMPLER3D", "SAMPLERCUBE",
@@ -852,7 +852,7 @@ static const char *const yytname[] =
"SAMPLER2DARRAYSHADOW", "ISAMPLER1D", "ISAMPLER2D", "ISAMPLER3D",
"ISAMPLERCUBE", "ISAMPLER1DARRAY", "ISAMPLER2DARRAY", "USAMPLER1D",
"USAMPLER2D", "USAMPLER3D", "USAMPLERCUBE", "USAMPLER1DARRAY",
- "USAMPLER2DARRAY", "STRUCT", "VOID", "WHILE", "IDENTIFIER",
+ "USAMPLER2DARRAY", "STRUCT", "VOID_", "WHILE", "IDENTIFIER",
"FLOATCONSTANT", "INTCONSTANT", "UINTCONSTANT", "BOOLCONSTANT",
"FIELD_SELECTION", "LEFT_OP", "RIGHT_OP", "INC_OP", "DEC_OP", "LE_OP",
"GE_OP", "EQ_OP", "NE_OP", "AND_OP", "OR_OP", "XOR_OP", "MUL_ASSIGN",
@@ -861,9 +861,9 @@ static const char *const yytname[] =
"LOWP", "MEDIUMP", "HIGHP", "SUPERP", "PRECISION", "VERSION",
"EXTENSION", "LINE", "PRAGMA", "COLON", "EOL", "INTERFACE", "OUTPUT",
"LAYOUT_TOK", "ASM", "CLASS", "UNION", "ENUM", "TYPEDEF", "TEMPLATE",
- "THIS", "PACKED", "GOTO", "INLINE_TOK", "NOINLINE", "VOLATILE",
- "PUBLIC_TOK", "STATIC", "EXTERN", "EXTERNAL", "LONG", "SHORT", "DOUBLE",
- "HALF", "FIXED", "UNSIGNED", "INPUT", "OUPTUT", "HVEC2", "HVEC3",
+ "THIS", "PACKED_", "GOTO", "INLINE_TOK", "NOINLINE", "VOLATILE",
+ "PUBLIC_TOK", "STATIC", "EXTERN", "EXTERNAL", "LONG_", "SHORT_", "DOUBLE",
+ "HALF", "FIXED_", "UNSIGNED", "INPUT_", "OUPTUT", "HVEC2", "HVEC3",
"HVEC4", "DVEC2", "DVEC3", "DVEC4", "FVEC2", "FVEC3", "FVEC4",
"SAMPLER2DRECT", "SAMPLER3DRECT", "SAMPLER2DRECTSHADOW", "SIZEOF",
"CAST", "NAMESPACE", "USING", "ERROR_TOK", "COMMON", "PARTITION",
diff --git a/src/glsl/glsl_parser.h b/src/glsl/glsl_parser.h
index 2bfca6f..6996728 100644
--- a/src/glsl/glsl_parser.h
+++ b/src/glsl/glsl_parser.h
@@ -41,10 +41,10 @@
enum yytokentype {
ATTRIBUTE = 258,
CONST_TOK = 259,
- BOOL = 260,
- FLOAT = 261,
- INT = 262,
- UINT = 263,
+ BOOL_ = 260,
+ FLOAT_ = 261,
+ INT_ = 262,
+ UINT_ = 263,
BREAK = 264,
CONTINUE = 265,
DO = 266,
@@ -68,13 +68,13 @@
VEC2 = 284,
VEC3 = 285,
VEC4 = 286,
- MAT2 = 287,
+ MAT2_ = 287,
MAT3 = 288,
MAT4 = 289,
CENTROID = 290,
- IN = 291,
- OUT = 292,
- INOUT = 293,
+ IN_ = 291,
+ OUT_ = 292,
+ INOUT_ = 293,
UNIFORM = 294,
VARYING = 295,
NOPERSPECTIVE = 296,
@@ -113,7 +113,7 @@
USAMPLER1DARRAY = 329,
USAMPLER2DARRAY = 330,
STRUCT = 331,
- VOID = 332,
+ VOID_ = 332,
WHILE = 333,
IDENTIFIER = 334,
FLOATCONSTANT = 335,
@@ -164,7 +164,7 @@
TYPEDEF = 380,
TEMPLATE = 381,
THIS = 382,
- PACKED = 383,
+ PACKED_ = 383,
GOTO = 384,
INLINE_TOK = 385,
NOINLINE = 386,
@@ -173,13 +173,13 @@
STATIC = 389,
EXTERN = 390,
EXTERNAL = 391,
- LONG = 392,
- SHORT = 393,
+ LONG_ = 392,
+ SHORT_ = 393,
DOUBLE = 394,
HALF = 395,
- FIXED = 396,
+ FIXED_ = 396,
UNSIGNED = 397,
- INPUT = 398,
+ INPUT_ = 398,
OUPTUT = 399,
HVEC2 = 400,
HVEC3 = 401,
diff --git a/src/glsl/glsl_parser.ypp b/src/glsl/glsl_parser.ypp
index 7c5dc01..72ab146 100644
--- a/src/glsl/glsl_parser.ypp
+++ b/src/glsl/glsl_parser.ypp
@@ -77,10 +77,10 @@
} for_rest_statement;
}
-%token ATTRIBUTE CONST_TOK BOOL FLOAT INT UINT
+%token ATTRIBUTE CONST_TOK BOOL_ FLOAT_ INT_ UINT_
%token BREAK CONTINUE DO ELSE FOR IF DISCARD RETURN SWITCH CASE DEFAULT
%token BVEC2 BVEC3 BVEC4 IVEC2 IVEC3 IVEC4 UVEC2 UVEC3 UVEC4 VEC2 VEC3 VEC4
-%token MAT2 MAT3 MAT4 CENTROID IN OUT INOUT UNIFORM VARYING
+%token MAT2_ MAT3 MAT4 CENTROID IN_ OUT_ INOUT_ UNIFORM VARYING
%token NOPERSPECTIVE FLAT SMOOTH
%token MAT2X2 MAT2X3 MAT2X4
%token MAT3X2 MAT3X3 MAT3X4
@@ -90,7 +90,7 @@
%token SAMPLER2DARRAYSHADOW ISAMPLER1D ISAMPLER2D ISAMPLER3D ISAMPLERCUBE
%token ISAMPLER1DARRAY ISAMPLER2DARRAY USAMPLER1D USAMPLER2D USAMPLER3D
%token USAMPLERCUBE USAMPLER1DARRAY USAMPLER2DARRAY
-%token STRUCT VOID WHILE
+%token STRUCT VOID_ WHILE
%token <identifier> IDENTIFIER
%token <real> FLOATCONSTANT
%token <n> INTCONSTANT UINTCONSTANT BOOLCONSTANT
@@ -108,9 +108,9 @@
/* Reserved words that are not actually used in the grammar.
*/
-%token ASM CLASS UNION ENUM TYPEDEF TEMPLATE THIS PACKED GOTO
+%token ASM CLASS UNION ENUM TYPEDEF TEMPLATE THIS PACKED_ GOTO
%token INLINE_TOK NOINLINE VOLATILE PUBLIC_TOK STATIC EXTERN EXTERNAL
-%token LONG SHORT DOUBLE HALF FIXED UNSIGNED INPUT OUPTUT
+%token LONG_ SHORT_ DOUBLE HALF FIXED_ UNSIGNED INPUT_ OUPTUT
%token HVEC2 HVEC3 HVEC4 DVEC2 DVEC3 DVEC4 FVEC2 FVEC3 FVEC4
%token SAMPLER2DRECT SAMPLER3DRECT SAMPLER2DRECTSHADOW
%token SIZEOF CAST NAMESPACE USING
@@ -370,7 +370,7 @@ function_call_generic:
;
function_call_header_no_parameters:
- function_call_header VOID
+ function_call_header VOID_
| function_call_header
;
@@ -783,9 +783,9 @@ parameter_declaration:
parameter_qualifier:
/* empty */ { $$.i = 0; }
- | IN { $$.i = 0; $$.q.in = 1; }
- | OUT { $$.i = 0; $$.q.out = 1; }
- | INOUT { $$.i = 0; $$.q.in = 1; $$.q.out = 1; }
+ | IN_ { $$.i = 0; $$.q.in = 1; }
+ | OUT_ { $$.i = 0; $$.q.out = 1; }
+ | INOUT_ { $$.i = 0; $$.q.in = 1; $$.q.out = 1; }
;
parameter_type_specifier:
@@ -1030,10 +1030,10 @@ storage_qualifier:
| ATTRIBUTE { $$.i = 0; $$.q.attribute = 1; }
| opt_layout_qualifier VARYING { $$.i = $1.i; $$.q.varying = 1; }
| CENTROID VARYING { $$.i = 0; $$.q.centroid = 1; $$.q.varying =
1; }
- | opt_layout_qualifier IN { $$.i = 0; $$.q.in = 1; }
- | OUT { $$.i = 0; $$.q.out = 1; }
- | CENTROID IN { $$.i = 0; $$.q.centroid = 1; $$.q.in = 1; }
- | CENTROID OUT { $$.i = 0; $$.q.centroid = 1; $$.q.out = 1; }
+ | opt_layout_qualifier IN_ { $$.i = 0; $$.q.in = 1; }
+ | OUT_ { $$.i = 0; $$.q.out = 1; }
+ | CENTROID IN_ { $$.i = 0; $$.q.centroid = 1; $$.q.in = 1; }
+ | CENTROID OUT_ { $$.i = 0; $$.q.centroid = 1; $$.q.out = 1; }
| UNIFORM { $$.i = 0; $$.q.uniform = 1; }
;
@@ -1084,11 +1084,11 @@ type_specifier_nonarray:
;
basic_type_specifier_nonarray:
- VOID { $$ = ast_void; }
- | FLOAT { $$ = ast_float; }
- | INT { $$ = ast_int; }
- | UINT { $$ = ast_uint; }
- | BOOL { $$ = ast_bool; }
+ VOID_ { $$ = ast_void; }
+ | FLOAT_ { $$ = ast_float; }
+ | INT_ { $$ = ast_int; }
+ | UINT_ { $$ = ast_uint; }
+ | BOOL_ { $$ = ast_bool; }
| VEC2 { $$ = ast_vec2; }
| VEC3 { $$ = ast_vec3; }
| VEC4 { $$ = ast_vec4; }
@@ -1101,7 +1101,7 @@ basic_type_specifier_nonarray:
| UVEC2 { $$ = ast_uvec2; }
| UVEC3 { $$ = ast_uvec3; }
| UVEC4 { $$ = ast_uvec4; }
- | MAT2 { $$ = ast_mat2; }
+ | MAT2_ { $$ = ast_mat2; }
| MAT3 { $$ = ast_mat3; }
| MAT4 { $$ = ast_mat4; }
| MAT2X2 { $$ = ast_mat2; }
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
