From 57bab6708f2bbc1ab8a3d202e9a467963596d462 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alejandro=20Pi=C3=B1eiro?= Date: Fri, 22 Apr 2016 10:49:24 +0200 Subject: [PATCH] i965/vec4/nir: vec4 also needs to remap vs attributes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Doubles need extra space, so we would need to do a remapping for vec4 too in order to take that into account. We reuse the already existing remap_vs_attrs, but passing is_scalar, so they could remap accordingly. v2: code-format remap_vs_attrs_params initialization (Matt) Signed-off-by: Alejandro Piñeiro Signed-off-by: Juan A. Suarez Romero Reviewed-by: Jordan Justen --- src/mesa/drivers/dri/i965/brw_nir.c | 32 ++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index 3c1bc5162fc..b39e2b1f523 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -95,9 +95,19 @@ add_const_offset_to_base(nir_shader *nir, nir_variable_mode mode) } } +struct remap_vs_attrs_params { + shader_info *nir_info; + bool is_scalar; +}; + static bool -remap_vs_attrs(nir_block *block, shader_info *nir_info) +remap_vs_attrs(nir_block *block, void *closure) { + struct remap_vs_attrs_params *params = + (struct remap_vs_attrs_params *) closure; + shader_info *nir_info = params->nir_info; + bool is_scalar = params->is_scalar; + nir_foreach_instr(instr, block) { if (instr->type != nir_instr_type_intrinsic) continue; @@ -113,7 +123,7 @@ remap_vs_attrs(nir_block *block, shader_info *nir_info) int attr = intrin->const_index[0]; int slot = _mesa_bitcount_64(nir_info->inputs_read & BITFIELD64_MASK(attr)); - intrin->const_index[0] = 4 * slot; + intrin->const_index[0] = is_scalar ? 4 * slot : slot; } } return true; @@ -257,6 +267,11 @@ brw_nir_lower_vs_inputs(nir_shader *nir, bool use_legacy_snorm_formula, const uint8_t *vs_attrib_wa_flags) { + struct remap_vs_attrs_params params = { + .nir_info = nir->info, + .is_scalar = is_scalar + }; + /* Start with the location of the variable's base. */ foreach_list_typed(nir_variable, var, node, &nir->inputs) { var->data.driver_location = var->data.location; @@ -276,14 +291,11 @@ brw_nir_lower_vs_inputs(nir_shader *nir, brw_nir_apply_attribute_workarounds(nir, use_legacy_snorm_formula, vs_attrib_wa_flags); - if (is_scalar) { - /* Finally, translate VERT_ATTRIB_* values into the actual registers. */ - - nir_foreach_function(function, nir) { - if (function->impl) { - nir_foreach_block(block, function->impl) { - remap_vs_attrs(block, nir->info); - } + /* Finally, translate VERT_ATTRIB_* values into the actual registers. */ + nir_foreach_function(function, nir) { + if (function->impl) { + nir_foreach_block(block, function->impl) { + remap_vs_attrs(block, ¶ms); } } } -- 2.30.2