From d68141bd685c56512e2e8ec3268e2d315d49098b Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Fri, 10 May 2024 14:56:38 -0500 Subject: [PATCH] nvk/meta: Restore set_sizes[0] Fixes: af3e7ba1057e ("nvk: Stash descriptor set sizes") Part-of: (cherry picked from commit c834644c4e4b39d65003b455e3be5e129767200d) --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_cmd_meta.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index fed9a62e22c..b00b0a6dd9a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -484,7 +484,7 @@ "description": "nvk/meta: Restore set_sizes[0]", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "af3e7ba1057e122c9ccd6d0f09b233ca8278af28", "notes": null diff --git a/src/nouveau/vulkan/nvk_cmd_meta.c b/src/nouveau/vulkan/nvk_cmd_meta.c index 39135ae5967..bb354901222 100644 --- a/src/nouveau/vulkan/nvk_cmd_meta.c +++ b/src/nouveau/vulkan/nvk_cmd_meta.c @@ -130,6 +130,7 @@ nvk_meta_end(struct nvk_cmd_buffer *cmd, { if (save->desc0) { cmd->state.gfx.descriptors.sets[0] = save->desc0; + cmd->state.gfx.descriptors.set_sizes[0] = save->desc0->size; cmd->state.gfx.descriptors.root.sets[0] = nvk_descriptor_set_addr(save->desc0); cmd->state.gfx.descriptors.sets_dirty |= BITFIELD_BIT(0); cmd->state.gfx.descriptors.push_dirty &= ~BITFIELD_BIT(0);