[Mesa-dev] [PATCH 131/133] i965/nir: Move the other lowering passes to before out-of-SSA

[Jason Ekstrand]

---
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index 060912e..2cf9780 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
     */
-- 
2.2.0