summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Ĺšlusarz <marcin.slusarz@intel.com>2022-04-05 16:41:44 +0200
committerDylan Baker <dylan.c.baker@intel.com>2022-04-21 21:03:06 -0700
commit4a7765e9a77914d111e8b0a6b3de8af85173fb62 (patch)
treec355c095e7c6286984c7929bd1f71c2ab6bbb854
parent0c3ed4b2464d73b73dfcc5a98226a5aba58adaa7 (diff)
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@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15850> (cherry picked from commit f844ce66c8afc9104a6bd7c451afb02a8b9da5a8)
-rw-r--r--.pick_status.json2
-rw-r--r--src/intel/vulkan/anv_nir_compute_push_layout.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 6a4b7aa4f6f..387adaf2adf 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2748,7 +2748,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) -