<div dir="ltr"><div><div>For the series: </div>Reviewed-by: Marek OlÅ¡Ã¡k <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>> </div>Marek </div><div class="gmail_extra"> <div class="gmail_quote">On Thu, Mar 22, 2018 at 9:49 PM, Timothy Arceri <<a href="mailto:tarceri@itsqueeze.com" target="_blank">tarceri@itsqueeze.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Fixes piglit test: tests/spec/arb_enhanced_layouts/execution/component-layout/vs-fs-array-interleave-range.shader_test --- Â src/mesa/state_tracker/st_glsl_to_nir.cpp | 24 +++++++++++++++++++++++- Â 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index e0467f205d3..4ded4ec60f5 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -133,6 +133,7 @@ st_nir_assign_var_locations(struct exec_list *var_list, unsigned *size, Â Â const int base = stage == MESA_SHADER_FRAGMENT ? Â Â Â Â (int) FRAG_RESULT_DATA0 : (int) VARYING_SLOT_VAR0; +Â Â int UNUSED last_loc = 0; Â Â nir_foreach_variable(var, var_list) { Â Â Â Â const struct glsl_type *type = var->type; @@ -164,8 +165,29 @@ st_nir_assign_var_locations(struct exec_list *var_list, unsigned *size, Â Â Â Â * we may have already have processed this location. Â Â Â Â */ Â Â Â Â if (processed) { -Â Â Â Â Â var->data.driver_location = assigned_locations[var->data.location]; +Â Â Â Â Â unsigned driver_location = assigned_locations[var->data.location]; +Â Â Â Â Â var->data.driver_location = driver_location; Â Â Â Â Â *size += type_size(type); + +Â Â Â Â Â /* An array may be packed such that is crosses multiple other arrays +Â Â Â Â Â * or variables, we need to make sure we have allocated the elements +Â Â Â Â Â * consecutively if the previously proccessed var was shorter than +Â Â Â Â Â * the current array we are processing. +Â Â Â Â Â * +Â Â Â Â Â * NOTE: The code below assumes the var list is ordered in ascending +Â Â Â Â Â * location order. +Â Â Â Â Â */ +Â Â Â Â Â assert(last_loc <= var->data.location); +Â Â Â Â Â last_loc = var->data.location; +Â Â Â Â Â unsigned last_slot_location = driver_location + var_size; +Â Â Â Â Â if (last_slot_location > location) { +Â Â Â Â Â Â unsigned num_unallocated_slots = last_slot_location - location; +Â Â Â Â Â Â unsigned first_unallocated_slot = var_size - num_unallocated_slots; +Â Â Â Â Â Â for (unsigned i = first_unallocated_slot; i < num_unallocated_slots; i++) { +Â Â Â Â Â Â Â Â assigned_locations[var->data.location + i] = location; +Â Â Â Â Â Â Â Â location++; +Â Â Â Â Â Â } +Â Â Â Â Â } Â Â Â Â Â continue; Â Â Â Â } -- 2.14.3 _______________________________________________ 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>