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

glsl/lower_if: check more node types in check_control_flow -> check_ir_node

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák
2016-07-03 15:03:54 +02:00
parent 68f35005ed
commit 654e9466b5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/glsl/lower_if_to_cond_assign.cpp
View File

@@ -97,7 +97,7 @@ lower_if_to_cond_assign(exec_list *instructions, unsigned max_depth)
} }
void void
check_control_flow(ir_instruction *ir, void *data) check_ir_node(ir_instruction *ir, void *data)
{ {
ir_if_to_cond_assign_visitor *v = (ir_if_to_cond_assign_visitor *)data; ir_if_to_cond_assign_visitor *v = (ir_if_to_cond_assign_visitor *)data;
@@ -107,6 +107,9 @@ check_control_flow(ir_instruction *ir, void *data)
case ir_type_loop: case ir_type_loop:
case ir_type_loop_jump: case ir_type_loop_jump:
case ir_type_return: case ir_type_return:
case ir_type_emit_vertex:
case ir_type_end_primitive:
case ir_type_barrier:
v->found_unsupported_op = true; v->found_unsupported_op = true;
break; break;
default: default:
@@ -183,10 +186,10 @@ ir_if_to_cond_assign_visitor::visit_leave(ir_if *ir)
/* Check that both blocks don't contain anything we can't support. */ /* Check that both blocks don't contain anything we can't support. */
foreach_in_list(ir_instruction, then_ir, &ir->then_instructions) { foreach_in_list(ir_instruction, then_ir, &ir->then_instructions) {
visit_tree(then_ir, check_control_flow, this); visit_tree(then_ir, check_ir_node, this);
} }
foreach_in_list(ir_instruction, else_ir, &ir->else_instructions) { foreach_in_list(ir_instruction, else_ir, &ir->else_instructions) {
visit_tree(else_ir, check_control_flow, this); visit_tree(else_ir, check_ir_node, this);
} }
if (this->found_unsupported_op) if (this->found_unsupported_op)
return visit_continue; /* can't handle inner unsupported opcodes */ return visit_continue; /* can't handle inner unsupported opcodes */