return false;
if (bit_size == 0 &&
- !nir_alu_type_get_type_size(nir_op_infos[instr->op].input_sizes[i])) {
+ !nir_alu_type_get_type_size(nir_op_infos[instr->op].input_types[i]))
bit_size = instr->src[i].src.ssa->bit_size;
- }
nir_instr *src_instr = instr->src[i].src.ssa->parent_instr;
case 8:
src[i].u8[j] = load_const->value.u8[instr->src[i].swizzle[j]];
break;
+ case 1:
+ src[i].b[j] = load_const->value.b[instr->src[i].swizzle[j]];
+ break;
default:
unreachable("Invalid bit size");
}
{
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 *
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;
}
}
progress |= constant_fold_block(block, mem_ctx);
}
- if (progress)
+ if (progress) {
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
+ } else {
+#ifndef NDEBUG
+ impl->valid_metadata &= ~nir_metadata_not_properly_reset;
+#endif
+ }
return progress;
}