diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp b/src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp index ab197ee4694..eb9968179f2 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp @@ -87,13 +87,18 @@ fs_visitor::opt_peephole_predicated_break() } if_inst->remove(if_block); + + bblock_t *later_block = endif_block; + if (endif_block->start_ip == endif_block->end_ip) { + later_block = (bblock_t *)endif_block->link.next; + } endif_inst->remove(endif_block); - if_block->children.make_empty(); - endif_block->parents.make_empty(); + earlier_block->children.make_empty(); + later_block->parents.make_empty(); - if_block->add_successor(cfg->mem_ctx, jump_block); - jump_block->add_successor(cfg->mem_ctx, endif_block); + earlier_block->add_successor(cfg->mem_ctx, jump_block); + jump_block->add_successor(cfg->mem_ctx, later_block); if (earlier_block->can_combine_with(jump_block)) { earlier_block->combine_with(jump_block); |