From 09cd484d6113b76572fd16a2ad834d2660c62cf7 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 14 Dec 2017 17:22:23 +1100 Subject: [PATCH] nir: partially revert c2acf97fcc9b32e c2acf97fcc9b32e changed the use of double_inputs_read to be inconsitent with its previous meaning. Here we re-enable the gather info code that was removed as the modified code from c2acf97fcc9b32e now uses the double_inputs member rather than double_inputs_read. This change allows us to use double_inputs_read with gallium drivers without impacting double_inputs which is used by i965. We also make use of the compiler option vs_inputs_dual_locations to allow for the difference in behaviour between drivers that handle vs inputs as taking up two locations for doubles, versus those that treat them as taking a single location. Reviewed-by: Karol Herbst --- src/compiler/nir/nir_gather_info.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/compiler/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c index e98129b22c8..743f968035b 100644 --- a/src/compiler/nir/nir_gather_info.c +++ b/src/compiler/nir/nir_gather_info.c @@ -54,6 +54,11 @@ set_io_mask(nir_shader *shader, nir_variable *var, int offset, int len, else shader->info.inputs_read |= bitfield; + /* double inputs read is only for vertex inputs */ + if (shader->info.stage == MESA_SHADER_VERTEX && + glsl_type_is_dual_slot(glsl_without_array(var->type))) + shader->info.vs.double_inputs_read |= bitfield; + if (shader->info.stage == MESA_SHADER_FRAGMENT) { shader->info.fs.uses_sample_qualifier |= var->data.sample; } @@ -88,21 +93,27 @@ static void mark_whole_variable(nir_shader *shader, nir_variable *var, bool is_output_read) { const struct glsl_type *type = var->type; + bool is_vertex_input = false; if (nir_is_per_vertex_io(var, shader->info.stage)) { assert(glsl_type_is_array(type)); type = glsl_get_array_element(type); } + if (!shader->options->vs_inputs_dual_locations && + shader->info.stage == MESA_SHADER_VERTEX && + var->data.mode == nir_var_shader_in) + is_vertex_input = true; + const unsigned slots = var->data.compact ? DIV_ROUND_UP(glsl_get_length(type), 4) - : glsl_count_attribute_slots(type, false); + : glsl_count_attribute_slots(type, is_vertex_input); set_io_mask(shader, var, 0, slots, is_output_read); } static unsigned -get_io_offset(nir_deref_var *deref) +get_io_offset(nir_deref_var *deref, bool is_vertex_input) { unsigned offset = 0; @@ -117,7 +128,7 @@ get_io_offset(nir_deref_var *deref) return -1; } - offset += glsl_count_attribute_slots(tail->type, false) * + offset += glsl_count_attribute_slots(tail->type, is_vertex_input) * deref_array->base_offset; } /* TODO: we can get the offset for structs here see nir_lower_io() */ @@ -163,7 +174,13 @@ try_mask_partial_io(nir_shader *shader, nir_deref_var *deref, bool is_output_rea return false; } - unsigned offset = get_io_offset(deref); + bool is_vertex_input = false; + if (!shader->options->vs_inputs_dual_locations && + shader->info.stage == MESA_SHADER_VERTEX && + var->data.mode == nir_var_shader_in) + is_vertex_input = true; + + unsigned offset = get_io_offset(deref, is_vertex_input); if (offset == -1) return false; @@ -179,7 +196,8 @@ try_mask_partial_io(nir_shader *shader, nir_deref_var *deref, bool is_output_rea } /* double element width for double types that takes two slots */ - if (glsl_type_is_dual_slot(glsl_without_array(type))) { + if (!is_vertex_input && + glsl_type_is_dual_slot(glsl_without_array(type))) { elem_width *= 2; } @@ -235,7 +253,6 @@ gather_intrinsic_info(nir_intrinsic_instr *instr, nir_shader *shader) for (uint i = 0; i < glsl_count_attribute_slots(var->type, false); i++) { int idx = var->data.location + i; shader->info.vs.double_inputs |= BITFIELD64_BIT(idx); - shader->info.vs.double_inputs_read |= BITFIELD64_BIT(idx); } } } -- 2.30.2