From 0eb0b44647ec9218f5c6ce90e3f50273d6f25c90 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 18 Oct 2010 17:25:52 -0700 Subject: glsl: Fix copy and paste error in ast_bit_and node creation. All & operations were incorrectly being generated as ast_bit_or. --- src/glsl/glsl_parser.ypp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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); } ; -- cgit v1.2.3