From ac11cb0f72b24dc1b421b6459dfd8f78a2c69f72 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Tue, 30 Jan 2024 11:35:26 -0600 Subject: [PATCH] nvk: Call lower_compute_system_values after zer_initialize_workgroup_memory Fixes: 184bcfdc1c3c ("nvk: Implement VK_KHR_zero_initialize_workgroup_memory") Part-of: --- src/nouveau/vulkan/nvk_shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/nouveau/vulkan/nvk_shader.c b/src/nouveau/vulkan/nvk_shader.c index ffe879e1f1d..d121a48a76b 100644 --- a/src/nouveau/vulkan/nvk_shader.c +++ b/src/nouveau/vulkan/nvk_shader.c @@ -401,6 +401,12 @@ nvk_lower_nir(struct nvk_device *dev, nir_shader *nir, nir->info.shared_size = align(nir->info.shared_size, 16); NIR_PASS(_, nir, nir_zero_initialize_shared_memory, nir->info.shared_size, 16); + + /* We need to call lower_compute_system_values again because + * nir_zero_initialize_shared_memory generates load_invocation_id which + * has to be lowered to load_invocation_index. + */ + NIR_PASS(_, nir, nir_lower_compute_system_values, NULL); } }