From: Ian Romanick <ian.d.roman...@intel.com> None of these are necessary because result->type is the only thing used outside the giant switch-statement.
CID: 1230983, 1230984 Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> --- src/compiler/glsl/ast_to_hir.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 7abb819..41e7481 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -1589,7 +1589,6 @@ ast_expression::do_hir(exec_list *instructions, if (rhs_instructions.is_empty()) { result = new(ctx) ir_expression(ir_binop_logic_and, op[0], op[1]); - type = result->type; } else { ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type, "and_tmp", @@ -1611,7 +1610,6 @@ ast_expression::do_hir(exec_list *instructions, stmt->else_instructions.push_tail(else_assign); result = new(ctx) ir_dereference_variable(tmp); - type = tmp->type; } break; } @@ -1625,7 +1623,6 @@ ast_expression::do_hir(exec_list *instructions, if (rhs_instructions.is_empty()) { result = new(ctx) ir_expression(ir_binop_logic_or, op[0], op[1]); - type = result->type; } else { ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type, "or_tmp", @@ -1647,7 +1644,6 @@ ast_expression::do_hir(exec_list *instructions, stmt->else_instructions.push_tail(else_assign); result = new(ctx) ir_dereference_variable(tmp); - type = tmp->type; } break; } -- 2.9.5 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev