zink: use KHR version of maint5 features

This is still not in Vulkan core, so we can't refer to it without the
KHR suffix.

Fixes: f501f9453ad ("zink: use maintenance5")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26419>
(cherry picked from commit 5024b212b6224a67d60d472c12062639185a3916)

diff --git a/.pick_status.json b/.pick_status.json
index 7f26a41..cb50a26 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -54,7 +54,7 @@
         "description": "zink: use KHR version of maint5 features",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f501f9453adc7024584e9d9598754c55c36d20f3",
         "notes": null

diff --git a/src/gallium/drivers/zink/VP_ZINK_requirements.json b/src/gallium/drivers/zink/VP_ZINK_requirements.json
index 9ec7bc1..a1a09d8 100644 (file)
--- a/src/gallium/drivers/zink/VP_ZINK_requirements.json
+++ b/src/gallium/drivers/zink/VP_ZINK_requirements.json
@@ -164,7 +164,7 @@
                 "VkPhysicalDeviceMaintenance4Features": {
                     "maintenance4": true
                 },
-                "VkPhysicalDeviceMaintenance5Features": {
+                "VkPhysicalDeviceMaintenance5FeaturesKHR": {
                     "maintenance5": true
                 }
             },