From 951a7f23a076c1570f68b50fc7d03a33eb5145e7 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 15 Dec 2014 16:12:04 -0800 Subject: i965/nir: Move the other lowering passes to before out-of-SSA Reviewed-by: Connor Abbott --- src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') 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 */ -- cgit v1.2.3