From: Eric Anholt Date: Mon, 14 May 2012 15:39:54 +0000 (-0700) Subject: glsl: Let the constructor figure out the types of switch-related expressions. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5d6ea16dfe99e1aba61c25a897b66951faab1a39;p=mesa.git glsl: Let the constructor figure out the types of switch-related expressions. I noticed this while unindenting the code. Reviewed-by: Kenneth Graunke Reviewed-by: Ian Romanick --- diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 9252df14952..513908a0dbd 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);