nvk/meta: Fix restore for descriptor set 0

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand 2023-01-30 20:12:03 -06:00 committed by Marge Bot
parent 1a94c55632
commit 1c3dc8c632

View file

@ -99,7 +99,9 @@ nvk_meta_end(struct nvk_cmd_buffer *cmd,
{ {
if (save->desc0) { if (save->desc0) {
cmd->state.gfx.descriptors.sets[0] = save->desc0; cmd->state.gfx.descriptors.sets[0] = save->desc0;
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.sets_dirty |= BITFIELD_BIT(0);
cmd->state.gfx.descriptors.push_dirty &= ~BITFIELD_BIT(0);
} else if (save->has_push_desc0) { } else if (save->has_push_desc0) {
*cmd->state.gfx.descriptors.push[0] = save->push_desc0; *cmd->state.gfx.descriptors.push[0] = save->push_desc0;
cmd->state.gfx.descriptors.push_dirty |= BITFIELD_BIT(0); cmd->state.gfx.descriptors.push_dirty |= BITFIELD_BIT(0);