KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nir/constant_folding: Use nir_src_as_bool for discard_if 

Missed one while converting to the nir_src_as_* helpers.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Jason Ekstrand 2018-10-22 15:53:14 -05:00
parent 6de1869e86
commit 249e32ab17
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/compiler/nir/nir_opt_constant_folding.c
View File

@ -131,12 +131,9 @@ constant_fold_intrinsic_instr(nir_intrinsic_instr *instr)
{
bool progress = false;
if (instr->intrinsic == nir_intrinsic_discard_if) {
nir_const_value *src_val = nir_src_as_const_value(instr->src[0]);
if (src_val && src_val->u32[0] == NIR_FALSE) {
nir_instr_remove(&instr->instr);
progress = true;
} else if (src_val && src_val->u32[0] == NIR_TRUE) {
if (instr->intrinsic == nir_intrinsic_discard_if &&
nir_src_is_const(instr->src[0])) {
if (nir_src_as_bool(instr->src[0])) {
/* This method of getting a nir_shader * from a nir_instr is
* admittedly gross, but given the rarity of hitting this case I think
* it's preferable to plumbing an otherwise unused nir_shader *
@ -151,6 +148,10 @@ constant_fold_intrinsic_instr(nir_intrinsic_instr *instr)
nir_instr_insert_before(&instr->instr, &discard->instr);
nir_instr_remove(&instr->instr);
progress = true;
} else {
/* We're not discarding, just delete the instruction */
nir_instr_remove(&instr->instr);
progress = true;
}
}