Mesa (master): intel/nir: Use the OPT macro for more passes

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 5cdeefe057d9da0a48630770dc8f01e0f5295fa2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5cdeefe057d9da0a48630770dc8f01e0f5295fa2

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Oct 19 12:06:36 2018 -0500

intel/nir: Use the OPT macro for more passes

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/intel/compiler/brw_nir.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c
index 1cd5686157..cf5a4a96d6 100644
--- a/src/intel/compiler/brw_nir.c
+++ b/src/intel/compiler/brw_nir.c
@@ -674,7 +674,7 @@ brw_preprocess_nir(const struct brw_compiler *compiler, nir_shader *nir)
    /* Lower int64 instructions before nir_optimize so that loop unrolling
     * sees their actual cost.
     */
-   nir_lower_int64(nir, nir_lower_imul64 |
+   OPT(nir_lower_int64, nir_lower_imul64 |
                         nir_lower_isign64 |
                         nir_lower_divmod64);
 
@@ -687,7 +687,7 @@ brw_preprocess_nir(const struct brw_compiler *compiler, nir_shader *nir)
       OPT(nir_opt_large_constants, NULL, 32);
    }
 
-   nir_lower_bit_size(nir, lower_bit_size_callback, NULL);
+   OPT(nir_lower_bit_size, lower_bit_size_callback, NULL);
 
    if (is_scalar) {
       OPT(nir_lower_load_const_to_scalar);
@@ -712,7 +712,7 @@ brw_preprocess_nir(const struct brw_compiler *compiler, nir_shader *nir)
 
    nir_variable_mode indirect_mask =
       brw_nir_no_indirect_mask(compiler, nir->info.stage);
-   nir_lower_indirect_derefs(nir, indirect_mask);
+   OPT(nir_lower_indirect_derefs, indirect_mask);
 
    /* Get rid of split copies */
    nir = brw_nir_optimize(nir, compiler, is_scalar, false);