Mesa (staging/20.1): v3d/compiler: fix spill offset

[GitLab Mirror]

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

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Fri Jun 26 12:25:01 2020 +0200

v3d/compiler: fix spill offset

Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Reviewed-by: Jose Maria Casanova Crespo <jmcasanova at igalia.com>
Fixes: 97566efe5cac0ff11b ("v3d: Rematerialize MOVs of uniforms instead of spilling them.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5664>
(cherry picked from commit 653dff949e93a8dc53924387f7b18328d14ebc60)

---

 .pick_status.json                             | 2 +-
 src/broadcom/compiler/vir_register_allocate.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 35cdb930247..ab5e1a0a082 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -76,7 +76,7 @@
         "description": "v3d/compiler: fix spill offset",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "97566efe5cac0ff11b23d8f27001fc98c7cea2af"
     },
diff --git a/src/broadcom/compiler/vir_register_allocate.c b/src/broadcom/compiler/vir_register_allocate.c
index d88a8df1141..87198fb0f08 100644
--- a/src/broadcom/compiler/vir_register_allocate.c
+++ b/src/broadcom/compiler/vir_register_allocate.c
@@ -213,7 +213,7 @@ v3d_spill_reg(struct v3d_compile *c, int spill_temp)
         uint32_t spill_offset = 0;
 
         if (!is_uniform) {
-                uint32_t spill_offset = c->spill_size;
+                spill_offset = c->spill_size;
                 c->spill_size += V3D_CHANNELS * sizeof(uint32_t);
 
                 if (spill_offset == 0)