From 44ec31cd75f679b32afb03c3c9c46762e57ce506 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 31 Aug 2018 07:35:17 -0500 Subject: nir: Drop the vs_inputs_dual_locations option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was very inconsistently handled; the only things that made use of it were glsl_to_nir, glspirv, and nir_gather_info. In particular, nir_lower_io completely ignored it so anyone using nir_lower_io on 64-bit vertex attributes was going to be in for a shock. Also, as of the previous commit, it's set by every driver that supports 64-bit vertex attributes. There's no longer any reason to have it be an option so let's just delete it. Reviewed-by: Alejandro Piñeiro Reviewed-by: Timothy Arceri --- src/mesa/main/glspirv.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/main/glspirv.c b/src/mesa/main/glspirv.c index c53fe0bd07c..fecf7384eb3 100644 --- a/src/mesa/main/glspirv.c +++ b/src/mesa/main/glspirv.c @@ -263,12 +263,8 @@ _mesa_spirv_to_nir(struct gl_context *ctx, NIR_PASS_V(nir, nir_split_var_copies); NIR_PASS_V(nir, nir_split_per_member_structs); - if (nir->info.stage == MESA_SHADER_VERTEX) { - uint64_t dual_slot_inputs = nir_get_dual_slot_attributes(nir); - if (options->vs_inputs_dual_locations) - nir_remap_dual_slot_attributes(nir, dual_slot_inputs); - linked_shader->Program->DualSlotInputs = dual_slot_inputs; - } + if (nir->info.stage == MESA_SHADER_VERTEX) + nir_remap_dual_slot_attributes(nir, &linked_shader->Program->DualSlotInputs); return nir; } -- cgit v1.2.3