}
static bool
-lower_discard_if_instr(nir_intrinsic_instr *instr, nir_builder *b)
+lower_discard_if_instr(nir_builder *b, nir_instr *instr_, UNUSED void *cb_data)
{
+ if (instr_->type != nir_instr_type_intrinsic)
+ return false;
+
+ nir_intrinsic_instr *instr = nir_instr_as_intrinsic(instr_);
+
if (instr->intrinsic == nir_intrinsic_discard_if) {
b->cursor = nir_before_instr(&instr->instr);
static bool
lower_discard_if(nir_shader *shader)
{
- bool progress = false;
-
- nir_foreach_function(function, shader) {
- if (function->impl) {
- nir_builder builder;
- nir_builder_init(&builder, function->impl);
- nir_foreach_block(block, function->impl) {
- nir_foreach_instr_safe(instr, block) {
- if (instr->type == nir_instr_type_intrinsic)
- progress |= lower_discard_if_instr(
- nir_instr_as_intrinsic(instr),
- &builder);
- }
- }
-
- nir_metadata_preserve(function->impl, nir_metadata_dominance);
- }
- }
-
- return progress;
+ return nir_shader_instructions_pass(shader,
+ lower_discard_if_instr,
+ nir_metadata_dominance,
+ NULL);
}
static bool