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

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Jason Ekstrand 2014-12-15 16:12:04 -08:00
parent 5c16be1c52
commit 951a7f23a0

View file

@ -69,6 +69,12 @@ fs_visitor::emit_nir_code()
nir_remove_dead_variables(nir); nir_remove_dead_variables(nir);
nir_validate_shader(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_lower_atomics(nir);
nir_validate_shader(nir); nir_validate_shader(nir);
@ -81,12 +87,6 @@ fs_visitor::emit_nir_code()
nir_lower_vec_to_movs(nir); nir_lower_vec_to_movs(nir);
nir_validate_shader(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 /* emit the arrays used for inputs and outputs - load/store intrinsics will
* be converted to reads/writes of these arrays * be converted to reads/writes of these arrays
*/ */