nvk: Re-enable zcull save/restore
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
macOS-CI / macOS-CI (xlib) (push) Waiting to run

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/work_items/15221
Reviewed-by: Mary Guillemard <mary@mary.zone>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41275>
This commit is contained in:
Mel Henning 2026-04-29 15:53:48 -04:00 committed by Marge Bot
parent 0a3eb2b9fb
commit 216c5c6dde

View file

@ -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) &&