summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 ed18179beb..3813d7a4e2 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);
}
;