summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2010-10-18 17:25:52 -0700
committerKenneth Graunke <[email protected]>2010-10-18 17:40:09 -0700
commit0eb0b44647ec9218f5c6ce90e3f50273d6f25c90 (patch)
tree9a50c3fa4bf7f016c99c9150a127f10385b1dbb0
parent4af293741635aea8630e8734a8b4caf58047e91d (diff)
glsl: Fix copy and paste error in ast_bit_and node creation.
All & operations were incorrectly being generated as ast_bit_or.
-rw-r--r--src/glsl/glsl_parser.ypp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glsl_parser.ypp b/src/glsl/glsl_parser.ypp
index ed18179beb7..3813d7a4e20 100644
--- 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);
}
;