projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4af2937
)
glsl: Fix copy and paste error in ast_bit_and node creation.
author
Kenneth Graunke
<kenneth@whitecape.org>
Tue, 19 Oct 2010 00:25:52 +0000
(17:25 -0700)
committer
Kenneth Graunke
<kenneth@whitecape.org>
Tue, 19 Oct 2010 00:40:09 +0000
(17:40 -0700)
All & operations were incorrectly being generated as ast_bit_or.
src/glsl/glsl_parser.ypp
patch
|
blob
|
history
diff --git
a/src/glsl/glsl_parser.ypp
b/src/glsl/glsl_parser.ypp
index ed18179beb701c211c701e9cb208a03287caa1c4..3813d7a4e2072f3b76d51517ae2cff1e3467e62e 100644
(file)
--- a/
src/glsl/glsl_parser.ypp
+++ b/
src/glsl/glsl_parser.ypp
@@
-561,7
+561,7
@@
and_expression:
| and_expression '&' equality_expression
{
void *ctx = state;
- $$ = new(ctx) ast_expression_bin(ast_bit_
or
, $1, $3);
+ $$ = new(ctx) ast_expression_bin(ast_bit_
and
, $1, $3);
$$->set_location(yylloc);
}
;