From: Ian Romanick <ian.d.roman...@intel.com>
This will now never occur. The empty if-else part would have already
been removed leaving an empty if-endif part.
No shader-db changes.
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
---
src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
b/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
index 149596f..dadcff8 100644
--- a/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
+++ b/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
@@ -33,7 +33,6 @@
*
* - if/endif
* . else in else/endif
- * - if/else/endif
* - then in if/else/endif
*/
bool
@@ -44,7 +43,7 @@ dead_control_flow_eliminate(backend_shader *s)
foreach_block_safe (block, s->cfg) {
bblock_t *prev_block = block->prev();
backend_instruction *const inst = block->start();
- backend_instruction *prev_inst = prev_block->end();
+ backend_instruction *const prev_inst = prev_block->end();
/* ENDIF instructions, by definition, can only be found at the start of
* basic blocks.
@@ -60,19 +59,14 @@ dead_control_flow_eliminate(backend_shader *s)
else_block = endif_block->prev();
found = true;
- if (else_block->start_ip == else_block->end_ip) {
- prev_block = prev_block->prev();
- prev_inst = prev_block->end();
- }
+ /* Don't remove the ENDIF if we didn't find a dead IF. */
+ endif_inst = NULL;
}
if (prev_inst->opcode == BRW_OPCODE_IF) {
if_inst = prev_inst;
if_block = prev_block;
found = true;
- } else {
- /* Don't remove the ENDIF if we didn't find a dead IF. */
- endif_inst = NULL;
}
if (found) {
--
2.5.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
