From: Kenneth Graunke Date: Wed, 13 Jan 2016 23:07:18 +0000 (-0800) Subject: i965: Apply add_const_offset_to_base for vec4 VS inputs too. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3657cbf24f3b0baf7e3382e572d97a36b0ed4103;p=mesa.git i965: Apply add_const_offset_to_base for vec4 VS inputs too. This shouldn't hurt anything, and I'm about to introduce a pass that will want it. Signed-off-by: Kenneth Graunke Reviewed-by: Matt Turner --- diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index 55ba732dec2..935529a6003 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -220,6 +220,11 @@ brw_nir_lower_inputs(nir_shader *nir, */ nir_lower_io(nir, nir_var_shader_in, type_size_vec4); + /* This pass needs actual constants */ + nir_opt_constant_folding(nir); + + add_const_offset_to_base(nir, nir_var_shader_in); + if (is_scalar) { /* Finally, translate VERT_ATTRIB_* values into the actual registers. * @@ -229,11 +234,6 @@ brw_nir_lower_inputs(nir_shader *nir, */ GLbitfield64 inputs_read = nir->info.inputs_read; - /* This pass needs actual constants */ - nir_opt_constant_folding(nir); - - add_const_offset_to_base(nir, nir_var_shader_in); - nir_foreach_function(nir, function) { if (function->impl) { nir_foreach_block(function->impl, remap_vs_attrs, &inputs_read);