From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 19 Oct 2010 00:25:52 +0000 (-0700)
Subject: glsl: Fix copy and paste error in ast_bit_and node creation.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0eb0b44647ec9218f5c6ce90e3f50273d6f25c90;p=mesa.git

glsl: Fix copy and paste error in ast_bit_and node creation.

All & operations were incorrectly being generated as ast_bit_or.
---

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);
 	}
 	;