From a170f279581fc0cbdd112a1e01d37e8858895bb3 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 5 Jan 2018 17:50:24 -0800 Subject: [PATCH] glsl: Remove unnecessary assignments to type MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Alejandro Piñeiro --- 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 7abb8199e1e..41e74815f31 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.30.2