[PATCH 0/2] MR57: winevulkan: Update to VK spec version 1.3.213.

[Georg Lehmann (＠DadSchoorse)]

Not a trivial update this time, two extensions are blocked by a Vulkan xml bug.

[PATCH 1/2] winevulkan: Prevent infinity recursion in make_vulkan.

[Georg Lehmann]

From: Georg Lehmann

Signed-off-by: Georg Lehmann 
---
 dlls/winevulkan/make_vulkan | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index c26951d06b9..4348201810b 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -2043,6 +2043,8 @@ class VkStruct(Sequence):
         """

for m in self.members:
+            if self.name == m.type:
+                continue
             if m.needs_alignment():
                 return True
         return False
@@ -2057,6 +2059,8 @@ class VkStruct(Sequence):
             return True

for m in self.members:
+            if self.name == m.type:
+                continue
             if m.needs_conversion():
                 return True
         return False
@@ -2065,6 +2069,8 @@ class VkStruct(Sequence):
         """ Returns if struct members need unwrapping of handle. """

for m in self.members:
+            if self.name == m.type:
+                continue
             if m.needs_unwrapping():
                 return True
         return False
@@ -2073,11 +2079,11 @@ class VkStruct(Sequence):
         """ Check if any struct member needs some memory freeing."""

for m in self.members:
+            if self.name == m.type:
+                continue
             if m.needs_free():
                 return True

-            continue
-
         return False

def needs_struct_extensions_conversion(self):
@@ -3350,7 +3356,7 @@ class VkRegistry(object):
                 if "data" in type_info:
                     types[m.type]["data"].required = True

-                if type_info["category"] == "struct":
+                if type_info["category"] == "struct" and struct.name != m.type:
                     # Yay, recurse
                     mark_struct_dependencies(type_info["data"], types)
                 elif type_info["category"] == "funcpointer":

[PATCH 2/2] winevulkan: Update to VK spec version 1.3.213.

[Georg Lehmann]

From: Georg Lehmann

Signed-off-by: Georg Lehmann 
---
 dlls/winevulkan/make_vulkan | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 4348201810b..2d49eceb93b 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -64,7 +64,7 @@ from enum import Enum
 LOGGER = logging.Logger("vulkan")
 LOGGER.addHandler(logging.StreamHandler())

-VK_XML_VERSION = "1.3.211"
+VK_XML_VERSION = "1.3.213"
 WINE_VK_VERSION = (1, 3)

# Filenames to create.
@@ -116,6 +116,10 @@ UNSUPPORTED_EXTENSIONS = [
     # Extensions which require callback handling
     "VK_EXT_device_memory_report",

+    # Needs https://github.com/KhronosGroup/Vulkan-Docs/pull/1848
+    # or a rework of how we detect returned structs.
+    "VK_EXT_image_compression_control",
+
     # Deprecated extensions
     "VK_NV_external_memory_capabilities",
     "VK_NV_external_memory_win32",