From: Connor Abbott <cwabbott0@gmail.com>
Date: Tue, 12 Apr 2016 18:46:03 +0000 (-0400)
Subject: nir/opt_undef: fixup for new foreach_block()
X-Git-Tag: upstream/17.1.0~10456
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a8c17a59e953e31de1c2f5b07d096a7e271e12f;p=platform%2Fupstream%2Fmesa.git

nir/opt_undef: fixup for new foreach_block()

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/compiler/nir/nir_opt_undef.c b/src/compiler/nir/nir_opt_undef.c
index 38208f8..87c23b3 100644
--- a/src/compiler/nir/nir_opt_undef.c
+++ b/src/compiler/nir/nir_opt_undef.c
@@ -71,20 +71,6 @@ opt_undef_alu(nir_alu_instr *instr)
    return false;
 }
 
-static bool
-opt_undef_block(nir_block *block, void *data)
-{
-   bool *progress = data;
-
-   nir_foreach_instr_safe(block, instr) {
-      if (instr->type == nir_instr_type_alu)
-         if (opt_undef_alu(nir_instr_as_alu(instr)))
-             (*progress) = true;
-   }
-
-   return true;
-}
-
 bool
 nir_opt_undef(nir_shader *shader)
 {
@@ -92,7 +78,14 @@ nir_opt_undef(nir_shader *shader)
 
    nir_foreach_function(shader, function) {
       if (function->impl) {
-         nir_foreach_block_call(function->impl, opt_undef_block, &progress);
+         nir_foreach_block(block, function->impl) {
+            nir_foreach_instr_safe(block, instr) {
+               if (instr->type == nir_instr_type_alu)
+                  if (opt_undef_alu(nir_instr_as_alu(instr)))
+                      progress = true;
+            }
+         }
+
          if (progress)
             nir_metadata_preserve(function->impl,
                                   nir_metadata_block_index |