From 216c5c6dde9e2b239cfb550a2f860330bca12a21 Mon Sep 17 00:00:00 2001 From: Mel Henning Date: Wed, 29 Apr 2026 15:53:48 -0400 Subject: [PATCH] nvk: Re-enable zcull save/restore Closes: https://gitlab.freedesktop.org/mesa/mesa/-/work_items/15221 Reviewed-by: Mary Guillemard Part-of: --- src/nouveau/vulkan/nvk_image.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c index 896d605b626..9af49253c99 100644 --- a/src/nouveau/vulkan/nvk_image.c +++ b/src/nouveau/vulkan/nvk_image.c @@ -1068,12 +1068,7 @@ nvk_image_init(struct nvk_device *dev, const VkImageUsageFlagBits ZCULL_COMPATIBLE_IMAGE_USAGE = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | READ_ONLY_IMAGE_USAGE; - /* Disable zcull save/restore regions until - * https://gitlab.freedesktop.org/mesa/mesa/-/work_items/15221 - * is fixed. - */ - if (false && - (image->vk.aspects & VK_IMAGE_ASPECT_DEPTH_BIT) && + if ((image->vk.aspects & VK_IMAGE_ASPECT_DEPTH_BIT) && (image->vk.usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) && !(image->vk.usage & ~ZCULL_COMPATIBLE_IMAGE_USAGE) && !(image->vk.create_flags & VK_IMAGE_CREATE_SPARSE_BINDING_BIT) &&