freedreno/ir3: Fix driver_location of the added vertex_flags varying.

It was ignoring the sizes of the output variables and assuming
single-slot, and failing to update num_outputs.

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Reviewed-by: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4670>
This commit is contained in:
Eric Anholt 2020-04-22 13:27:20 -07:00 committed by Marge Bot
parent e82ce1852a
commit ac937bf878

View file

@ -890,15 +890,9 @@ ir3_nir_lower_gs(nir_shader *shader, struct ir3_shader *s)
build_primitive_map(shader, &state.map, &shader->inputs);
uint32_t loc = 0;
nir_foreach_variable (var, &shader->outputs) {
uint32_t end = var->data.driver_location + glsl_count_attribute_slots(var->type, false);
loc = MAX2(loc, end);
}
state.vertex_flags_out = nir_variable_create(shader, nir_var_shader_out,
glsl_uint_type(), "vertex_flags");
state.vertex_flags_out->data.driver_location = loc;
state.vertex_flags_out->data.driver_location = shader->num_outputs++;
state.vertex_flags_out->data.location = VARYING_SLOT_GS_VERTEX_FLAGS_IR3;
nir_function_impl *impl = nir_shader_get_entrypoint(shader);