diff options
| author | Icecream95 <ixn@keemail.me> | 2020-09-09 18:22:00 +1200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-09-16 19:23:26 +0200 |
| commit | b5531f571b50f448f48690a087c35639f8ec395b (patch) | |
| tree | 51473747dc2c3d9728218578c61a9a44f2cc1cdd | |
| parent | a57ecd7fe7ca6718f0c132babcf78b28191868a3 (diff) | |
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@collabora.com>~
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6659>
(cherry picked from commit a4885d26915d290192f3bb5e5f50355cfa266a59)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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 c066f416753..e3cf16b390d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1156,7 +1156,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); |