<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Thu, Jul 14, 2016 at 10:49 AM, Kenneth Graunke <<a href="mailto:kenneth@whitecape.org" target="_blank">kenneth@whitecape.org</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Less typing and word wrapping issues than intrin->variables[0]->var. Signed-off-by: Kenneth Graunke <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>> --- src/compiler/nir/nir_lower_io.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index c25790a..9b53eff 100644 --- a/src/compiler/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c @@ -265,7 +265,8 @@ nir_lower_io_block(nir_block *block, continue; } - nir_variable_mode mode = intrin->variables[0]->var->data.mode; + nir_variable *var = intrin->variables[0]->var; + nir_variable_mode mode = var->data.mode; if ((state->modes & mode) == 0) continue; @@ -280,9 +281,9 @@ nir_lower_io_block(nir_block *block, switch (intrin->intrinsic) { case nir_intrinsic_load_var: { - bool per_vertex = - is_per_vertex_input(state, intrin->variables[0]->var) || - is_per_vertex_output(state, intrin->variables[0]->var); + const bool per_vertex = + is_per_vertex_input(state, var) || + is_per_vertex_output(state, var); nir_ssa_def *offset; nir_ssa_def *vertex_index; @@ -297,15 +298,13 @@ nir_lower_io_block(nir_block *block, load->num_components = intrin->num_components; nir_intrinsic_set_base(load, - intrin->variables[0]->var->data.driver_location); + var->data.driver_location); </blockquote><div> </div><div>Does this still need to be wrapped? </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> if (mode == nir_var_shader_in || mode == nir_var_shader_out) { - nir_intrinsic_set_component(load, - intrin->variables[0]->var->data.location_frac); + nir_intrinsic_set_component(load, var->data.location_frac); } if (load->intrinsic == nir_intrinsic_load_uniform) { - nir_intrinsic_set_range(load, - state->type_size(intrin->variables[0]->var->type)); + nir_intrinsic_set_range(load, state->type_size(var->type)); } if (per_vertex) @@ -334,8 +333,7 @@ nir_lower_io_block(nir_block *block, nir_ssa_def *offset; nir_ssa_def *vertex_index; - bool per_vertex = - is_per_vertex_output(state, intrin->variables[0]->var); + const bool per_vertex = is_per_vertex_output(state, var); offset = get_io_offset(b, intrin->variables[0], per_vertex ? &vertex_index : NULL, @@ -349,10 +347,9 @@ nir_lower_io_block(nir_block *block, nir_src_copy(&store->src[0], &intrin->src[0], store); nir_intrinsic_set_base(store, - intrin->variables[0]->var->data.driver_location); + var->data.driver_location); </blockquote><div> </div><div>Same here </div><div>Other than that, nice cleanup! </div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> if (mode == nir_var_shader_out) { - nir_intrinsic_set_component(store, - intrin->variables[0]->var->data.location_frac); + nir_intrinsic_set_component(store, var->data.location_frac); } nir_intrinsic_set_write_mask(store, nir_intrinsic_write_mask(intrin)); @@ -389,8 +386,7 @@ nir_lower_io_block(nir_block *block, atomic->src[0] = nir_src_for_ssa(offset); - atomic->const_index[0] = - intrin->variables[0]->var->data.driver_location; + atomic->const_index[0] = var->data.driver_location; for (unsigned i = 0; i < nir_op_infos[intrin->intrinsic].num_inputs; -- 2.9.0 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div></div>