From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 16 Dec 2014 00:12:04 +0000 (-0800)
Subject: i965/nir: Move the other lowering passes to before out-of-SSA
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=951a7f23a076c1570f68b50fc7d03a33eb5145e7;p=mesa.git

i965/nir: Move the other lowering passes to before out-of-SSA

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index 0fed8a1f1b3..c218b722f8d 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
@@ -69,6 +69,12 @@ fs_visitor::emit_nir_code()
    nir_remove_dead_variables(nir);
    nir_validate_shader(nir);
 
+   nir_lower_samplers(nir, shader_prog, shader->base.Program);
+   nir_validate_shader(nir);
+
+   nir_lower_system_values(nir);
+   nir_validate_shader(nir);
+
    nir_lower_atomics(nir);
    nir_validate_shader(nir);
 
@@ -81,12 +87,6 @@ fs_visitor::emit_nir_code()
    nir_lower_vec_to_movs(nir);
    nir_validate_shader(nir);
 
-   nir_lower_samplers(nir, shader_prog, shader->base.Program);
-   nir_validate_shader(nir);
-
-   nir_lower_system_values(nir);
-   nir_validate_shader(nir);
-
    /* emit the arrays used for inputs and outputs - load/store intrinsics will
     * be converted to reads/writes of these arrays
     */