Mesa (master): tgsi_to_nir: fix 2-component system values like tess_level_inner_default

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Sep 18 15:12:30 2019 -0400

tgsi_to_nir: fix 2-component system values like tess_level_inner_default

Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/gallium/auxiliary/nir/tgsi_to_nir.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index b92a4485e4c..88e9963e030 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -659,7 +659,9 @@ ttn_src_for_file_and_index(struct ttn_compile *c, unsigned file, unsigned index,
          unreachable("bad system value");
       }
 
-      if (load->num_components == 3)
+      if (load->num_components == 2)
+         load = nir_swizzle(b, load, SWIZ(X, Y, Y, Y), 4);
+      else if (load->num_components == 3)
          load = nir_swizzle(b, load, SWIZ(X, Y, Z, Z), 4);
 
       src = nir_src_for_ssa(load);