From facfe6c0d8591ce4bb8131cce06725f8322afa01 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Fri, 26 Jun 2020 12:25:01 +0200 Subject: [PATCH] v3d/compiler: fix spill offset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Alejandro Piñeiro Reviewed-by: Jose Maria Casanova Crespo Fixes: 97566efe5cac0ff11b ("v3d: Rematerialize MOVs of uniforms instead of spilling them.") Part-of: (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 598b14c9d41..559a91b2fd6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3136,7 +3136,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)