OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl2: Move temp declaration to correct side of if-statement in IR

Browse Source
This commit is contained in:
Ian Romanick
2010-07-12 15:18:55 -07:00
parent 10d222b702
commit 81d664f099
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/glsl/ast_to_hir.cpp
View File

@@ -805,6 +805,10 @@ ast_expression::hir(exec_list *instructions,
}
type = glsl_type::bool_type;
} else {
ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,
"and_tmp");
instructions->push_tail(tmp);
ir_if *const stmt = new(ctx) ir_if(op[0]);
instructions->push_tail(stmt);
@@ -819,10 +823,6 @@ ast_expression::hir(exec_list *instructions,
error_emitted = true;
}
ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,
"and_tmp");
instructions->push_tail(tmp);
ir_dereference *const then_deref = new(ctx) ir_dereference_variable(tmp);
ir_assignment *const then_assign =
new(ctx) ir_assignment(then_deref, op[1], NULL);
@@ -869,13 +869,13 @@ ast_expression::hir(exec_list *instructions,
}
type = glsl_type::bool_type;
} else {
ir_if *const stmt = new(ctx) ir_if(op[0]);
instructions->push_tail(stmt);
ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,
"or_tmp");
instructions->push_tail(tmp);
ir_if *const stmt = new(ctx) ir_if(op[0]);
instructions->push_tail(stmt);
op[1] = this->subexpressions[1]->hir(&stmt->then_instructions, state);
if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {