projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fc6caef
)
glsl: Add lexer rules for << and >> in GLSL 1.30
author
Chad Versace
<chad@chad-versace.us>
Fri, 8 Oct 2010 23:12:24 +0000
(16:12 -0700)
committer
Kenneth Graunke
<kenneth@whitecape.org>
Fri, 15 Oct 2010 07:20:18 +0000
(
00:20
-0700)
Commit for generated file glsl_lexer.cpp follows this commit.
src/glsl/glsl_lexer.lpp
patch
|
blob
|
history
diff --git
a/src/glsl/glsl_lexer.lpp
b/src/glsl/glsl_lexer.lpp
index 9672342e8e681a25bc8d9e3e8bd7933ad5b443d8..c0778a656a3700882e1e3c4d986bf3112de8addf 100644
(file)
--- a/
src/glsl/glsl_lexer.lpp
+++ b/
src/glsl/glsl_lexer.lpp
@@
-240,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;