Mesa (staging/21.2): nir/lower_shader_calls: adding missing stack offset alignment

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 72eeeba3339fe61900caff739c77266bc9414658
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=72eeeba3339fe61900caff739c77266bc9414658

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Mon Jul 26 20:16:01 2021 +0300

nir/lower_shader_calls: adding missing stack offset alignment

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: 8dfb240b1f0633 ("nir: Add raytracing shader call lowering pass.")
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12112>
(cherry picked from commit 7e3bad0f8ec1eb9b1bd5d3b2089d45c0717be4c8)

---

 .pick_status.json                         | 2 +-
 src/compiler/nir/nir_lower_shader_calls.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index f51b0858278..f4c2a7533f1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -184,7 +184,7 @@
         "description": "nir/lower_shader_calls: adding missing stack offset alignment",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8dfb240b1f063307aa5e53fb1bd0865105eef986"
     },
diff --git a/src/compiler/nir/nir_lower_shader_calls.c b/src/compiler/nir/nir_lower_shader_calls.c
index b887db02bd6..e1398bf25ae 100644
--- a/src/compiler/nir/nir_lower_shader_calls.c
+++ b/src/compiler/nir/nir_lower_shader_calls.c
@@ -459,6 +459,7 @@ spill_ssa_defs_and_lower_shader_calls(nir_shader *shader, uint32_t num_calls,
 
          nir_builder *b = &before;
 
+         offset = ALIGN(offset, stack_alignment);
          max_scratch_size = MAX2(max_scratch_size, offset);
 
          /* First thing on the called shader's stack is the resume address