From f39520e02c262e5f26829e5924810cf20b68c50c Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Fri, 14 Jun 2024 18:50:59 -0500 Subject: [PATCH] nvk: Dirty cbufs in CmdPushDescriptorSetWithTemplate2KHR Fixes: 091a945b5799 ("nvk: Be much more conservative about rebinding cbufs") Part-of: --- src/nouveau/vulkan/nvk_cmd_buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c index 5d47ce0f3c5..448e603fc73 100644 --- a/src/nouveau/vulkan/nvk_cmd_buffer.c +++ b/src/nouveau/vulkan/nvk_cmd_buffer.c @@ -1005,11 +1005,13 @@ nvk_CmdPushDescriptorSetWithTemplate2KHR( return; struct nvk_descriptor_set_layout *set_layout = - vk_to_nvk_descriptor_set_layout(pipeline_layout->set_layouts[pPushDescriptorSetWithTemplateInfo->set]); + vk_to_nvk_descriptor_set_layout(pipeline_layout->set_layouts[set]); nvk_push_descriptor_set_update_template(dev, push_set, set_layout, template, pPushDescriptorSetWithTemplateInfo->pData); - nvk_cmd_dirty_cbufs_for_descriptors(cmd, info->stageFlags, + /* We don't know the actual set of stages here so assume everything */ + nvk_cmd_dirty_cbufs_for_descriptors(cmd, NVK_VK_GRAPHICS_STAGE_BITS | + VK_SHADER_STAGE_COMPUTE_BIT, set, set + 1, 0, 0); }