Mesa (staging/20.1): pan/mdg: Fix spilling of non-32-bit types

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 4e544d1f5f028758d3c9041970e1d7d4f03a9fed
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4e544d1f5f028758d3c9041970e1d7d4f03a9fed

Author: Icecream95 <ixn at keemail.me>
Date:   Wed Sep  9 18:22:00 2020 +1200

pan/mdg: Fix spilling of non-32-bit types

The source argument for mov has index 1, not 0.

Fixes a vertex shader in SuperTuxKart.

Fixes: b4de9e035ac ("pan/mdg: Mask spills from texture write")
Reported-by: macc24
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>~
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6659>
(cherry picked from commit a4885d26915d290192f3bb5e5f50355cfa266a59)

---

 .pick_status.json                 | 2 +-
 src/panfrost/midgard/midgard_ra.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index afbd6847168..08f891a8010 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -202,7 +202,7 @@
         "description": "pan/mdg: Fix spilling of non-32-bit types",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "b4de9e035ac0afe64ebfd58cd0eb04c1a671afce"
     },
diff --git a/src/panfrost/midgard/midgard_ra.c b/src/panfrost/midgard/midgard_ra.c
index c545bed5e17..8869a048957 100644
--- a/src/panfrost/midgard/midgard_ra.c
+++ b/src/panfrost/midgard/midgard_ra.c
@@ -845,7 +845,7 @@ mir_spill_register(
                                 st = v_mov(spill_node, spill_slot);
                                 st.no_spill |= (1 << spill_class);
                                 st.mask = ins->mask;
-                                st.dest_type = st.src_types[0] = ins->dest_type;
+                                st.dest_type = st.src_types[1] = ins->dest_type;
                         } else {
                                 ins->dest = spill_index++;
                                 ins->no_spill |= (1 << spill_class);