zink: require VK_KHR_descriptor_update_template

it's been long enough, and there's no technical reason why drivers
shouldn't have this implemented

ZINK_DESCRIPTORS environment variable is preserved for future use

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18065>

diff --git a/docs/drivers/zink.rst b/docs/drivers/zink.rst
index ec83710..2af3c74 100644 (file)
--- a/docs/drivers/zink.rst
+++ b/docs/drivers/zink.rst
@@ -51,6 +51,7 @@ Here's a list of those requirements:
 
   * `VK_KHR_swapchain_mutable_format`_
   * `VK_EXT_border_color_swizzle`_
+  * `VK_KHR_descriptor_update_template`_
 
 In addition to this, `VK_KHR_external_memory`_ is required to support the
 DRI code-path.
@@ -255,11 +256,7 @@ changing the descriptor manager may improve performance:
 ``auto``
    Automatically detect best mode. This is the default.
 ``lazy``
-   Disable caching and attempt to use the least amount of CPU.
-``cached``
-   Use caching to reuse descriptor sets.
-``notemplates``
-   The same as `auto`, but disables the use of `VK_KHR_descriptor_templates`.
+   Attempt to use the least amount of CPU by binding descriptors opportunistically.
 
 Debugging
 ---------
@@ -326,3 +323,4 @@ questions, don't hesitate to visit `#zink on OFTC
 .. _VK_KHR_swapchain_mutable_format: https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_swapchain_mutable_format.html
 .. _VK_EXT_border_color_swizzle: https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_border_color_swizzle.html
 .. _VK_EXT_depth_clip_enable: https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_EXT_depth_clip_enable.html
+.. _VK_KHR_descriptor_update_template: https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_KHR_descriptor_update_template.html

diff --git a/src/gallium/drivers/zink/zink_device_info.py b/src/gallium/drivers/zink/zink_device_info.py
index 9b6fe9c..4eb084d 100644 (file)
--- a/src/gallium/drivers/zink/zink_device_info.py
+++ b/src/gallium/drivers/zink/zink_device_info.py
@@ -226,7 +226,7 @@ EXTENSIONS = [
         alias="push",
         properties=True),
     Extension("VK_KHR_descriptor_update_template",
-        alias="template"),
+        alias="template", required=True),
     Extension("VK_EXT_line_rasterization",
         alias="line_rast",
         properties=True,