Attachment 128937 Details for Bug 99391 – Revert "i965/vec4/nir: vec4 also needs to remap vs attributes"

[patch] Revert "i965/vec4/nir: vec4 also needs to remap vs attributes"

Revert-i965vec4nir-vec4-also-needs-to-remap-vs-att.patch (text/plain), 2.87 KB, created by Juan A. Suarez on 2017-01-13 18:11:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juan A. Suarez

Created: 2017-01-13 18:11:18 UTC

Size: 2.87 KB

patch

obsolete

>From 871d21060589ff1a59bf7767787e2f348a888d2e Mon Sep 17 00:00:00 2001
>From: "Juan A. Suarez Romero" <jasuarez@igalia.com>
>Date: Fri, 13 Jan 2017 17:47:57 +0100
>Subject: [PATCH] Revert "i965/vec4/nir: vec4 also needs to remap vs
> attributes"
>
>Do not perform a remap in vec4 backend. Rather, do it later when setup
>attributes
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99391
>---
> src/mesa/drivers/dri/i965/brw_nir.c | 32 ++++++++++----------------------
> 1 file changed, 10 insertions(+), 22 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c
>index b39e2b1..3c1bc51 100644
>--- a/src/mesa/drivers/dri/i965/brw_nir.c
>+++ b/src/mesa/drivers/dri/i965/brw_nir.c
>@@ -95,19 +95,9 @@ 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, void *closure)
>+remap_vs_attrs(nir_block *block, shader_info *nir_info)
> {
>-   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;
>@@ -123,7 +113,7 @@ remap_vs_attrs(nir_block *block, void *closure)
>          int attr = intrin->const_index[0];
>          int slot = _mesa_bitcount_64(nir_info->inputs_read &
>                                       BITFIELD64_MASK(attr));
>-         intrin->const_index[0] = is_scalar ? 4 * slot : slot;
>+         intrin->const_index[0] = 4 * slot;
>       }
>    }
>    return true;
>@@ -267,11 +257,6 @@ 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;
>@@ -291,11 +276,14 @@ brw_nir_lower_vs_inputs(nir_shader *nir,
>    brw_nir_apply_attribute_workarounds(nir, use_legacy_snorm_formula,
>                                        vs_attrib_wa_flags);
> 
>-   /* 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, &params);
>+   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);
>+            }
>          }
>       }
>    }
>-- 
>2.9.3

Actions: View | Splinter Review

Attachments on bug 99391: 128937 | 128938

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.