[Mesa-dev] [PATCH 04/15] st/glsl_to_nir: add gs support to st_nir_assign_var_locations()

[Timothy Arceri]

---
 src/mesa/state_tracker/st_glsl_to_nir.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index af6b6e2607..d1cd2ec3ab 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -115,40 +115,48 @@ st_nir_assign_vs_in_locations(struct gl_program *prog, nir_shader *nir)
           * set.
           */
          exec_node_remove(&var->node);
          var->data.mode = nir_var_global;
          exec_list_push_tail(&nir->globals, &var->node);
       }
    }
 }
 
 static void
-st_nir_assign_var_locations(struct exec_list *var_list, unsigned *size)
+st_nir_assign_var_locations(struct exec_list *var_list, unsigned *size,
+                            gl_shader_stage stage)
 {
    unsigned location = 0;
    unsigned assigned_locations[VARYING_SLOT_MAX];
    uint64_t processed_locs = 0;
 
    nir_foreach_variable(var, var_list) {
+
+      const struct glsl_type *type = var->type;
+      if (nir_is_per_vertex_io(var, stage)) {
+         assert(glsl_type_is_array(type));
+         type = glsl_get_array_element(type);
+      }
+
       /* Because component packing allows varyings to share the same location
        * we may have already have processed this location.
        */
       if (var->data.location >= VARYING_SLOT_VAR0 &&
           processed_locs & ((uint64_t)1 << var->data.location)) {
          var->data.driver_location = assigned_locations[var->data.location];
-         *size += type_size(var->type);
+         *size += type_size(type);
          continue;
       }
 
       assigned_locations[var->data.location] = location;
       var->data.driver_location = location;
-      location += type_size(var->type);
+      location += type_size(type);
 
       processed_locs |= ((uint64_t)1 << var->data.location);
    }
 
    *size += location;
 }
 
 static int
 st_nir_lookup_parameter_index(const struct gl_program_parameter_list *params,
                               const char *name)
@@ -638,29 +646,32 @@ st_finalize_nir(struct st_context *st, struct gl_program *prog,
    NIR_PASS_V(nir, nir_lower_io_arrays_to_elements_no_indirects);
 
    if (nir->info.stage == MESA_SHADER_VERTEX) {
       /* Needs special handling so drvloc matches the vbo state: */
       st_nir_assign_vs_in_locations(prog, nir);
       /* Re-lower global vars, to deal with any dead VS inputs. */
       NIR_PASS_V(nir, nir_lower_global_vars_to_local);
 
       sort_varyings(&nir->outputs);
       st_nir_assign_var_locations(&nir->outputs,
-                                  &nir->num_outputs);
+                                  &nir->num_outputs,
+                                  nir->info.stage);
       st_nir_fixup_varying_slots(st, &nir->outputs);
    } else if (nir->info.stage == MESA_SHADER_FRAGMENT) {
       sort_varyings(&nir->inputs);
       st_nir_assign_var_locations(&nir->inputs,
-                                  &nir->num_inputs);
+                                  &nir->num_inputs,
+                                  nir->info.stage);
       st_nir_fixup_varying_slots(st, &nir->inputs);
       st_nir_assign_var_locations(&nir->outputs,
-                                  &nir->num_outputs);
+                                  &nir->num_outputs,
+                                  nir->info.stage);
    } else if (nir->info.stage == MESA_SHADER_COMPUTE) {
        /* TODO? */
    } else {
       unreachable("invalid shader type for tgsi bypass\n");
    }
 
    NIR_PASS_V(nir, nir_lower_atomics_to_ssbo,
          st->ctx->Const.Program[nir->info.stage].MaxAtomicBuffers);
 
    st_nir_assign_uniform_locations(prog, shader_program,
-- 
2.14.3