nir: Switch the arguments to nir_foreach_use and friends

[mesa.git] / src / gallium / drivers / freedreno / ir3 / ir3_nir_lower_if_else.c

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c b/src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c
index dc9e4626f27099909493e1b2b9a112d06654c381..12f7ccf79498bb1f817b9cec11718d76fe7c57fd 100644 (file)
--- a/src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c
@@ -28,7 +28,8 @@
  */
 
 #include "ir3_nir.h"
-#include "glsl/nir/nir_builder.h"
+#include "compiler/nir/nir_builder.h"
+#include "compiler/nir/nir_control_flow.h"
 
 /* Based on nir_opt_peephole_select, and hacked up to more aggressively
  * flatten anything that can be flattened
@@ -79,7 +80,7 @@ valid_dest(nir_block *block, nir_dest *dest)
        /* The only uses of this definition must be phi's in the
         * successor or in the current block
         */
-       nir_foreach_use(&dest->ssa, use) {
+       nir_foreach_use(use, &dest->ssa) {
                nir_instr *dest_instr = use->parent_instr;
                if (dest_instr->block == block)
                        continue;
@@ -95,7 +96,7 @@ valid_dest(nir_block *block, nir_dest *dest)
 static bool
 block_check_for_allowed_instrs(nir_block *block)
 {
-       nir_foreach_instr(block, instr) {
+       nir_foreach_instr(instr, block) {
                switch (instr->type) {
                case nir_instr_type_intrinsic: {
                        nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
@@ -164,14 +165,14 @@ static void
 flatten_block(nir_builder *bld, nir_block *if_block, nir_block *prev_block,
                nir_ssa_def *condition, bool invert)
 {
-       nir_foreach_instr_safe(if_block, instr) {
+       nir_foreach_instr_safe(instr, if_block) {
                if (instr->type == nir_instr_type_intrinsic) {
                        nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
                        if ((intr->intrinsic == nir_intrinsic_discard) ||
                                        (intr->intrinsic == nir_intrinsic_discard_if)) {
                                nir_ssa_def *discard_cond;
 
-                               nir_builder_insert_after_instr(bld,
+                               bld->cursor = nir_after_instr(
                                                nir_block_last_instr(prev_block));
 
                                if (invert) {
@@ -269,7 +270,7 @@ lower_if_else_block(nir_block *block, void *void_state)
        flatten_block(&state->b, else_block, prev_block,
                        if_stmt->condition.ssa, true);
 
-       nir_foreach_instr_safe(block, instr) {
+       nir_foreach_instr_safe(instr, block) {
                if (instr->type != nir_instr_type_phi)
                        break;
 
@@ -280,7 +281,7 @@ lower_if_else_block(nir_block *block, void *void_state)
                memset(sel->src[0].swizzle, 0, sizeof sel->src[0].swizzle);
 
                assert(exec_list_length(&phi->srcs) == 2);
-               nir_foreach_phi_src(phi, src) {
+               nir_foreach_phi_src(src, phi) {
                        assert(src->pred == then_block || src->pred == else_block);
                        assert(src->src.is_ssa);
 
@@ -289,12 +290,11 @@ lower_if_else_block(nir_block *block, void *void_state)
                }
 
                nir_ssa_dest_init(&sel->instr, &sel->dest.dest,
-                               phi->dest.ssa.num_components, phi->dest.ssa.name);
+                               phi->dest.ssa.num_components, 32, phi->dest.ssa.name);
                sel->dest.write_mask = (1 << phi->dest.ssa.num_components) - 1;
 
                nir_ssa_def_rewrite_uses(&phi->dest.ssa,
-                               nir_src_for_ssa(&sel->dest.dest.ssa),
-                               state->mem_ctx);
+                               nir_src_for_ssa(&sel->dest.dest.ssa));
 
                nir_instr_insert_before(&phi->instr, &sel->instr);
                nir_instr_remove(&phi->instr);
@@ -315,7 +315,7 @@ lower_if_else_impl(nir_function_impl *impl)
        state.progress = false;
        nir_builder_init(&state.b, impl);
 
-       nir_foreach_block(impl, lower_if_else_block, &state);
+       nir_foreach_block_call(impl, lower_if_else_block, &state);
 
        if (state.progress)
                nir_metadata_preserve(impl, nir_metadata_none);
@@ -328,9 +328,9 @@ ir3_nir_lower_if_else(nir_shader *shader)
 {
        bool progress = false;
 
-       nir_foreach_overload(shader, overload) {
-               if (overload->impl)
-                       progress |= lower_if_else_impl(overload->impl);
+       nir_foreach_function(function, shader) {
+               if (function->impl)
+                       progress |= lower_if_else_impl(function->impl);
        }
 
        return progress;