Mesa (master): glsl: Let the constructor figure out the types of switch-related expressions.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 5d6ea16dfe99e1aba61c25a897b66951faab1a39
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d6ea16dfe99e1aba61c25a897b66951faab1a39

Author: Eric Anholt <eric at anholt.net>
Date:   Mon May 14 08:39:54 2012 -0700

glsl: Let the constructor figure out the types of switch-related expressions.

I noticed this while unindenting the code.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/ast_to_hir.cpp |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 9252df1..513908a 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -3731,7 +3731,6 @@ ast_case_label::hir(exec_list *instructions,
 	 new(ctx) ir_dereference_variable(state->switch_state.test_var);
 
       ir_rvalue *const test_cond = new(ctx) ir_expression(ir_binop_all_equal,
-							  glsl_type::bool_type,
 							  label_const,
 							  deref_test_var);
 
@@ -3788,9 +3787,7 @@ ast_iteration_statement::condition_to_hir(ir_loop *stmt,
 	  * like 'if (!condition) break;' as the loop termination condition.
 	  */
 	 ir_rvalue *const not_cond =
-	    new(ctx) ir_expression(ir_unop_logic_not, glsl_type::bool_type,
-				   cond,
-				   NULL);
+	    new(ctx) ir_expression(ir_unop_logic_not, cond);
 
 	 ir_if *const if_stmt = new(ctx) ir_if(not_cond);