Mesa (master): etnaviv: nir: set num_components for inputs/outputs

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 95fa799c86e062c40004031c2c0028d5e59d8cab
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=95fa799c86e062c40004031c2c0028d5e59d8cab

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Wed Sep 11 16:45:05 2019 -0400

etnaviv: nir: set num_components for inputs/outputs

This can improve performance by allowing the LAST_VARYING_2X bit to be
set when possible (and possibility more benefits on HALTI5 where the
number of components is set for each varying).

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>

---

 src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
index a00f89b4e21..cc03e59fede 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
@@ -596,7 +596,7 @@ etna_compile_shader_nir(struct etna_shader_variant *v)
          unsigned idx = var->data.driver_location;
          sf->reg[idx].reg = idx;
          sf->reg[idx].slot = var->data.location;
-         sf->reg[idx].num_components = 4; /* TODO */
+         sf->reg[idx].num_components = glsl_get_components(var->type);
          sf->num_reg = MAX2(sf->num_reg, idx+1);
       }
    } else {
@@ -605,7 +605,7 @@ etna_compile_shader_nir(struct etna_shader_variant *v)
          unsigned idx = var->data.driver_location;
          sf->reg[idx].reg = idx + 1;
          sf->reg[idx].slot = var->data.location;
-         sf->reg[idx].num_components = 4; /* TODO */
+         sf->reg[idx].num_components = glsl_get_components(var->type);
          sf->num_reg = MAX2(sf->num_reg, idx+1);
          count++;
       }
@@ -740,7 +740,7 @@ etna_compile_shader_nir(struct etna_shader_variant *v)
 
       sf->reg[sf->num_reg].reg = native;
       sf->reg[sf->num_reg].slot = var->data.location;
-      sf->reg[sf->num_reg].num_components = 4; /* TODO */
+      sf->reg[sf->num_reg].num_components = glsl_get_components(var->type);
       sf->num_reg++;
    }