From 3d7d303dc5287ceddd9dea2e9a2ca0b9802a419e Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 17 Jan 2025 13:38:28 -0500
Subject: [PATCH] zink: enable maintenance8

this avoids validation errors from 3d<->2d blits

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33102>
---
 src/gallium/drivers/zink/VP_ZINK_requirements.json | 6 +++++-
 src/gallium/drivers/zink/zink_device_info.py       | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/VP_ZINK_requirements.json b/src/gallium/drivers/zink/VP_ZINK_requirements.json
index 4efef7efca9..0ee0f6780bc 100644
--- a/src/gallium/drivers/zink/VP_ZINK_requirements.json
+++ b/src/gallium/drivers/zink/VP_ZINK_requirements.json
@@ -401,7 +401,8 @@
                 "VK_EXT_attachment_feedback_loop_layout": 1,
                 "VK_EXT_attachment_feedback_loop_dynamic_state": 1,
                 "VK_KHR_maintenance6": 1,
-                "VK_KHR_maintenance7": 1
+                "VK_KHR_maintenance7": 1,
+                "VK_KHR_maintenance8": 1
             },
             "features": {
                 "VkPhysicalDeviceExtendedDynamicStateFeaturesEXT": {
@@ -443,6 +444,9 @@
                 },
                 "VkPhysicalDeviceMaintenance7FeaturesKHR": {
                     "maintenance7": true
+                },
+                "VkPhysicalDeviceMaintenance8FeaturesKHR": {
+                    "maintenance8": true
                 }
             },
             "properties": {
diff --git a/src/gallium/drivers/zink/zink_device_info.py b/src/gallium/drivers/zink/zink_device_info.py
index a25dc3f27e6..2af16c590e2 100644
--- a/src/gallium/drivers/zink/zink_device_info.py
+++ b/src/gallium/drivers/zink/zink_device_info.py
@@ -75,6 +75,9 @@ EXTENSIONS = [
     Extension("VK_KHR_maintenance7",
               alias="maint7",
               features=True, properties=True),
+    Extension("VK_KHR_maintenance8",
+              alias="maint8",
+              features=True),
     Extension("VK_KHR_external_memory"),
     Extension("VK_KHR_external_memory_fd"),
     Extension("VK_KHR_vulkan_memory_model"),