Mesa (staging/22.0): anv: fix push constant lowering for task/mesh

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 15966c813a62b4ac541cd45d18a742f4ee52c231
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=15966c813a62b4ac541cd45d18a742f4ee52c231

Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date:   Tue Apr  5 16:41:44 2022 +0200

anv: fix push constant lowering for task/mesh

Fixes: a6031cd9bd4 ("anv: fix push constant lowering with bindless shaders")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15850>
(cherry picked from commit f844ce66c8afc9104a6bd7c451afb02a8b9da5a8)

---

 .pick_status.json                              | 2 +-
 src/intel/vulkan/anv_nir_compute_push_layout.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4a114be3745..ef6a304349c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -676,7 +676,7 @@
         "description": "anv: fix push constant lowering for task/mesh",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "a6031cd9bd409c793c3a2928eaf9f04f09d2f55a"
     },
     {
diff --git a/src/intel/vulkan/anv_nir_compute_push_layout.c b/src/intel/vulkan/anv_nir_compute_push_layout.c
index df6d0af3cae..34868e090b8 100644
--- a/src/intel/vulkan/anv_nir_compute_push_layout.c
+++ b/src/intel/vulkan/anv_nir_compute_push_layout.c
@@ -157,7 +157,7 @@ anv_nir_compute_push_layout(const struct anv_physical_device *pdevice,
                    * brw_nir_lower_rt_intrinsics.c).
                    */
                   unsigned base_offset =
-                     brw_shader_stage_is_bindless(nir->info.stage) ? 0 : push_start;
+                     brw_shader_stage_requires_bindless_resources(nir->info.stage) ? 0 : push_start;
                   intrin->intrinsic = nir_intrinsic_load_uniform;
                   nir_intrinsic_set_base(intrin,
                                          nir_intrinsic_base(intrin) -