summaryrefslogtreecommitdiffstats
path: root/src/glsl/glsl_lexer.lpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/glsl/glsl_lexer.lpp')
-rw-r--r--src/glsl/glsl_lexer.lpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/glsl/glsl_lexer.lpp b/src/glsl/glsl_lexer.lpp
index 8be5c67fc2b..f690c4728b5 100644
--- a/src/glsl/glsl_lexer.lpp
+++ b/src/glsl/glsl_lexer.lpp
@@ -161,6 +161,7 @@ const return CONST_TOK;
bool return BOOL_TOK;
float return FLOAT_TOK;
int return INT_TOK;
+uint TOKEN_OR_IDENTIFIER(130, UINT_TOK);
break return BREAK;
continue return CONTINUE;
@@ -178,6 +179,9 @@ bvec4 return BVEC4;
ivec2 return IVEC2;
ivec3 return IVEC3;
ivec4 return IVEC4;
+uvec2 TOKEN_OR_IDENTIFIER(130, UVEC2);
+uvec3 TOKEN_OR_IDENTIFIER(130, UVEC3);
+uvec4 TOKEN_OR_IDENTIFIER(130, UVEC4);
vec2 return VEC2;
vec3 return VEC3;
vec4 return VEC4;
@@ -236,6 +240,8 @@ layout {
&& return AND_OP;
\|\| return OR_OP;
"^^" return XOR_OP;
+"<<" return LEFT_OP;
+">>" return RIGHT_OP;
\*= return MUL_ASSIGN;
\/= return DIV_ASSIGN;
@@ -244,7 +250,7 @@ layout {
\<\<= return LEFT_ASSIGN;
>>= return RIGHT_ASSIGN;
&= return AND_ASSIGN;
-^= return XOR_ASSIGN;
+"^=" return XOR_ASSIGN;
\|= return OR_ASSIGN;
-= return SUB_ASSIGN;