projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: Convert link_varyings to the util hash table
[mesa.git]
/
src
/
compiler
/
nir
/
nir_opt_dead_cf.c
diff --git
a/src/compiler/nir/nir_opt_dead_cf.c
b/src/compiler/nir/nir_opt_dead_cf.c
index 2e04c179073e3357034d0ec625f5ddc2c5d492f2..1490e6832a2429bd129a4e4430e1b829972fd00e 100644
(file)
--- a/
src/compiler/nir/nir_opt_dead_cf.c
+++ b/
src/compiler/nir/nir_opt_dead_cf.c
@@
-30,7
+30,7
@@
/*
* This file implements an optimization that deletes statically
/*
* This file implements an optimization that deletes statically
- * unreachable/dead code. In NIR, one way this can happen i
f if
an if
+ * unreachable/dead code. In NIR, one way this can happen i
s when
an if
* statement has a constant condition:
*
* if (true) {
* statement has a constant condition:
*
* if (true) {
@@
-128,8
+128,7
@@
opt_constant_if(nir_if *if_stmt, bool condition)
: &if_stmt->else_list;
nir_cf_list list;
: &if_stmt->else_list;
nir_cf_list list;
- nir_cf_extract(&list, nir_before_cf_list(cf_list),
- nir_after_cf_list(cf_list));
+ nir_cf_list_extract(&list, cf_list);
nir_cf_reinsert(&list, nir_after_cf_node(&if_stmt->cf_node));
nir_cf_node_remove(&if_stmt->cf_node);
}
nir_cf_reinsert(&list, nir_after_cf_node(&if_stmt->cf_node));
nir_cf_node_remove(&if_stmt->cf_node);
}
@@
-155,8
+154,8
@@
cf_node_has_side_effects(nir_cf_node *node)
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
- if (!nir_intrinsic_infos[intrin->intrinsic].flags &
- NIR_INTRINSIC_CAN_ELIMINATE)
+ if (!
(
nir_intrinsic_infos[intrin->intrinsic].flags &
+ NIR_INTRINSIC_CAN_ELIMINATE)
)
return true;
}
}
return true;
}
}
@@
-206,7
+205,8
@@
loop_is_dead(nir_loop *loop)
nir_metadata_require(impl, nir_metadata_live_ssa_defs |
nir_metadata_dominance);
nir_metadata_require(impl, nir_metadata_live_ssa_defs |
nir_metadata_dominance);
- for (nir_block *cur = after->imm_dom; cur != before; cur = cur->imm_dom) {
+ for (nir_block *cur = after->imm_dom; cur && cur != before;
+ cur = cur->imm_dom) {
nir_foreach_instr(instr, cur) {
if (!nir_foreach_ssa_def(instr, def_not_live_out, after))
return false;
nir_foreach_instr(instr, cur) {
if (!nir_foreach_ssa_def(instr, def_not_live_out, after))
return false;
@@
-221,11
+221,11
@@
dead_cf_block(nir_block *block)
{
nir_if *following_if = nir_block_get_following_if(block);
if (following_if) {
{
nir_if *following_if = nir_block_get_following_if(block);
if (following_if) {
- nir_const_value *const_value =
- nir_src_as_const_value(following_if->condition);
+
nir_const_value *const_value =
+
nir_src_as_const_value(following_if->condition);
- if (!const_value)
- return false;
+
if (!const_value)
+
return false;
opt_constant_if(following_if, const_value->u32[0] != 0);
return true;
opt_constant_if(following_if, const_value->u32[0] != 0);
return true;