[PATCH 0/8] MR1323: winevulkan: Get rid of *_host types.

[Jacek Caban (＠jacek)]

This MR also contains a few fixes and missing conversions support. We no longer need 32-bit types outside vulkan_thunks.c, so we can default to host struct layouts and use `WINE_VK_HOST` in unixlib. This essentially means that vulkan.c is ready for wow64 (vulkan_thunks.c still needs more patches, mostly applying conversions to more types). Instead of defining *_host types, use local *32 types in generated thunks.

[PATCH 1/8] winevulkan: Support conversion of optional parameters.

[Jacek Caban]

From: Jacek Caban

---
 dlls/winevulkan/make_vulkan     | 16 ++++++++++++++--
 dlls/winevulkan/vulkan_thunks.c | 12 ++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 0611388e477..2ed2a5144ed 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -759,6 +759,9 @@ class VkFunction(object):
                 host_type = p.type + "_host" if conv and p.needs_host_type() else p.type
                 if p.is_dynamic_array():
                     body += "    {0} *{1}_host;\n".format(host_type, p.name)
+                elif p.optional:
+                    body += "    {0} *{1}_host = NULL;\n".format(host_type, p.name)
+                    needs_alloc = True
                 else:
                     body += "    {0} {1}_host;\n".format(host_type, p.name)
             if p.needs_alloc(conv, unwrap):
@@ -1558,6 +1561,13 @@ class VkParam(VkVariable):
             if self.is_dynamic_array():
                 return "    {1}_host = convert_{2}_array_{4}_to_{6}host({5}{0}{1}, {3});\n".format(
                     prefix, self.name, self.type, self.get_dyn_array_len(prefix), win_type, ctx_param, wrap_part)
+            elif self.optional:
+                ret  = "    if ({0}{1})\n".format(prefix, self.name)
+                ret += "    {\n"
+                ret += "        {0}_host = conversion_context_alloc(&ctx, sizeof(*{0}_host));\n".format(self.name)
+                ret += "        convert_{0}_{3}_to_{5}host({4}{1}{2}, {2}_host);\n".format(self.type, prefix, self.name, win_type, ctx_param, wrap_part)
+                ret += "    }\n"
+                return ret
             else:
                 return "    convert_{0}_{3}_to_{5}host({4}{1}{2}, &{2}_host);\n".format(self.type, prefix, self.name, win_type, ctx_param, wrap_part)
         else:
@@ -1565,7 +1575,9 @@ class VkParam(VkVariable):
                 return "    convert_{0}_array_{1}host_to_{2}({3}_host, {4}{3}, {5});\n".format(
                     self.type, wrap_part, win_type, self.name, prefix, self.get_dyn_array_len(prefix))
             else:
-                return "    convert_{0}_host_to_{3}(&{2}_host, {1}{2});\n".format(self.type, prefix, self.name, win_type)
+                ref_part = "" if self.optional else "&"
+                return "    convert_{0}_host_to_{3}({4}{2}_host, {1}{2});\n".format(
+                    self.type, prefix, self.name, win_type, ref_part)

def definition(self, postfix=None, is_member=False, is_thunk=False):
         """ Return prototype for the parameter. E.g. 'const char *foo' """
@@ -1700,7 +1712,7 @@ class VkParam(VkVariable):
             return "NULL"

if self.needs_variable(conv, unwrap):
-            if self.is_dynamic_array():
+            if self.is_dynamic_array() or self.optional:
                 return "{0}_host".format(self.name)
             else:
                 return "&{0}_host".format(self.name)
diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c
index fce2a0efa3d..c7f15d3e294 100644
--- a/dlls/winevulkan/vulkan_thunks.c
+++ b/dlls/winevulkan/vulkan_thunks.c
@@ -20582,17 +20582,21 @@ static NTSTATUS thunk32_vkGetDeviceFaultInfoEXT(void *args)
 {
     struct vkGetDeviceFaultInfoEXT_params *params = args;
     VkDeviceFaultCountsEXT_host pFaultCounts_host;
-    VkDeviceFaultInfoEXT_host pFaultInfo_host;
+    VkDeviceFaultInfoEXT_host *pFaultInfo_host = NULL;
     struct conversion_context ctx;

TRACE("%p, %p, %p\n", params->device, params->pFaultCounts, params->pFaultInfo);

init_conversion_context(&ctx);
     convert_VkDeviceFaultCountsEXT_win32_to_host(params->pFaultCounts, &pFaultCounts_host);
-    convert_VkDeviceFaultInfoEXT_win32_to_host(&ctx, params->pFaultInfo, &pFaultInfo_host);
-    params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceFaultInfoEXT(wine_device_from_handle(params->device)->device, &pFaultCounts_host, &pFaultInfo_host);
+    if (params->pFaultInfo)
+    {
+        pFaultInfo_host = conversion_context_alloc(&ctx, sizeof(*pFaultInfo_host));
+        convert_VkDeviceFaultInfoEXT_win32_to_host(&ctx, params->pFaultInfo, pFaultInfo_host);
+    }
+    params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceFaultInfoEXT(wine_device_from_handle(params->device)->device, &pFaultCounts_host, pFaultInfo_host);
     convert_VkDeviceFaultCountsEXT_host_to_win32(&pFaultCounts_host, params->pFaultCounts);
-    convert_VkDeviceFaultInfoEXT_host_to_win32(&pFaultInfo_host, params->pFaultInfo);
+    convert_VkDeviceFaultInfoEXT_host_to_win32(pFaultInfo_host, params->pFaultInfo);
     free_conversion_context(&ctx);
     return STATUS_SUCCESS;
 }

[PATCH 2/8] winevulkan: Fix handling unions in needs_alignment().

[Jacek Caban]

From: Jacek Caban

---
 dlls/winevulkan/make_vulkan     | 14 ++++--
 dlls/winevulkan/vulkan_thunks.c | 87 ++++++++++++++++++++++++++++++++-
 dlls/winevulkan/vulkan_thunks.h | 28 ++++++++++-
 include/wine/vulkan.h           | 40 +++++++--------
 4 files changed, 140 insertions(+), 29 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 2ed2a5144ed..a06040b54f9 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -1145,6 +1145,9 @@ class VkVariable(object):
     def is_struct(self):
         return self.struct is not None

+    def is_union(self):
+        return self.type_info["category"] == "union"
+
     def is_dynamic_array(self):
         """ Returns if the member is an array element.
         Vulkan uses this for dynamically sized arrays for which
@@ -1177,8 +1180,8 @@ class VkVariable(object):
             return False
         elif self.type in ["uint64_t", "VkDeviceAddress", "VkDeviceSize"]:
             return True
-        elif self.is_struct():
-            return self.struct.needs_alignment()
+        elif self.is_struct() or self.is_union():
+            return self.type_info["data"].needs_alignment()
         elif self.is_handle():
             # Dispatchable handles are pointers to objects, while
             # non-dispatchable are uint64_t and hence need alignment.
@@ -1399,9 +1402,6 @@ class VkMember(VkVariable):
     def is_struct_forward_declaration(self):
         return self.struct_fwd_decl

-    def is_union(self):
-        return self.type_info["category"] == "union"
-
     def is_bit_field(self):
         return self.bit_width is not None

@@ -2009,6 +2009,10 @@ class VkStruct(Sequence):
         return False

def needs_host_type(self):
+        # FIXME: needs pointer array support
+        if self.name == "VkAccelerationStructureGeometryKHR":
+            return False
+
         for m in self.members:
             if self.name == m.type:
                 continue
diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c
index c7f15d3e294..c60da05f3a5 100644
--- a/dlls/winevulkan/vulkan_thunks.c
+++ b/dlls/winevulkan/vulkan_thunks.c
@@ -7949,6 +7949,26 @@ static inline void convert_VkMicromapBuildSizesInfoEXT_host_to_win32(const VkMic
 }
 #endif /* USE_STRUCT_CONVERSION */

+#if defined(USE_STRUCT_CONVERSION)
+static inline void convert_VkPerformanceValueINTEL_win32_to_host(const VkPerformanceValueINTEL *in, VkPerformanceValueINTEL_host *out)
+{
+    if (!in) return;
+
+    out->type = in->type;
+    out->data = in->data;
+}
+#endif /* USE_STRUCT_CONVERSION */
+
+#if defined(USE_STRUCT_CONVERSION)
+static inline void convert_VkPerformanceValueINTEL_host_to_win32(const VkPerformanceValueINTEL_host *in, VkPerformanceValueINTEL *out)
+{
+    if (!in) return;
+
+    out->type = in->type;
+    out->data = in->data;
+}
+#endif /* USE_STRUCT_CONVERSION */
+
 #if defined(USE_STRUCT_CONVERSION)
 static inline void convert_VkPhysicalDeviceExternalSemaphoreInfo_win32_to_host(struct conversion_context *ctx, const VkPhysicalDeviceExternalSemaphoreInfo *in, VkPhysicalDeviceExternalSemaphoreInfo *out)
 {
@@ -9866,6 +9886,60 @@ static inline void convert_VkPipelineInfoKHR_win32_to_host(const VkPipelineInfoK
 }
 #endif /* USE_STRUCT_CONVERSION */

+#if defined(USE_STRUCT_CONVERSION)
+static inline void convert_VkPipelineExecutableStatisticKHR_win32_to_host(const VkPipelineExecutableStatisticKHR *in, VkPipelineExecutableStatisticKHR_host *out)
+{
+    if (!in) return;
+
+    out->sType = in->sType;
+    out->pNext = in->pNext;
+}
+#endif /* USE_STRUCT_CONVERSION */
+
+#if defined(USE_STRUCT_CONVERSION)
+static inline void convert_VkPipelineExecutableStatisticKHR_host_to_win32(const VkPipelineExecutableStatisticKHR_host *in, VkPipelineExecutableStatisticKHR *out)
+{
+    if (!in) return;
+
+    memcpy(out->name, in->name, VK_MAX_DESCRIPTION_SIZE * sizeof(char));
+    memcpy(out->description, in->description, VK_MAX_DESCRIPTION_SIZE * sizeof(char));
+    out->format = in->format;
+    out->value = in->value;
+}
+#endif /* USE_STRUCT_CONVERSION */
+
+#if defined(USE_STRUCT_CONVERSION)
+static inline VkPipelineExecutableStatisticKHR_host *convert_VkPipelineExecutableStatisticKHR_array_win32_to_host(struct conversion_context *ctx, const VkPipelineExecutableStatisticKHR *in, uint32_t count)
+{
+    VkPipelineExecutableStatisticKHR_host *out;
+    unsigned int i;
+
+    if (!in || !count) return NULL;
+
+    out = conversion_context_alloc(ctx, count * sizeof(*out));
+    for (i = 0; i < count; i++)
+    {
+        convert_VkPipelineExecutableStatisticKHR_win32_to_host(&in[i], &out[i]);
+    }
+
+    return out;
+}
+#endif /* USE_STRUCT_CONVERSION */
+
+#if defined(USE_STRUCT_CONVERSION)
+static inline void convert_VkPipelineExecutableStatisticKHR_array_host_to_win32(const VkPipelineExecutableStatisticKHR_host *in, VkPipelineExecutableStatisticKHR *out, uint32_t count)
+{
+    unsigned int i;
+
+    if (!in) return;
+
+    for (i = 0; i < count; i++)
+    {
+        convert_VkPipelineExecutableStatisticKHR_host_to_win32(&in[i], &out[i]);
+    }
+}
+#endif /* USE_STRUCT_CONVERSION */
+
 #if defined(USE_STRUCT_CONVERSION)
 static inline void convert_VkPipelineInfoEXT_win32_to_host(const VkPipelineInfoEXT *in, VkPipelineInfoEXT_host *out)
 {
@@ -21547,10 +21621,13 @@ static NTSTATUS thunk64_vkGetPerformanceParameterINTEL(void *args)
 static NTSTATUS thunk32_vkGetPerformanceParameterINTEL(void *args)
 {
     struct vkGetPerformanceParameterINTEL_params *params = args;
+    VkPerformanceValueINTEL_host pValue_host;

TRACE("%p, %#x, %p\n", params->device, params->parameter, params->pValue);

-    params->result = wine_device_from_handle(params->device)->funcs.p_vkGetPerformanceParameterINTEL(wine_device_from_handle(params->device)->device, params->parameter, params->pValue);
+    convert_VkPerformanceValueINTEL_win32_to_host(params->pValue, &pValue_host);
+    params->result = wine_device_from_handle(params->device)->funcs.p_vkGetPerformanceParameterINTEL(wine_device_from_handle(params->device)->device, params->parameter, &pValue_host);
+    convert_VkPerformanceValueINTEL_host_to_win32(&pValue_host, params->pValue);
     return STATUS_SUCCESS;
 }

@@ -22852,11 +22929,17 @@ static NTSTATUS thunk32_vkGetPipelineExecutableStatisticsKHR(void *args)
 {
     struct vkGetPipelineExecutableStatisticsKHR_params *params = args;
     VkPipelineExecutableInfoKHR_host pExecutableInfo_host;
+    VkPipelineExecutableStatisticKHR_host *pStatistics_host;
+    struct conversion_context ctx;

TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pStatisticCount, params->pStatistics);

+    init_conversion_context(&ctx);
     convert_VkPipelineExecutableInfoKHR_win32_to_host(params->pExecutableInfo, &pExecutableInfo_host);
-    params->result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableStatisticsKHR(wine_device_from_handle(params->device)->device, &pExecutableInfo_host, params->pStatisticCount, params->pStatistics);
+    pStatistics_host = convert_VkPipelineExecutableStatisticKHR_array_win32_to_host(&ctx, params->pStatistics, *params->pStatisticCount);
+    params->result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableStatisticsKHR(wine_device_from_handle(params->device)->device, &pExecutableInfo_host, params->pStatisticCount, pStatistics_host);
+    convert_VkPipelineExecutableStatisticKHR_array_host_to_win32(pStatistics_host, params->pStatistics, *params->pStatisticCount);
+    free_conversion_context(&ctx);
     return STATUS_SUCCESS;
 }

diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h
index 9a2edd104ae..db2eeae09ff 100644
--- a/dlls/winevulkan/vulkan_thunks.h
+++ b/dlls/winevulkan/vulkan_thunks.h
@@ -1669,6 +1669,16 @@ typedef struct VkMicromapBuildSizesInfoEXT_host
 typedef VkMicromapBuildSizesInfoEXT VkMicromapBuildSizesInfoEXT_host;
 #endif

+#if defined(USE_STRUCT_CONVERSION)
+typedef struct VkPerformanceValueINTEL_host
+{
+    VkPerformanceValueTypeINTEL type;
+    VkPerformanceValueDataINTEL data;
+} VkPerformanceValueINTEL_host;
+#else
+typedef VkPerformanceValueINTEL VkPerformanceValueINTEL_host;
+#endif
+
 #if defined(USE_STRUCT_CONVERSION)
 typedef struct VkImageFormatProperties_host
 {
@@ -2216,6 +2226,20 @@ typedef VkPipelineInfoKHR VkPipelineInfoEXT;
 typedef VkPipelineInfoKHR VkPipelineInfoKHR_host;
 #endif

+#if defined(USE_STRUCT_CONVERSION)
+typedef struct VkPipelineExecutableStatisticKHR_host
+{
+    VkStructureType sType;
+    void *pNext;
+    char name[VK_MAX_DESCRIPTION_SIZE];
+    char description[VK_MAX_DESCRIPTION_SIZE];
+    VkPipelineExecutableStatisticFormatKHR format;
+    VkPipelineExecutableStatisticValueKHR value;
+} VkPipelineExecutableStatisticKHR_host;
+#else
+typedef VkPipelineExecutableStatisticKHR VkPipelineExecutableStatisticKHR_host;
+#endif
+
 #if defined(USE_STRUCT_CONVERSION)
 typedef struct VkPipelineInfoEXT_host
 {
@@ -2847,11 +2871,11 @@ struct vulkan_device_funcs
     uint32_t (*p_vkGetImageViewHandleNVX)(VkDevice, const VkImageViewHandleInfoNVX_host *);
     VkResult (*p_vkGetMemoryHostPointerPropertiesEXT)(VkDevice, VkExternalMemoryHandleTypeFlagBits, const void *, VkMemoryHostPointerPropertiesEXT *);
     void (*p_vkGetMicromapBuildSizesEXT)(VkDevice, VkAccelerationStructureBuildTypeKHR, const VkMicromapBuildInfoEXT_host *, VkMicromapBuildSizesInfoEXT_host *);
-    VkResult (*p_vkGetPerformanceParameterINTEL)(VkDevice, VkPerformanceParameterTypeINTEL, VkPerformanceValueINTEL *);
+    VkResult (*p_vkGetPerformanceParameterINTEL)(VkDevice, VkPerformanceParameterTypeINTEL, VkPerformanceValueINTEL_host *);
     VkResult (*p_vkGetPipelineCacheData)(VkDevice, VkPipelineCache, size_t *, void *);
     VkResult (*p_vkGetPipelineExecutableInternalRepresentationsKHR)(VkDevice, const VkPipelineExecutableInfoKHR_host *, uint32_t *, VkPipelineExecutableInternalRepresentationKHR *);
     VkResult (*p_vkGetPipelineExecutablePropertiesKHR)(VkDevice, const VkPipelineInfoKHR_host *, uint32_t *, VkPipelineExecutablePropertiesKHR *);
-    VkResult (*p_vkGetPipelineExecutableStatisticsKHR)(VkDevice, const VkPipelineExecutableInfoKHR_host *, uint32_t *, VkPipelineExecutableStatisticKHR *);
+    VkResult (*p_vkGetPipelineExecutableStatisticsKHR)(VkDevice, const VkPipelineExecutableInfoKHR_host *, uint32_t *, VkPipelineExecutableStatisticKHR_host *);
     VkResult (*p_vkGetPipelinePropertiesEXT)(VkDevice, const VkPipelineInfoEXT_host *, VkBaseOutStructure *);
     void (*p_vkGetPrivateData)(VkDevice, VkObjectType, uint64_t, VkPrivateDataSlot, uint64_t *);
     void (*p_vkGetPrivateDataEXT)(VkDevice, VkObjectType, uint64_t, VkPrivateDataSlot, uint64_t *);
diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h
index fc42e784e6a..c9e822857aa 100644
--- a/include/wine/vulkan.h
+++ b/include/wine/vulkan.h
@@ -6583,7 +6583,7 @@ typedef union VkPerformanceValueDataINTEL
 typedef struct VkPerformanceValueINTEL
 {
     VkPerformanceValueTypeINTEL type;
-    VkPerformanceValueDataINTEL data;
+    VkPerformanceValueDataINTEL WINE_VK_ALIGN(8) data;
 } VkPerformanceValueINTEL;

typedef struct VkPhysicalDevice16BitStorageFeatures
@@ -10288,7 +10288,7 @@ typedef struct VkAccelerationStructureGeometryAabbsDataKHR
 {
     VkStructureType sType;
     const void *pNext;
-    VkDeviceOrHostAddressConstKHR data;
+    VkDeviceOrHostAddressConstKHR WINE_VK_ALIGN(8) data;
     VkDeviceSize WINE_VK_ALIGN(8) stride;
 } VkAccelerationStructureGeometryAabbsDataKHR;

@@ -10297,14 +10297,14 @@ typedef struct VkAccelerationStructureGeometryInstancesDataKHR
     VkStructureType sType;
     const void *pNext;
     VkBool32 arrayOfPointers;
-    VkDeviceOrHostAddressConstKHR data;
+    VkDeviceOrHostAddressConstKHR WINE_VK_ALIGN(8) data;
 } VkAccelerationStructureGeometryInstancesDataKHR;

typedef struct VkAccelerationStructureGeometryMotionTrianglesDataNV
 {
     VkStructureType sType;
     const void *pNext;
-    VkDeviceOrHostAddressConstKHR vertexData;
+    VkDeviceOrHostAddressConstKHR WINE_VK_ALIGN(8) vertexData;
 } VkAccelerationStructureGeometryMotionTrianglesDataNV;

typedef struct VkAccelerationStructureGeometryTrianglesDataKHR
@@ -10312,12 +10312,12 @@ typedef struct VkAccelerationStructureGeometryTrianglesDataKHR
     VkStructureType sType;
     const void *pNext;
     VkFormat vertexFormat;
-    VkDeviceOrHostAddressConstKHR vertexData;
+    VkDeviceOrHostAddressConstKHR WINE_VK_ALIGN(8) vertexData;
     VkDeviceSize WINE_VK_ALIGN(8) vertexStride;
     uint32_t maxVertex;
     VkIndexType indexType;
-    VkDeviceOrHostAddressConstKHR indexData;
-    VkDeviceOrHostAddressConstKHR transformData;
+    VkDeviceOrHostAddressConstKHR WINE_VK_ALIGN(8) indexData;
+    VkDeviceOrHostAddressConstKHR WINE_VK_ALIGN(8) transformData;
 } VkAccelerationStructureGeometryTrianglesDataKHR;

typedef struct VkAccelerationStructureInstanceKHR
@@ -10358,7 +10358,7 @@ typedef struct VkAccelerationStructureTrianglesOpacityMicromapEXT
     VkStructureType sType;
     void *pNext;
     VkIndexType indexType;
-    VkDeviceOrHostAddressConstKHR indexBuffer;
+    VkDeviceOrHostAddressConstKHR WINE_VK_ALIGN(8) indexBuffer;
     VkDeviceSize WINE_VK_ALIGN(8) indexStride;
     uint32_t baseTriangle;
     uint32_t usageCountsCount;
@@ -10451,7 +10451,7 @@ typedef struct VkCopyAccelerationStructureToMemoryInfoKHR
     VkStructureType sType;
     const void *pNext;
     VkAccelerationStructureKHR WINE_VK_ALIGN(8) src;
-    VkDeviceOrHostAddressKHR dst;
+    VkDeviceOrHostAddressKHR WINE_VK_ALIGN(8) dst;
     VkCopyAccelerationStructureModeKHR mode;
 } VkCopyAccelerationStructureToMemoryInfoKHR;

@@ -10483,7 +10483,7 @@ typedef struct VkCopyMemoryToAccelerationStructureInfoKHR
 {
     VkStructureType sType;
     const void *pNext;
-    VkDeviceOrHostAddressConstKHR src;
+    VkDeviceOrHostAddressConstKHR WINE_VK_ALIGN(8) src;
     VkAccelerationStructureKHR WINE_VK_ALIGN(8) dst;
     VkCopyAccelerationStructureModeKHR mode;
 } VkCopyMemoryToAccelerationStructureInfoKHR;
@@ -10502,7 +10502,7 @@ typedef struct VkCopyMemoryToMicromapInfoEXT
 {
     VkStructureType sType;
     const void *pNext;
-    VkDeviceOrHostAddressConstKHR src;
+    VkDeviceOrHostAddressConstKHR WINE_VK_ALIGN(8) src;
     VkMicromapEXT WINE_VK_ALIGN(8) dst;
     VkCopyMicromapModeEXT mode;
 } VkCopyMemoryToMicromapInfoEXT;
@@ -10512,7 +10512,7 @@ typedef struct VkCopyMicromapToMemoryInfoEXT
     VkStructureType sType;
     const void *pNext;
     VkMicromapEXT WINE_VK_ALIGN(8) src;
-    VkDeviceOrHostAddressKHR dst;
+    VkDeviceOrHostAddressKHR WINE_VK_ALIGN(8) dst;
     VkCopyMicromapModeEXT mode;
 } VkCopyMicromapToMemoryInfoEXT;

@@ -10774,9 +10774,9 @@ typedef struct VkMicromapBuildInfoEXT
     uint32_t usageCountsCount;
     const VkMicromapUsageEXT *pUsageCounts;
     const VkMicromapUsageEXT * const*ppUsageCounts;
-    VkDeviceOrHostAddressConstKHR data;
-    VkDeviceOrHostAddressKHR scratchData;
-    VkDeviceOrHostAddressConstKHR triangleArray;
+    VkDeviceOrHostAddressConstKHR WINE_VK_ALIGN(8) data;
+    VkDeviceOrHostAddressKHR WINE_VK_ALIGN(8) scratchData;
+    VkDeviceOrHostAddressConstKHR WINE_VK_ALIGN(8) triangleArray;
     VkDeviceSize WINE_VK_ALIGN(8) triangleArrayStride;
 } VkMicromapBuildInfoEXT;

@@ -10852,7 +10852,7 @@ typedef struct VkPipelineExecutableStatisticKHR
     char name[VK_MAX_DESCRIPTION_SIZE];
     char description[VK_MAX_DESCRIPTION_SIZE];
     VkPipelineExecutableStatisticFormatKHR format;
-    VkPipelineExecutableStatisticValueKHR value;
+    VkPipelineExecutableStatisticValueKHR WINE_VK_ALIGN(8) value;
 } VkPipelineExecutableStatisticKHR;

typedef struct VkPipelineLayoutCreateInfo
@@ -11059,7 +11059,7 @@ typedef union VkAccelerationStructureGeometryDataKHR
 {
     VkAccelerationStructureGeometryTrianglesDataKHR WINE_VK_ALIGN(8) triangles;
     VkAccelerationStructureGeometryAabbsDataKHR WINE_VK_ALIGN(8) aabbs;
-    VkAccelerationStructureGeometryInstancesDataKHR instances;
+    VkAccelerationStructureGeometryInstancesDataKHR WINE_VK_ALIGN(8) instances;
 } VkAccelerationStructureGeometryDataKHR;

typedef struct VkAccelerationStructureGeometryKHR
@@ -11067,7 +11067,7 @@ typedef struct VkAccelerationStructureGeometryKHR
     VkStructureType sType;
     const void *pNext;
     VkGeometryTypeKHR geometryType;
-    VkAccelerationStructureGeometryDataKHR geometry;
+    VkAccelerationStructureGeometryDataKHR WINE_VK_ALIGN(8) geometry;
     VkGeometryFlagsKHR flags;
 } VkAccelerationStructureGeometryKHR;

@@ -11093,7 +11093,7 @@ typedef struct VkAccelerationStructureMotionInstanceNV
 {
     VkAccelerationStructureMotionInstanceTypeNV type;
     VkAccelerationStructureMotionInstanceFlagsNV flags;
-    VkAccelerationStructureMotionInstanceDataNV data;
+    VkAccelerationStructureMotionInstanceDataNV WINE_VK_ALIGN(8) data;
 } VkAccelerationStructureMotionInstanceNV;

typedef struct VkBindSparseInfo
@@ -11209,7 +11209,7 @@ typedef struct VkAccelerationStructureBuildGeometryInfoKHR
     uint32_t geometryCount;
     const VkAccelerationStructureGeometryKHR *pGeometries;
     const VkAccelerationStructureGeometryKHR * const*ppGeometries;
-    VkDeviceOrHostAddressKHR scratchData;
+    VkDeviceOrHostAddressKHR WINE_VK_ALIGN(8) scratchData;
 } VkAccelerationStructureBuildGeometryInfoKHR;

typedef struct VkAccelerationStructureCreateInfoNV

[PATCH 3/8] winevulkan: Preserve const in array conversion output types.

[Jacek Caban]

From: Jacek Caban

---
 dlls/winevulkan/make_vulkan     |   6 +-
 dlls/winevulkan/vulkan_thunks.c | 200 ++++++++++++++++----------------
 2 files changed, 104 insertions(+), 102 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index a06040b54f9..1bba38d6fbc 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -758,7 +758,8 @@ class VkFunction(object):
             if p.needs_variable(conv, unwrap):
                 host_type = p.type + "_host" if conv and p.needs_host_type() else p.type
                 if p.is_dynamic_array():
-                    body += "    {0} *{1}_host;\n".format(host_type, p.name)
+                    body += "    {2}{0} *{1}_host;\n".format(
+                        host_type, p.name, "const " if p.is_const() else "")
                 elif p.optional:
                     body += "    {0} *{1}_host = NULL;\n".format(host_type, p.name)
                     needs_alloc = True
@@ -2288,7 +2289,8 @@ class ArrayConversionFunction(object):

# Generate function prototype.
         if return_type:
-            body += "static inline {0} *{1}(".format(return_type, self.name)
+            body += "static inline {0}{1} *{2}(".format(
+                "const " if self.array.is_const() else "", return_type, self.name)
         else:
             body += "static inline void {0}(".format(self.name)
         if needs_alloc:
diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c
index c60da05f3a5..d4811a1b214 100644
--- a/dlls/winevulkan/vulkan_thunks.c
+++ b/dlls/winevulkan/vulkan_thunks.c
@@ -250,7 +250,7 @@ static inline void convert_VkCommandBufferInheritanceInfo_win32_to_host(const Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkCommandBufferInheritanceInfo_host *convert_VkCommandBufferInheritanceInfo_array_win32_to_host(struct conversion_context *ctx, const VkCommandBufferInheritanceInfo *in, uint32_t count)
+static inline const VkCommandBufferInheritanceInfo_host *convert_VkCommandBufferInheritanceInfo_array_win32_to_host(struct conversion_context *ctx, const VkCommandBufferInheritanceInfo *in, uint32_t count)
 {
     VkCommandBufferInheritanceInfo_host *out;
     unsigned int i;
@@ -295,7 +295,7 @@ static inline void convert_VkBindAccelerationStructureMemoryInfoNV_win32_to_host
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkBindAccelerationStructureMemoryInfoNV_host *convert_VkBindAccelerationStructureMemoryInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkBindAccelerationStructureMemoryInfoNV *in, uint32_t count)
+static inline const VkBindAccelerationStructureMemoryInfoNV_host *convert_VkBindAccelerationStructureMemoryInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkBindAccelerationStructureMemoryInfoNV *in, uint32_t count)
 {
     VkBindAccelerationStructureMemoryInfoNV_host *out;
     unsigned int i;
@@ -326,7 +326,7 @@ static inline void convert_VkBindBufferMemoryInfo_win32_to_host(const VkBindBuff
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkBindBufferMemoryInfo_host *convert_VkBindBufferMemoryInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindBufferMemoryInfo *in, uint32_t count)
+static inline const VkBindBufferMemoryInfo_host *convert_VkBindBufferMemoryInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindBufferMemoryInfo *in, uint32_t count)
 {
     VkBindBufferMemoryInfo_host *out;
     unsigned int i;
@@ -407,7 +407,7 @@ static inline void convert_VkBindImageMemoryInfo_win32_to_host(struct conversion
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkBindImageMemoryInfo_host *convert_VkBindImageMemoryInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindImageMemoryInfo *in, uint32_t count)
+static inline const VkBindImageMemoryInfo_host *convert_VkBindImageMemoryInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindImageMemoryInfo *in, uint32_t count)
 {
     VkBindImageMemoryInfo_host *out;
     unsigned int i;
@@ -444,7 +444,7 @@ static inline void convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkAccelerationStructureBuildGeometryInfoKHR_host *convert_VkAccelerationStructureBuildGeometryInfoKHR_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureBuildGeometryInfoKHR *in, uint32_t count)
+static inline const VkAccelerationStructureBuildGeometryInfoKHR_host *convert_VkAccelerationStructureBuildGeometryInfoKHR_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureBuildGeometryInfoKHR *in, uint32_t count)
 {
     VkAccelerationStructureBuildGeometryInfoKHR_host *out;
     unsigned int i;
@@ -483,7 +483,7 @@ static inline void convert_VkMicromapBuildInfoEXT_win32_to_host(const VkMicromap
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkMicromapBuildInfoEXT_host *convert_VkMicromapBuildInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkMicromapBuildInfoEXT *in, uint32_t count)
+static inline const VkMicromapBuildInfoEXT_host *convert_VkMicromapBuildInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkMicromapBuildInfoEXT *in, uint32_t count)
 {
     VkMicromapBuildInfoEXT_host *out;
     unsigned int i;
@@ -547,7 +547,7 @@ static inline void convert_VkRenderingAttachmentInfo_win32_to_host(const VkRende
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkRenderingAttachmentInfo_host *convert_VkRenderingAttachmentInfo_array_win32_to_host(struct conversion_context *ctx, const VkRenderingAttachmentInfo *in, uint32_t count)
+static inline const VkRenderingAttachmentInfo_host *convert_VkRenderingAttachmentInfo_array_win32_to_host(struct conversion_context *ctx, const VkRenderingAttachmentInfo *in, uint32_t count)
 {
     VkRenderingAttachmentInfo_host *out;
     unsigned int i;
@@ -733,7 +733,7 @@ static inline void convert_VkGeometryNV_win32_to_host(const VkGeometryNV *in, Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkGeometryNV_host *convert_VkGeometryNV_array_win32_to_host(struct conversion_context *ctx, const VkGeometryNV *in, uint32_t count)
+static inline const VkGeometryNV_host *convert_VkGeometryNV_array_win32_to_host(struct conversion_context *ctx, const VkGeometryNV *in, uint32_t count)
 {
     VkGeometryNV_host *out;
     unsigned int i;
@@ -803,7 +803,7 @@ static inline void convert_VkBufferCopy_win32_to_host(const VkBufferCopy *in, Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkBufferCopy_host *convert_VkBufferCopy_array_win32_to_host(struct conversion_context *ctx, const VkBufferCopy *in, uint32_t count)
+static inline const VkBufferCopy_host *convert_VkBufferCopy_array_win32_to_host(struct conversion_context *ctx, const VkBufferCopy *in, uint32_t count)
 {
     VkBufferCopy_host *out;
     unsigned int i;
@@ -834,7 +834,7 @@ static inline void convert_VkBufferCopy2_win32_to_host(const VkBufferCopy2 *in,
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkBufferCopy2_host *convert_VkBufferCopy2_array_win32_to_host(struct conversion_context *ctx, const VkBufferCopy2 *in, uint32_t count)
+static inline const VkBufferCopy2_host *convert_VkBufferCopy2_array_win32_to_host(struct conversion_context *ctx, const VkBufferCopy2 *in, uint32_t count)
 {
     VkBufferCopy2_host *out;
     unsigned int i;
@@ -880,7 +880,7 @@ static inline void convert_VkBufferImageCopy_win32_to_host(const VkBufferImageCo
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkBufferImageCopy_host *convert_VkBufferImageCopy_array_win32_to_host(struct conversion_context *ctx, const VkBufferImageCopy *in, uint32_t count)
+static inline const VkBufferImageCopy_host *convert_VkBufferImageCopy_array_win32_to_host(struct conversion_context *ctx, const VkBufferImageCopy *in, uint32_t count)
 {
     VkBufferImageCopy_host *out;
     unsigned int i;
@@ -914,7 +914,7 @@ static inline void convert_VkBufferImageCopy2_win32_to_host(const VkBufferImageC
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkBufferImageCopy2_host *convert_VkBufferImageCopy2_array_win32_to_host(struct conversion_context *ctx, const VkBufferImageCopy2 *in, uint32_t count)
+static inline const VkBufferImageCopy2_host *convert_VkBufferImageCopy2_array_win32_to_host(struct conversion_context *ctx, const VkBufferImageCopy2 *in, uint32_t count)
 {
     VkBufferImageCopy2_host *out;
     unsigned int i;
@@ -1065,7 +1065,7 @@ static inline void convert_VkDecompressMemoryRegionNV_win32_to_host(const VkDeco
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkDecompressMemoryRegionNV_host *convert_VkDecompressMemoryRegionNV_array_win32_to_host(struct conversion_context *ctx, const VkDecompressMemoryRegionNV *in, uint32_t count)
+static inline const VkDecompressMemoryRegionNV_host *convert_VkDecompressMemoryRegionNV_array_win32_to_host(struct conversion_context *ctx, const VkDecompressMemoryRegionNV *in, uint32_t count)
 {
     VkDecompressMemoryRegionNV_host *out;
     unsigned int i;
@@ -1083,7 +1083,7 @@ static inline VkDecompressMemoryRegionNV_host *convert_VkDecompressMemoryRegionN
 #endif /* USE_STRUCT_CONVERSION */

#if !defined(USE_STRUCT_CONVERSION)
-static inline VkCommandBuffer *convert_VkCommandBuffer_array_win64_to_host(struct conversion_context *ctx, const VkCommandBuffer *in, uint32_t count)
+static inline const VkCommandBuffer *convert_VkCommandBuffer_array_win64_to_host(struct conversion_context *ctx, const VkCommandBuffer *in, uint32_t count)
 {
     VkCommandBuffer *out;
     unsigned int i;
@@ -1101,7 +1101,7 @@ static inline VkCommandBuffer *convert_VkCommandBuffer_array_win64_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkCommandBuffer *convert_VkCommandBuffer_array_win32_to_host(struct conversion_context *ctx, const VkCommandBuffer *in, uint32_t count)
+static inline const VkCommandBuffer *convert_VkCommandBuffer_array_win32_to_host(struct conversion_context *ctx, const VkCommandBuffer *in, uint32_t count)
 {
     VkCommandBuffer *out;
     unsigned int i;
@@ -1129,7 +1129,7 @@ static inline void convert_VkIndirectCommandsStreamNV_win32_to_host(const VkIndi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkIndirectCommandsStreamNV_host *convert_VkIndirectCommandsStreamNV_array_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsStreamNV *in, uint32_t count)
+static inline const VkIndirectCommandsStreamNV_host *convert_VkIndirectCommandsStreamNV_array_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsStreamNV *in, uint32_t count)
 {
     VkIndirectCommandsStreamNV_host *out;
     unsigned int i;
@@ -1187,7 +1187,7 @@ static inline void convert_VkBufferMemoryBarrier_win32_to_host(const VkBufferMem
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkBufferMemoryBarrier_host *convert_VkBufferMemoryBarrier_array_win32_to_host(struct conversion_context *ctx, const VkBufferMemoryBarrier *in, uint32_t count)
+static inline const VkBufferMemoryBarrier_host *convert_VkBufferMemoryBarrier_array_win32_to_host(struct conversion_context *ctx, const VkBufferMemoryBarrier *in, uint32_t count)
 {
     VkBufferMemoryBarrier_host *out;
     unsigned int i;
@@ -1223,7 +1223,7 @@ static inline void convert_VkImageMemoryBarrier_win32_to_host(const VkImageMemor
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkImageMemoryBarrier_host *convert_VkImageMemoryBarrier_array_win32_to_host(struct conversion_context *ctx, const VkImageMemoryBarrier *in, uint32_t count)
+static inline const VkImageMemoryBarrier_host *convert_VkImageMemoryBarrier_array_win32_to_host(struct conversion_context *ctx, const VkImageMemoryBarrier *in, uint32_t count)
 {
     VkImageMemoryBarrier_host *out;
     unsigned int i;
@@ -1260,7 +1260,7 @@ static inline void convert_VkBufferMemoryBarrier2_win32_to_host(const VkBufferMe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkBufferMemoryBarrier2_host *convert_VkBufferMemoryBarrier2_array_win32_to_host(struct conversion_context *ctx, const VkBufferMemoryBarrier2 *in, uint32_t count)
+static inline const VkBufferMemoryBarrier2_host *convert_VkBufferMemoryBarrier2_array_win32_to_host(struct conversion_context *ctx, const VkBufferMemoryBarrier2 *in, uint32_t count)
 {
     VkBufferMemoryBarrier2_host *out;
     unsigned int i;
@@ -1298,7 +1298,7 @@ static inline void convert_VkImageMemoryBarrier2_win32_to_host(const VkImageMemo
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkImageMemoryBarrier2_host *convert_VkImageMemoryBarrier2_array_win32_to_host(struct conversion_context *ctx, const VkImageMemoryBarrier2 *in, uint32_t count)
+static inline const VkImageMemoryBarrier2_host *convert_VkImageMemoryBarrier2_array_win32_to_host(struct conversion_context *ctx, const VkImageMemoryBarrier2 *in, uint32_t count)
 {
     VkImageMemoryBarrier2_host *out;
     unsigned int i;
@@ -1344,7 +1344,7 @@ static inline void convert_VkDescriptorImageInfo_win32_to_host(const VkDescripto
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkDescriptorImageInfo_host *convert_VkDescriptorImageInfo_array_win32_to_host(struct conversion_context *ctx, const VkDescriptorImageInfo *in, uint32_t count)
+static inline const VkDescriptorImageInfo_host *convert_VkDescriptorImageInfo_array_win32_to_host(struct conversion_context *ctx, const VkDescriptorImageInfo *in, uint32_t count)
 {
     VkDescriptorImageInfo_host *out;
     unsigned int i;
@@ -1373,7 +1373,7 @@ static inline void convert_VkDescriptorBufferInfo_win32_to_host(const VkDescript
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkDescriptorBufferInfo_host *convert_VkDescriptorBufferInfo_array_win32_to_host(struct conversion_context *ctx, const VkDescriptorBufferInfo *in, uint32_t count)
+static inline const VkDescriptorBufferInfo_host *convert_VkDescriptorBufferInfo_array_win32_to_host(struct conversion_context *ctx, const VkDescriptorBufferInfo *in, uint32_t count)
 {
     VkDescriptorBufferInfo_host *out;
     unsigned int i;
@@ -1409,7 +1409,7 @@ static inline void convert_VkWriteDescriptorSet_win32_to_host(struct conversion_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkWriteDescriptorSet_host *convert_VkWriteDescriptorSet_array_win32_to_host(struct conversion_context *ctx, const VkWriteDescriptorSet *in, uint32_t count)
+static inline const VkWriteDescriptorSet_host *convert_VkWriteDescriptorSet_array_win32_to_host(struct conversion_context *ctx, const VkWriteDescriptorSet *in, uint32_t count)
 {
     VkWriteDescriptorSet_host *out;
     unsigned int i;
@@ -1478,7 +1478,7 @@ static inline void convert_VkStridedDeviceAddressRegionKHR_win32_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkDependencyInfo_host *convert_VkDependencyInfo_array_win32_to_host(struct conversion_context *ctx, const VkDependencyInfo *in, uint32_t count)
+static inline const VkDependencyInfo_host *convert_VkDependencyInfo_array_win32_to_host(struct conversion_context *ctx, const VkDependencyInfo *in, uint32_t count)
 {
     VkDependencyInfo_host *out;
     unsigned int i;
@@ -1975,7 +1975,7 @@ static inline void convert_VkComputePipelineCreateInfo_host_to_win32(const VkCom
 #endif /* USE_STRUCT_CONVERSION */

#if !defined(USE_STRUCT_CONVERSION)
-static inline VkComputePipelineCreateInfo *convert_VkComputePipelineCreateInfo_array_win64_to_host(struct conversion_context *ctx, const VkComputePipelineCreateInfo *in, uint32_t count)
+static inline const VkComputePipelineCreateInfo *convert_VkComputePipelineCreateInfo_array_win64_to_host(struct conversion_context *ctx, const VkComputePipelineCreateInfo *in, uint32_t count)
 {
     VkComputePipelineCreateInfo *out;
     unsigned int i;
@@ -1993,7 +1993,7 @@ static inline VkComputePipelineCreateInfo *convert_VkComputePipelineCreateInfo_a
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkComputePipelineCreateInfo_host *convert_VkComputePipelineCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkComputePipelineCreateInfo *in, uint32_t count)
+static inline const VkComputePipelineCreateInfo_host *convert_VkComputePipelineCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkComputePipelineCreateInfo *in, uint32_t count)
 {
     VkComputePipelineCreateInfo_host *out;
     unsigned int i;
@@ -2055,7 +2055,7 @@ static inline void convert_VkDescriptorUpdateTemplateCreateInfo_win32_to_host(co
 #endif /* USE_STRUCT_CONVERSION */

#if !defined(USE_STRUCT_CONVERSION)
-static inline VkPhysicalDevice *convert_VkPhysicalDevice_array_win64_to_host(struct conversion_context *ctx, const VkPhysicalDevice *in, uint32_t count)
+static inline const VkPhysicalDevice *convert_VkPhysicalDevice_array_win64_to_host(struct conversion_context *ctx, const VkPhysicalDevice *in, uint32_t count)
 {
     VkPhysicalDevice *out;
     unsigned int i;
@@ -2073,7 +2073,7 @@ static inline VkPhysicalDevice *convert_VkPhysicalDevice_array_win64_to_host(str
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkPhysicalDevice *convert_VkPhysicalDevice_array_win32_to_host(struct conversion_context *ctx, const VkPhysicalDevice *in, uint32_t count)
+static inline const VkPhysicalDevice *convert_VkPhysicalDevice_array_win32_to_host(struct conversion_context *ctx, const VkPhysicalDevice *in, uint32_t count)
 {
     VkPhysicalDevice *out;
     unsigned int i;
@@ -5738,7 +5738,7 @@ static inline void convert_VkFramebufferCreateInfo_win32_to_host(const VkFramebu
 #endif /* USE_STRUCT_CONVERSION */

#if !defined(USE_STRUCT_CONVERSION)
-static inline VkPipelineShaderStageCreateInfo *convert_VkPipelineShaderStageCreateInfo_array_win64_to_host(struct conversion_context *ctx, const VkPipelineShaderStageCreateInfo *in, uint32_t count)
+static inline const VkPipelineShaderStageCreateInfo *convert_VkPipelineShaderStageCreateInfo_array_win64_to_host(struct conversion_context *ctx, const VkPipelineShaderStageCreateInfo *in, uint32_t count)
 {
     VkPipelineShaderStageCreateInfo *out;
     unsigned int i;
@@ -5756,7 +5756,7 @@ static inline VkPipelineShaderStageCreateInfo *convert_VkPipelineShaderStageCrea
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkPipelineShaderStageCreateInfo_host *convert_VkPipelineShaderStageCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkPipelineShaderStageCreateInfo *in, uint32_t count)
+static inline const VkPipelineShaderStageCreateInfo_host *convert_VkPipelineShaderStageCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkPipelineShaderStageCreateInfo *in, uint32_t count)
 {
     VkPipelineShaderStageCreateInfo_host *out;
     unsigned int i;
@@ -5802,7 +5802,7 @@ static inline void convert_VkGraphicsShaderGroupCreateInfoNV_win32_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if !defined(USE_STRUCT_CONVERSION)
-static inline VkGraphicsShaderGroupCreateInfoNV *convert_VkGraphicsShaderGroupCreateInfoNV_array_win64_to_host(struct conversion_context *ctx, const VkGraphicsShaderGroupCreateInfoNV *in, uint32_t count)
+static inline const VkGraphicsShaderGroupCreateInfoNV *convert_VkGraphicsShaderGroupCreateInfoNV_array_win64_to_host(struct conversion_context *ctx, const VkGraphicsShaderGroupCreateInfoNV *in, uint32_t count)
 {
     VkGraphicsShaderGroupCreateInfoNV *out;
     unsigned int i;
@@ -5820,7 +5820,7 @@ static inline VkGraphicsShaderGroupCreateInfoNV *convert_VkGraphicsShaderGroupCr
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkGraphicsShaderGroupCreateInfoNV_host *convert_VkGraphicsShaderGroupCreateInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkGraphicsShaderGroupCreateInfoNV *in, uint32_t count)
+static inline const VkGraphicsShaderGroupCreateInfoNV_host *convert_VkGraphicsShaderGroupCreateInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkGraphicsShaderGroupCreateInfoNV *in, uint32_t count)
 {
     VkGraphicsShaderGroupCreateInfoNV_host *out;
     unsigned int i;
@@ -6278,7 +6278,7 @@ static inline void convert_VkGraphicsPipelineCreateInfo_host_to_win32(const VkGr
 #endif /* USE_STRUCT_CONVERSION */

#if !defined(USE_STRUCT_CONVERSION)
-static inline VkGraphicsPipelineCreateInfo *convert_VkGraphicsPipelineCreateInfo_array_win64_to_host(struct conversion_context *ctx, const VkGraphicsPipelineCreateInfo *in, uint32_t count)
+static inline const VkGraphicsPipelineCreateInfo *convert_VkGraphicsPipelineCreateInfo_array_win64_to_host(struct conversion_context *ctx, const VkGraphicsPipelineCreateInfo *in, uint32_t count)
 {
     VkGraphicsPipelineCreateInfo *out;
     unsigned int i;
@@ -6296,7 +6296,7 @@ static inline VkGraphicsPipelineCreateInfo *convert_VkGraphicsPipelineCreateInfo
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkGraphicsPipelineCreateInfo_host *convert_VkGraphicsPipelineCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkGraphicsPipelineCreateInfo *in, uint32_t count)
+static inline const VkGraphicsPipelineCreateInfo_host *convert_VkGraphicsPipelineCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkGraphicsPipelineCreateInfo *in, uint32_t count)
 {
     VkGraphicsPipelineCreateInfo_host *out;
     unsigned int i;
@@ -6553,7 +6553,7 @@ static inline void convert_VkIndirectCommandsLayoutTokenNV_win32_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkIndirectCommandsLayoutTokenNV_host *convert_VkIndirectCommandsLayoutTokenNV_array_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsLayoutTokenNV *in, uint32_t count)
+static inline const VkIndirectCommandsLayoutTokenNV_host *convert_VkIndirectCommandsLayoutTokenNV_array_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsLayoutTokenNV *in, uint32_t count)
 {
     VkIndirectCommandsLayoutTokenNV_host *out;
     unsigned int i;
@@ -6887,7 +6887,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoKHR_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if !defined(USE_STRUCT_CONVERSION)
-static inline VkRayTracingPipelineCreateInfoKHR *convert_VkRayTracingPipelineCreateInfoKHR_array_win64_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoKHR *in, uint32_t count)
+static inline const VkRayTracingPipelineCreateInfoKHR *convert_VkRayTracingPipelineCreateInfoKHR_array_win64_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoKHR *in, uint32_t count)
 {
     VkRayTracingPipelineCreateInfoKHR *out;
     unsigned int i;
@@ -6905,7 +6905,7 @@ static inline VkRayTracingPipelineCreateInfoKHR *convert_VkRayTracingPipelineCre
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkRayTracingPipelineCreateInfoKHR_host *convert_VkRayTracingPipelineCreateInfoKHR_array_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoKHR *in, uint32_t count)
+static inline const VkRayTracingPipelineCreateInfoKHR_host *convert_VkRayTracingPipelineCreateInfoKHR_array_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoKHR *in, uint32_t count)
 {
     VkRayTracingPipelineCreateInfoKHR_host *out;
     unsigned int i;
@@ -7031,7 +7031,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoNV_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if !defined(USE_STRUCT_CONVERSION)
-static inline VkRayTracingPipelineCreateInfoNV *convert_VkRayTracingPipelineCreateInfoNV_array_win64_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoNV *in, uint32_t count)
+static inline const VkRayTracingPipelineCreateInfoNV *convert_VkRayTracingPipelineCreateInfoNV_array_win64_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoNV *in, uint32_t count)
 {
     VkRayTracingPipelineCreateInfoNV *out;
     unsigned int i;
@@ -7049,7 +7049,7 @@ static inline VkRayTracingPipelineCreateInfoNV *convert_VkRayTracingPipelineCrea
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkRayTracingPipelineCreateInfoNV_host *convert_VkRayTracingPipelineCreateInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoNV *in, uint32_t count)
+static inline const VkRayTracingPipelineCreateInfoNV_host *convert_VkRayTracingPipelineCreateInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoNV *in, uint32_t count)
 {
     VkRayTracingPipelineCreateInfoNV_host *out;
     unsigned int i;
@@ -7371,7 +7371,7 @@ static inline void convert_VkMappedMemoryRange_win32_to_host(const VkMappedMemor
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkMappedMemoryRange_host *convert_VkMappedMemoryRange_array_win32_to_host(struct conversion_context *ctx, const VkMappedMemoryRange *in, uint32_t count)
+static inline const VkMappedMemoryRange_host *convert_VkMappedMemoryRange_array_win32_to_host(struct conversion_context *ctx, const VkMappedMemoryRange *in, uint32_t count)
 {
     VkMappedMemoryRange_host *out;
     unsigned int i;
@@ -7519,7 +7519,7 @@ static inline void convert_VkDescriptorSetBindingReferenceVALVE_win32_to_host(co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkBufferCreateInfo_host *convert_VkBufferCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkBufferCreateInfo *in, uint32_t count)
+static inline const VkBufferCreateInfo_host *convert_VkBufferCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkBufferCreateInfo *in, uint32_t count)
 {
     VkBufferCreateInfo_host *out;
     unsigned int i;
@@ -7706,7 +7706,7 @@ static inline void convert_VkDeviceFaultInfoEXT_host_to_win32(const VkDeviceFaul
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkImageCreateInfo *convert_VkImageCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkImageCreateInfo *in, uint32_t count)
+static inline const VkImageCreateInfo *convert_VkImageCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkImageCreateInfo *in, uint32_t count)
 {
     VkImageCreateInfo *out;
     unsigned int i;
@@ -9965,7 +9965,7 @@ static inline void convert_VkSparseMemoryBind_win32_to_host(const VkSparseMemory
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkSparseMemoryBind_host *convert_VkSparseMemoryBind_array_win32_to_host(struct conversion_context *ctx, const VkSparseMemoryBind *in, uint32_t count)
+static inline const VkSparseMemoryBind_host *convert_VkSparseMemoryBind_array_win32_to_host(struct conversion_context *ctx, const VkSparseMemoryBind *in, uint32_t count)
 {
     VkSparseMemoryBind_host *out;
     unsigned int i;
@@ -9994,7 +9994,7 @@ static inline void convert_VkSparseBufferMemoryBindInfo_win32_to_host(struct con
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkSparseBufferMemoryBindInfo_host *convert_VkSparseBufferMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseBufferMemoryBindInfo *in, uint32_t count)
+static inline const VkSparseBufferMemoryBindInfo_host *convert_VkSparseBufferMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseBufferMemoryBindInfo *in, uint32_t count)
 {
     VkSparseBufferMemoryBindInfo_host *out;
     unsigned int i;
@@ -10023,7 +10023,7 @@ static inline void convert_VkSparseImageOpaqueMemoryBindInfo_win32_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkSparseImageOpaqueMemoryBindInfo_host *convert_VkSparseImageOpaqueMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageOpaqueMemoryBindInfo *in, uint32_t count)
+static inline const VkSparseImageOpaqueMemoryBindInfo_host *convert_VkSparseImageOpaqueMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageOpaqueMemoryBindInfo *in, uint32_t count)
 {
     VkSparseImageOpaqueMemoryBindInfo_host *out;
     unsigned int i;
@@ -10055,7 +10055,7 @@ static inline void convert_VkSparseImageMemoryBind_win32_to_host(const VkSparseI
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkSparseImageMemoryBind_host *convert_VkSparseImageMemoryBind_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBind *in, uint32_t count)
+static inline const VkSparseImageMemoryBind_host *convert_VkSparseImageMemoryBind_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBind *in, uint32_t count)
 {
     VkSparseImageMemoryBind_host *out;
     unsigned int i;
@@ -10084,7 +10084,7 @@ static inline void convert_VkSparseImageMemoryBindInfo_win32_to_host(struct conv
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkSparseImageMemoryBindInfo_host *convert_VkSparseImageMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBindInfo *in, uint32_t count)
+static inline const VkSparseImageMemoryBindInfo_host *convert_VkSparseImageMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBindInfo *in, uint32_t count)
 {
     VkSparseImageMemoryBindInfo_host *out;
     unsigned int i;
@@ -10122,7 +10122,7 @@ static inline void convert_VkBindSparseInfo_win32_to_host(struct conversion_cont
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkBindSparseInfo_host *convert_VkBindSparseInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindSparseInfo *in, uint32_t count)
+static inline const VkBindSparseInfo_host *convert_VkBindSparseInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindSparseInfo *in, uint32_t count)
 {
     VkBindSparseInfo_host *out;
     unsigned int i;
@@ -10174,7 +10174,7 @@ static inline void convert_VkSubmitInfo_win32_to_host(struct conversion_context
 #endif /* USE_STRUCT_CONVERSION */

#if !defined(USE_STRUCT_CONVERSION)
-static inline VkSubmitInfo *convert_VkSubmitInfo_array_win64_to_host(struct conversion_context *ctx, const VkSubmitInfo *in, uint32_t count)
+static inline const VkSubmitInfo *convert_VkSubmitInfo_array_win64_to_host(struct conversion_context *ctx, const VkSubmitInfo *in, uint32_t count)
 {
     VkSubmitInfo *out;
     unsigned int i;
@@ -10192,7 +10192,7 @@ static inline VkSubmitInfo *convert_VkSubmitInfo_array_win64_to_host(struct conv
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkSubmitInfo *convert_VkSubmitInfo_array_win32_to_host(struct conversion_context *ctx, const VkSubmitInfo *in, uint32_t count)
+static inline const VkSubmitInfo *convert_VkSubmitInfo_array_win32_to_host(struct conversion_context *ctx, const VkSubmitInfo *in, uint32_t count)
 {
     VkSubmitInfo *out;
     unsigned int i;
@@ -10224,7 +10224,7 @@ static inline void convert_VkSemaphoreSubmitInfo_win32_to_host(const VkSemaphore
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkSemaphoreSubmitInfo_host *convert_VkSemaphoreSubmitInfo_array_win32_to_host(struct conversion_context *ctx, const VkSemaphoreSubmitInfo *in, uint32_t count)
+static inline const VkSemaphoreSubmitInfo_host *convert_VkSemaphoreSubmitInfo_array_win32_to_host(struct conversion_context *ctx, const VkSemaphoreSubmitInfo *in, uint32_t count)
 {
     VkSemaphoreSubmitInfo_host *out;
     unsigned int i;
@@ -10266,7 +10266,7 @@ static inline void convert_VkCommandBufferSubmitInfo_win32_to_host(const VkComma
 #endif /* USE_STRUCT_CONVERSION */

#if !defined(USE_STRUCT_CONVERSION)
-static inline VkCommandBufferSubmitInfo *convert_VkCommandBufferSubmitInfo_array_win64_to_host(struct conversion_context *ctx, const VkCommandBufferSubmitInfo *in, uint32_t count)
+static inline const VkCommandBufferSubmitInfo *convert_VkCommandBufferSubmitInfo_array_win64_to_host(struct conversion_context *ctx, const VkCommandBufferSubmitInfo *in, uint32_t count)
 {
     VkCommandBufferSubmitInfo *out;
     unsigned int i;
@@ -10284,7 +10284,7 @@ static inline VkCommandBufferSubmitInfo *convert_VkCommandBufferSubmitInfo_array
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkCommandBufferSubmitInfo *convert_VkCommandBufferSubmitInfo_array_win32_to_host(struct conversion_context *ctx, const VkCommandBufferSubmitInfo *in, uint32_t count)
+static inline const VkCommandBufferSubmitInfo *convert_VkCommandBufferSubmitInfo_array_win32_to_host(struct conversion_context *ctx, const VkCommandBufferSubmitInfo *in, uint32_t count)
 {
     VkCommandBufferSubmitInfo *out;
     unsigned int i;
@@ -10336,7 +10336,7 @@ static inline void convert_VkSubmitInfo2_win32_to_host(struct conversion_context
 #endif /* USE_STRUCT_CONVERSION */

#if !defined(USE_STRUCT_CONVERSION)
-static inline VkSubmitInfo2 *convert_VkSubmitInfo2_array_win64_to_host(struct conversion_context *ctx, const VkSubmitInfo2 *in, uint32_t count)
+static inline const VkSubmitInfo2 *convert_VkSubmitInfo2_array_win64_to_host(struct conversion_context *ctx, const VkSubmitInfo2 *in, uint32_t count)
 {
     VkSubmitInfo2 *out;
     unsigned int i;
@@ -10354,7 +10354,7 @@ static inline VkSubmitInfo2 *convert_VkSubmitInfo2_array_win64_to_host(struct co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkSubmitInfo2_host *convert_VkSubmitInfo2_array_win32_to_host(struct conversion_context *ctx, const VkSubmitInfo2 *in, uint32_t count)
+static inline const VkSubmitInfo2_host *convert_VkSubmitInfo2_array_win32_to_host(struct conversion_context *ctx, const VkSubmitInfo2 *in, uint32_t count)
 {
     VkSubmitInfo2_host *out;
     unsigned int i;
@@ -10440,7 +10440,7 @@ static inline void convert_VkSemaphoreSignalInfo_win32_to_host(const VkSemaphore
 #endif /* USE_STRUCT_CONVERSION */

#if !defined(USE_STRUCT_CONVERSION)
-static inline VkDebugUtilsObjectNameInfoEXT *convert_VkDebugUtilsObjectNameInfoEXT_array_win64_to_host(struct conversion_context *ctx, const VkDebugUtilsObjectNameInfoEXT *in, uint32_t count)
+static inline const VkDebugUtilsObjectNameInfoEXT *convert_VkDebugUtilsObjectNameInfoEXT_array_win64_to_host(struct conversion_context *ctx, const VkDebugUtilsObjectNameInfoEXT *in, uint32_t count)
 {
     VkDebugUtilsObjectNameInfoEXT *out;
     unsigned int i;
@@ -10458,7 +10458,7 @@ static inline VkDebugUtilsObjectNameInfoEXT *convert_VkDebugUtilsObjectNameInfoE
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkDebugUtilsObjectNameInfoEXT_host *convert_VkDebugUtilsObjectNameInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDebugUtilsObjectNameInfoEXT *in, uint32_t count)
+static inline const VkDebugUtilsObjectNameInfoEXT_host *convert_VkDebugUtilsObjectNameInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDebugUtilsObjectNameInfoEXT *in, uint32_t count)
 {
     VkDebugUtilsObjectNameInfoEXT_host *out;
     unsigned int i;
@@ -10560,7 +10560,7 @@ static inline void convert_VkCopyDescriptorSet_win32_to_host(const VkCopyDescrip
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkCopyDescriptorSet_host *convert_VkCopyDescriptorSet_array_win32_to_host(struct conversion_context *ctx, const VkCopyDescriptorSet *in, uint32_t count)
+static inline const VkCopyDescriptorSet_host *convert_VkCopyDescriptorSet_array_win32_to_host(struct conversion_context *ctx, const VkCopyDescriptorSet *in, uint32_t count)
 {
     VkCopyDescriptorSet_host *out;
     unsigned int i;
@@ -10820,7 +10820,7 @@ static NTSTATUS thunk64_vkBindAccelerationStructureMemoryNV(void *args)
 static NTSTATUS thunk32_vkBindAccelerationStructureMemoryNV(void *args)
 {
     struct vkBindAccelerationStructureMemoryNV_params *params = args;
-    VkBindAccelerationStructureMemoryInfoNV_host *pBindInfos_host;
+    const VkBindAccelerationStructureMemoryInfoNV_host *pBindInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos);
@@ -10877,7 +10877,7 @@ static NTSTATUS thunk64_vkBindBufferMemory2(void *args)
 static NTSTATUS thunk32_vkBindBufferMemory2(void *args)
 {
     struct vkBindBufferMemory2_params *params = args;
-    VkBindBufferMemoryInfo_host *pBindInfos_host;
+    const VkBindBufferMemoryInfo_host *pBindInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos);
@@ -10908,7 +10908,7 @@ static NTSTATUS thunk64_vkBindBufferMemory2KHR(void *args)
 static NTSTATUS thunk32_vkBindBufferMemory2KHR(void *args)
 {
     struct vkBindBufferMemory2KHR_params *params = args;
-    VkBindBufferMemoryInfo_host *pBindInfos_host;
+    const VkBindBufferMemoryInfo_host *pBindInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos);
@@ -10965,7 +10965,7 @@ static NTSTATUS thunk64_vkBindImageMemory2(void *args)
 static NTSTATUS thunk32_vkBindImageMemory2(void *args)
 {
     struct vkBindImageMemory2_params *params = args;
-    VkBindImageMemoryInfo_host *pBindInfos_host;
+    const VkBindImageMemoryInfo_host *pBindInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos);
@@ -10996,7 +10996,7 @@ static NTSTATUS thunk64_vkBindImageMemory2KHR(void *args)
 static NTSTATUS thunk32_vkBindImageMemory2KHR(void *args)
 {
     struct vkBindImageMemory2KHR_params *params = args;
-    VkBindImageMemoryInfo_host *pBindInfos_host;
+    const VkBindImageMemoryInfo_host *pBindInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos);
@@ -11053,7 +11053,7 @@ static NTSTATUS thunk64_vkBuildAccelerationStructuresKHR(void *args)
 static NTSTATUS thunk32_vkBuildAccelerationStructuresKHR(void *args)
 {
     struct vkBuildAccelerationStructuresKHR_params *params = args;
-    VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
+    const VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->infoCount, params->pInfos, params->ppBuildRangeInfos);
@@ -11084,7 +11084,7 @@ static NTSTATUS thunk64_vkBuildMicromapsEXT(void *args)
 static NTSTATUS thunk32_vkBuildMicromapsEXT(void *args)
 {
     struct vkBuildMicromapsEXT_params *params = args;
-    VkMicromapBuildInfoEXT_host *pInfos_host;
+    const VkMicromapBuildInfoEXT_host *pInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->infoCount, params->pInfos);
@@ -11766,7 +11766,7 @@ static NTSTATUS thunk64_vkCmdBuildAccelerationStructuresIndirectKHR(void *args)
 static NTSTATUS thunk32_vkCmdBuildAccelerationStructuresIndirectKHR(void *args)
 {
     struct vkCmdBuildAccelerationStructuresIndirectKHR_params *params = args;
-    VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
+    const VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, %p, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->pIndirectDeviceAddresses, params->pIndirectStrides, params->ppMaxPrimitiveCounts);
@@ -11797,7 +11797,7 @@ static NTSTATUS thunk64_vkCmdBuildAccelerationStructuresKHR(void *args)
 static NTSTATUS thunk32_vkCmdBuildAccelerationStructuresKHR(void *args)
 {
     struct vkCmdBuildAccelerationStructuresKHR_params *params = args;
-    VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
+    const VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->ppBuildRangeInfos);
@@ -11828,7 +11828,7 @@ static NTSTATUS thunk64_vkCmdBuildMicromapsEXT(void *args)
 static NTSTATUS thunk32_vkCmdBuildMicromapsEXT(void *args)
 {
     struct vkCmdBuildMicromapsEXT_params *params = args;
-    VkMicromapBuildInfoEXT_host *pInfos_host;
+    const VkMicromapBuildInfoEXT_host *pInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->commandBuffer, params->infoCount, params->pInfos);
@@ -12019,7 +12019,7 @@ static NTSTATUS thunk64_vkCmdCopyBuffer(void *args)
 static NTSTATUS thunk32_vkCmdCopyBuffer(void *args)
 {
     struct vkCmdCopyBuffer_params *params = args;
-    VkBufferCopy_host *pRegions_host;
+    const VkBufferCopy_host *pRegions_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions);
@@ -12112,7 +12112,7 @@ static NTSTATUS thunk64_vkCmdCopyBufferToImage(void *args)
 static NTSTATUS thunk32_vkCmdCopyBufferToImage(void *args)
 {
     struct vkCmdCopyBufferToImage_params *params = args;
-    VkBufferImageCopy_host *pRegions_host;
+    const VkBufferImageCopy_host *pRegions_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions);
@@ -12287,7 +12287,7 @@ static NTSTATUS thunk64_vkCmdCopyImageToBuffer(void *args)
 static NTSTATUS thunk32_vkCmdCopyImageToBuffer(void *args)
 {
     struct vkCmdCopyImageToBuffer_params *params = args;
-    VkBufferImageCopy_host *pRegions_host;
+    const VkBufferImageCopy_host *pRegions_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %#x, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions);
@@ -12702,7 +12702,7 @@ static NTSTATUS thunk64_vkCmdDecompressMemoryNV(void *args)
 static NTSTATUS thunk32_vkCmdDecompressMemoryNV(void *args)
 {
     struct vkCmdDecompressMemoryNV_params *params = args;
-    VkDecompressMemoryRegionNV_host *pDecompressMemoryRegions_host;
+    const VkDecompressMemoryRegionNV_host *pDecompressMemoryRegions_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->commandBuffer, params->decompressRegionCount, params->pDecompressMemoryRegions);
@@ -13579,7 +13579,7 @@ static NTSTATUS thunk32_vkCmdEndTransformFeedbackEXT(void *args)
 static NTSTATUS thunk64_vkCmdExecuteCommands(void *args)
 {
     struct vkCmdExecuteCommands_params *params = args;
-    VkCommandBuffer *pCommandBuffers_host;
+    const VkCommandBuffer *pCommandBuffers_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->commandBuffer, params->commandBufferCount, params->pCommandBuffers);
@@ -13596,7 +13596,7 @@ static NTSTATUS thunk64_vkCmdExecuteCommands(void *args)
 static NTSTATUS thunk32_vkCmdExecuteCommands(void *args)
 {
     struct vkCmdExecuteCommands_params *params = args;
-    VkCommandBuffer *pCommandBuffers_host;
+    const VkCommandBuffer *pCommandBuffers_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->commandBuffer, params->commandBufferCount, params->pCommandBuffers);
@@ -13814,8 +13814,8 @@ static NTSTATUS thunk64_vkCmdPipelineBarrier(void *args)
 static NTSTATUS thunk32_vkCmdPipelineBarrier(void *args)
 {
     struct vkCmdPipelineBarrier_params *params = args;
-    VkBufferMemoryBarrier_host *pBufferMemoryBarriers_host;
-    VkImageMemoryBarrier_host *pImageMemoryBarriers_host;
+    const VkBufferMemoryBarrier_host *pBufferMemoryBarriers_host;
+    const VkImageMemoryBarrier_host *pImageMemoryBarriers_host;
     struct conversion_context ctx;

TRACE("%p, %#x, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->srcStageMask, params->dstStageMask, params->dependencyFlags, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers);
@@ -13966,7 +13966,7 @@ static NTSTATUS thunk64_vkCmdPushDescriptorSetKHR(void *args)
 static NTSTATUS thunk32_vkCmdPushDescriptorSetKHR(void *args)
 {
     struct vkCmdPushDescriptorSetKHR_params *params = args;
-    VkWriteDescriptorSet_host *pDescriptorWrites_host;
+    const VkWriteDescriptorSet_host *pDescriptorWrites_host;
     struct conversion_context ctx;

TRACE("%p, %#x, 0x%s, %u, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->set, params->descriptorWriteCount, params->pDescriptorWrites);
@@ -16761,8 +16761,8 @@ static NTSTATUS thunk64_vkCmdWaitEvents(void *args)
 static NTSTATUS thunk32_vkCmdWaitEvents(void *args)
 {
     struct vkCmdWaitEvents_params *params = args;
-    VkBufferMemoryBarrier_host *pBufferMemoryBarriers_host;
-    VkImageMemoryBarrier_host *pImageMemoryBarriers_host;
+    const VkBufferMemoryBarrier_host *pBufferMemoryBarriers_host;
+    const VkImageMemoryBarrier_host *pImageMemoryBarriers_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->srcStageMask, params->dstStageMask, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers);
@@ -16794,7 +16794,7 @@ static NTSTATUS thunk64_vkCmdWaitEvents2(void *args)
 static NTSTATUS thunk32_vkCmdWaitEvents2(void *args)
 {
     struct vkCmdWaitEvents2_params *params = args;
-    VkDependencyInfo_host *pDependencyInfos_host;
+    const VkDependencyInfo_host *pDependencyInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos);
@@ -16825,7 +16825,7 @@ static NTSTATUS thunk64_vkCmdWaitEvents2KHR(void *args)
 static NTSTATUS thunk32_vkCmdWaitEvents2KHR(void *args)
 {
     struct vkCmdWaitEvents2KHR_params *params = args;
-    VkDependencyInfo_host *pDependencyInfos_host;
+    const VkDependencyInfo_host *pDependencyInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos);
@@ -17390,7 +17390,7 @@ static NTSTATUS thunk32_vkCreateCommandPool(void *args)
 static NTSTATUS thunk64_vkCreateComputePipelines(void *args)
 {
     struct vkCreateComputePipelines_params *params = args;
-    VkComputePipelineCreateInfo *pCreateInfos_host;
+    const VkComputePipelineCreateInfo *pCreateInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines);
@@ -17407,7 +17407,7 @@ static NTSTATUS thunk64_vkCreateComputePipelines(void *args)
 static NTSTATUS thunk32_vkCreateComputePipelines(void *args)
 {
     struct vkCreateComputePipelines_params *params = args;
-    VkComputePipelineCreateInfo_host *pCreateInfos_host;
+    const VkComputePipelineCreateInfo_host *pCreateInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines);
@@ -17783,7 +17783,7 @@ static NTSTATUS thunk32_vkCreateFramebuffer(void *args)
 static NTSTATUS thunk64_vkCreateGraphicsPipelines(void *args)
 {
     struct vkCreateGraphicsPipelines_params *params = args;
-    VkGraphicsPipelineCreateInfo *pCreateInfos_host;
+    const VkGraphicsPipelineCreateInfo *pCreateInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines);
@@ -17800,7 +17800,7 @@ static NTSTATUS thunk64_vkCreateGraphicsPipelines(void *args)
 static NTSTATUS thunk32_vkCreateGraphicsPipelines(void *args)
 {
     struct vkCreateGraphicsPipelines_params *params = args;
-    VkGraphicsPipelineCreateInfo_host *pCreateInfos_host;
+    const VkGraphicsPipelineCreateInfo_host *pCreateInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines);
@@ -18133,7 +18133,7 @@ static NTSTATUS thunk32_vkCreateQueryPool(void *args)
 static NTSTATUS thunk64_vkCreateRayTracingPipelinesKHR(void *args)
 {
     struct vkCreateRayTracingPipelinesKHR_params *params = args;
-    VkRayTracingPipelineCreateInfoKHR *pCreateInfos_host;
+    const VkRayTracingPipelineCreateInfoKHR *pCreateInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines);
@@ -18150,7 +18150,7 @@ static NTSTATUS thunk64_vkCreateRayTracingPipelinesKHR(void *args)
 static NTSTATUS thunk32_vkCreateRayTracingPipelinesKHR(void *args)
 {
     struct vkCreateRayTracingPipelinesKHR_params *params = args;
-    VkRayTracingPipelineCreateInfoKHR_host *pCreateInfos_host;
+    const VkRayTracingPipelineCreateInfoKHR_host *pCreateInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines);
@@ -18170,7 +18170,7 @@ static NTSTATUS thunk32_vkCreateRayTracingPipelinesKHR(void *args)
 static NTSTATUS thunk64_vkCreateRayTracingPipelinesNV(void *args)
 {
     struct vkCreateRayTracingPipelinesNV_params *params = args;
-    VkRayTracingPipelineCreateInfoNV *pCreateInfos_host;
+    const VkRayTracingPipelineCreateInfoNV *pCreateInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines);
@@ -18187,7 +18187,7 @@ static NTSTATUS thunk64_vkCreateRayTracingPipelinesNV(void *args)
 static NTSTATUS thunk32_vkCreateRayTracingPipelinesNV(void *args)
 {
     struct vkCreateRayTracingPipelinesNV_params *params = args;
-    VkRayTracingPipelineCreateInfoNV_host *pCreateInfos_host;
+    const VkRayTracingPipelineCreateInfoNV_host *pCreateInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines);
@@ -19922,7 +19922,7 @@ static NTSTATUS thunk64_vkFlushMappedMemoryRanges(void *args)
 static NTSTATUS thunk32_vkFlushMappedMemoryRanges(void *args)
 {
     struct vkFlushMappedMemoryRanges_params *params = args;
-    VkMappedMemoryRange_host *pMemoryRanges_host;
+    const VkMappedMemoryRange_host *pMemoryRanges_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges);
@@ -23463,7 +23463,7 @@ static NTSTATUS thunk64_vkInvalidateMappedMemoryRanges(void *args)
 static NTSTATUS thunk32_vkInvalidateMappedMemoryRanges(void *args)
 {
     struct vkInvalidateMappedMemoryRanges_params *params = args;
-    VkMappedMemoryRange_host *pMemoryRanges_host;
+    const VkMappedMemoryRange_host *pMemoryRanges_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges);
@@ -23598,7 +23598,7 @@ static NTSTATUS thunk64_vkQueueBindSparse(void *args)
 static NTSTATUS thunk32_vkQueueBindSparse(void *args)
 {
     struct vkQueueBindSparse_params *params = args;
-    VkBindSparseInfo_host *pBindInfo_host;
+    const VkBindSparseInfo_host *pBindInfo_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, 0x%s\n", params->queue, params->bindInfoCount, params->pBindInfo, wine_dbgstr_longlong(params->fence));
@@ -23721,7 +23721,7 @@ static NTSTATUS thunk32_vkQueueSetPerformanceConfigurationINTEL(void *args)
 static NTSTATUS thunk64_vkQueueSubmit(void *args)
 {
     struct vkQueueSubmit_params *params = args;
-    VkSubmitInfo *pSubmits_host;
+    const VkSubmitInfo *pSubmits_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence));
@@ -23738,7 +23738,7 @@ static NTSTATUS thunk64_vkQueueSubmit(void *args)
 static NTSTATUS thunk32_vkQueueSubmit(void *args)
 {
     struct vkQueueSubmit_params *params = args;
-    VkSubmitInfo *pSubmits_host;
+    const VkSubmitInfo *pSubmits_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence));
@@ -23757,7 +23757,7 @@ static NTSTATUS thunk32_vkQueueSubmit(void *args)
 static NTSTATUS thunk64_vkQueueSubmit2(void *args)
 {
     struct vkQueueSubmit2_params *params = args;
-    VkSubmitInfo2 *pSubmits_host;
+    const VkSubmitInfo2 *pSubmits_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence));
@@ -23774,7 +23774,7 @@ static NTSTATUS thunk64_vkQueueSubmit2(void *args)
 static NTSTATUS thunk32_vkQueueSubmit2(void *args)
 {
     struct vkQueueSubmit2_params *params = args;
-    VkSubmitInfo2_host *pSubmits_host;
+    const VkSubmitInfo2_host *pSubmits_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence));
@@ -23793,7 +23793,7 @@ static NTSTATUS thunk32_vkQueueSubmit2(void *args)
 static NTSTATUS thunk64_vkQueueSubmit2KHR(void *args)
 {
     struct vkQueueSubmit2KHR_params *params = args;
-    VkSubmitInfo2 *pSubmits_host;
+    const VkSubmitInfo2 *pSubmits_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence));
@@ -23810,7 +23810,7 @@ static NTSTATUS thunk64_vkQueueSubmit2KHR(void *args)
 static NTSTATUS thunk32_vkQueueSubmit2KHR(void *args)
 {
     struct vkQueueSubmit2KHR_params *params = args;
-    VkSubmitInfo2_host *pSubmits_host;
+    const VkSubmitInfo2_host *pSubmits_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence));
@@ -24513,8 +24513,8 @@ static NTSTATUS thunk64_vkUpdateDescriptorSets(void *args)
 static NTSTATUS thunk32_vkUpdateDescriptorSets(void *args)
 {
     struct vkUpdateDescriptorSets_params *params = args;
-    VkWriteDescriptorSet_host *pDescriptorWrites_host;
-    VkCopyDescriptorSet_host *pDescriptorCopies_host;
+    const VkWriteDescriptorSet_host *pDescriptorWrites_host;
+    const VkCopyDescriptorSet_host *pDescriptorCopies_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, %u, %p\n", params->device, params->descriptorWriteCount, params->pDescriptorWrites, params->descriptorCopyCount, params->pDescriptorCopies);

[PATCH 4/8] winevulkan: Add support for pointer array conversion.

[Jacek Caban]

From: Jacek Caban

And use it for VkAccelerationStructureGeometryKHR.
---
 dlls/winevulkan/make_vulkan     | 77 ++++++++++++++++++++-------------
 dlls/winevulkan/vulkan_thunks.c | 68 ++++++++++++++++++++++++++---
 dlls/winevulkan/vulkan_thunks.h | 17 +++++++-
 3 files changed, 126 insertions(+), 36 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 1bba38d6fbc..1b98dc7e9a6 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -1087,12 +1087,20 @@ class VkVariable(object):
         self.type = type
         self.name = name
         self.parent = parent
-        self.pointer = pointer
-        self.array_len = array_len
-        self.dyn_array_len = dyn_array_len
         self.object_type = object_type
         self.optional = optional
         self.returnedonly = returnedonly
+
+        self.pointer = pointer
+        self.array_len = array_len
+        self.dyn_array_len = dyn_array_len
+        self.pointer_array = False
+        if isinstance(dyn_array_len, str):
+            i = dyn_array_len.find(",")
+            if i != -1:
+                self.dyn_array_len = dyn_array_len[0:i]
+                self.pointer_array = True
+
         if type_info:
             self.set_type_info(type_info)

@@ -1328,10 +1336,13 @@ class VkMember(VkVariable):
                 # Array length is either a variable name (string) or an int.
                 count = self.get_dyn_array_len(input)
                 host_part = "host" if unwrap else "unwrapped_host"
+                pointer_part = "pointer_" if self.pointer_array else ""
                 if direction == Direction.OUTPUT:
-                    return "convert_{2}_array_{6}_to_{5}({3}{1}, {0}{1}, {4});\n".format(output, self.name, self.type, input, count, win_type, host_part)
+                    return "convert_{2}_{7}array_{6}_to_{5}({3}{1}, {0}{1}, {4});\n".format(
+                        output, self.name, self.type, input, count, win_type, host_part, pointer_part)
                 else:
-                    return "{0}{1} = convert_{2}_array_{5}_to_{6}(ctx, {3}{1}, {4});\n".format(output, self.name, self.type, input, count, win_type, host_part)
+                    return "{0}{1} = convert_{2}_{7}array_{5}_to_{6}(ctx, {3}{1}, {4});\n".format(
+                        output, self.name, self.type, input, count, win_type, host_part, pointer_part)
             elif self.is_static_array():
                 count = self.array_len
                 if direction == Direction.OUTPUT:
@@ -1956,10 +1967,6 @@ class VkStruct(Sequence):
         if self.name == "VkAllocationCallbacks":
             return False

-        # FIXME: needs pointer array support
-        if self.name == "VkAccelerationStructureGeometryKHR":
-            return False
-
         # pFixedRateFlags field is missing const, but it doesn't need output conversion
         if direction == Direction.OUTPUT and self.name == "VkImageCompressionControlEXT":
             return False
@@ -2010,10 +2017,6 @@ class VkStruct(Sequence):
         return False

def needs_host_type(self):
-        # FIXME: needs pointer array support
-        if self.name == "VkAccelerationStructureGeometryKHR":
-            return False
-
         for m in self.members:
             if self.name == m.type:
                 continue
@@ -2241,7 +2244,10 @@ class ArrayConversionFunction(object):
         if array.is_static_array() and direction == Direction.INPUT:
             LOGGER.error("Static array input conversion is not supported")

-        name = "convert_{0}_array_".format(array.type)
+        name = "convert_{0}_".format(array.type)
+        if array.pointer_array:
+            name += "pointer_"
+        name += "array_"
         win_type = "win32" if self.conv else "win64"
         host_part = "host" if self.unwrap else "unwrapped_host"
         if self.direction == Direction.INPUT:
@@ -2270,27 +2276,25 @@ class ArrayConversionFunction(object):
         else:
             host_type = self.type
         win_type = self.type
+        pointer_part = self.array.pointer if self.array.pointer else "*"
         if self.direction == Direction.OUTPUT and self.array.is_const():
             win_type = "const " + win_type

-        if self.conv:
-            if self.direction == Direction.OUTPUT:
-                params = ["const {0} *in".format(host_type), "{0} *out".format(win_type), "uint32_t count"]
-                return_type = None
-            else:
-                params = ["const {0} *in".format(win_type), "uint32_t count"]
-                return_type = host_type
+        if self.direction == Direction.OUTPUT:
+            params = ["const {0} {1}in".format(host_type, pointer_part),
+                      "{0} {1}out".format(win_type, pointer_part), "uint32_t count"]
+            return_type = None
         else:
-            params = ["const {0} *in".format(self.type), "uint32_t count"]
-            return_type = self.type
+            params = ["const {0} {1}in".format(win_type, pointer_part), "uint32_t count"]
+            return_type = host_type

needs_copy = not self.array.is_struct() or self.direction != Direction.INPUT or \
             not self.array.struct.returnedonly or "pNext" in self.array.struct

# Generate function prototype.
         if return_type:
-            body += "static inline {0}{1} *{2}(".format(
-                "const " if self.array.is_const() else "", return_type, self.name)
+            body += "static inline {0}{1} {2}{3}(".format(
+                "const " if self.array.is_const() else "", return_type, pointer_part, self.name)
         else:
             body += "static inline void {0}(".format(self.name)
         if needs_alloc:
@@ -2299,7 +2303,7 @@ class ArrayConversionFunction(object):
         body += ")\n{\n"

if return_type:
-            body += "    {0} *out;\n".format(return_type)
+            body += "    {0} {1}out;\n".format(return_type, "**" if self.array.pointer_array else "*")
         if needs_copy:
             body += "    unsigned int i;\n\n"

@@ -2328,9 +2332,24 @@ class ArrayConversionFunction(object):
                 if self.direction == Direction.INPUT and struct.needs_alloc(self.conv, self.unwrap):
                     ctx_part = "ctx, "

-                body += "        convert_{0}_{1}({2}&in[i], &out[i]);\n".format(
-                    struct.name, conv_suffix, ctx_part)
+                if not self.array.pointer_array:
+                    body += "        convert_{0}_{1}({2}&in[i], &out[i]);\n".format(
+                        struct.name, conv_suffix, ctx_part)
+                else:
+                    body += "        if (in[i])\n"
+                    body += "        {\n"
+                    body += "            out[i] = conversion_context_alloc(ctx, sizeof(*out[i]));\n"
+                    if struct.needs_conversion(self.conv, self.unwrap, self.direction, False):
+                        body += "            convert_{0}_{1}({2}in[i], out[i]);\n".format(
+                            struct.name, conv_suffix, ctx_part)
+                    else:
+                        body += "            *out[i] = *in[i];\n".format(win_type)
+                    body += "        }\n"
+                    body += "        else\n"
+                    body += "            out[i] = NULL;\n"
             elif self.array.is_handle() and self.direction == Direction.INPUT:
+                if self.array.pointer_array:
+                    LOGGER.error("Unhandled handle pointer arrays")
                 body += "        out[i] = " + self.array.handle.driver_handle("in[i]") + ";\n"
             else:
                 LOGGER.warning("Unhandled conversion operand type")
@@ -2339,7 +2358,7 @@ class ArrayConversionFunction(object):
             body += "    }\n"

if return_type:
-            body += "\n    return out;\n"
+            body += "\n    return {0}out;\n".format("(void *)" if self.array.pointer_array else "")
         body += "}\n"

body += "#endif /* USE_STRUCT_CONVERSION */\n"
diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c
index d4811a1b214..e1eb7b3a7b2 100644
--- a/dlls/winevulkan/vulkan_thunks.c
+++ b/dlls/winevulkan/vulkan_thunks.c
@@ -425,7 +425,62 @@ static inline const VkBindImageMemoryInfo_host *convert_VkBindImageMemoryInfo_ar
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_host(const VkAccelerationStructureBuildGeometryInfoKHR *in, VkAccelerationStructureBuildGeometryInfoKHR_host *out)
+static inline void convert_VkAccelerationStructureGeometryKHR_win32_to_host(const VkAccelerationStructureGeometryKHR *in, VkAccelerationStructureGeometryKHR_host *out)
+{
+    if (!in) return;
+
+    out->sType = in->sType;
+    out->pNext = in->pNext;
+    out->geometryType = in->geometryType;
+    out->geometry = in->geometry;
+    out->flags = in->flags;
+}
+#endif /* USE_STRUCT_CONVERSION */
+
+#if defined(USE_STRUCT_CONVERSION)
+static inline const VkAccelerationStructureGeometryKHR_host *convert_VkAccelerationStructureGeometryKHR_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureGeometryKHR *in, uint32_t count)
+{
+    VkAccelerationStructureGeometryKHR_host *out;
+    unsigned int i;
+
+    if (!in || !count) return NULL;
+
+    out = conversion_context_alloc(ctx, count * sizeof(*out));
+    for (i = 0; i < count; i++)
+    {
+        convert_VkAccelerationStructureGeometryKHR_win32_to_host(&in[i], &out[i]);
+    }
+
+    return out;
+}
+#endif /* USE_STRUCT_CONVERSION */
+
+#if defined(USE_STRUCT_CONVERSION)
+static inline const VkAccelerationStructureGeometryKHR_host * const*convert_VkAccelerationStructureGeometryKHR_pointer_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureGeometryKHR * const*in, uint32_t count)
+{
+    VkAccelerationStructureGeometryKHR_host **out;
+    unsigned int i;
+
+    if (!in || !count) return NULL;
+
+    out = conversion_context_alloc(ctx, count * sizeof(*out));
+    for (i = 0; i < count; i++)
+    {
+        if (in[i])
+        {
+            out[i] = conversion_context_alloc(ctx, sizeof(*out[i]));
+            convert_VkAccelerationStructureGeometryKHR_win32_to_host(in[i], out[i]);
+        }
+        else
+            out[i] = NULL;
+    }
+
+    return (void *)out;
+}
+#endif /* USE_STRUCT_CONVERSION */
+
+#if defined(USE_STRUCT_CONVERSION)
+static inline void convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureBuildGeometryInfoKHR *in, VkAccelerationStructureBuildGeometryInfoKHR_host *out)
 {
     if (!in) return;

@@ -437,8 +492,8 @@ static inline void convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_
     out->srcAccelerationStructure = in->srcAccelerationStructure;
     out->dstAccelerationStructure = in->dstAccelerationStructure;
     out->geometryCount = in->geometryCount;
-    out->pGeometries = in->pGeometries;
-    out->ppGeometries = in->ppGeometries;
+    out->pGeometries = convert_VkAccelerationStructureGeometryKHR_array_win32_to_host(ctx, in->pGeometries, in->geometryCount);
+    out->ppGeometries = convert_VkAccelerationStructureGeometryKHR_pointer_array_win32_to_host(ctx, in->ppGeometries, in->geometryCount);
     out->scratchData = in->scratchData;
 }
 #endif /* USE_STRUCT_CONVERSION */
@@ -454,7 +509,7 @@ static inline const VkAccelerationStructureBuildGeometryInfoKHR_host *convert_Vk
     out = conversion_context_alloc(ctx, count * sizeof(*out));
     for (i = 0; i < count; i++)
     {
-        convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_host(&in[i], &out[i]);
+        convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_host(ctx, &in[i], &out[i]);
     }

return out;
@@ -20033,13 +20088,16 @@ static NTSTATUS thunk32_vkGetAccelerationStructureBuildSizesKHR(void *args)
     struct vkGetAccelerationStructureBuildSizesKHR_params *params = args;
     VkAccelerationStructureBuildGeometryInfoKHR_host pBuildInfo_host;
     VkAccelerationStructureBuildSizesInfoKHR_host pSizeInfo_host;
+    struct conversion_context ctx;

TRACE("%p, %#x, %p, %p, %p\n", params->device, params->buildType, params->pBuildInfo, params->pMaxPrimitiveCounts, params->pSizeInfo);

-    convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_host(params->pBuildInfo, &pBuildInfo_host);
+    init_conversion_context(&ctx);
+    convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_host(&ctx, params->pBuildInfo, &pBuildInfo_host);
     convert_VkAccelerationStructureBuildSizesInfoKHR_win32_to_host(params->pSizeInfo, &pSizeInfo_host);
     wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureBuildSizesKHR(wine_device_from_handle(params->device)->device, params->buildType, &pBuildInfo_host, params->pMaxPrimitiveCounts, &pSizeInfo_host);
     convert_VkAccelerationStructureBuildSizesInfoKHR_host_to_win32(&pSizeInfo_host, params->pSizeInfo);
+    free_conversion_context(&ctx);
     return STATUS_SUCCESS;
 }

diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h
index db2eeae09ff..4fa37c918f0 100644
--- a/dlls/winevulkan/vulkan_thunks.h
+++ b/dlls/winevulkan/vulkan_thunks.h
@@ -199,6 +199,19 @@ typedef VkBindImageMemoryInfo VkBindImageMemoryInfoKHR;
 typedef VkBindImageMemoryInfo VkBindImageMemoryInfo_host;
 #endif

+#if defined(USE_STRUCT_CONVERSION)
+typedef struct VkAccelerationStructureGeometryKHR_host
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkGeometryTypeKHR geometryType;
+    VkAccelerationStructureGeometryDataKHR geometry;
+    VkGeometryFlagsKHR flags;
+} VkAccelerationStructureGeometryKHR_host;
+#else
+typedef VkAccelerationStructureGeometryKHR VkAccelerationStructureGeometryKHR_host;
+#endif
+
 #if defined(USE_STRUCT_CONVERSION)
 typedef struct VkAccelerationStructureBuildGeometryInfoKHR_host
 {
@@ -210,8 +223,8 @@ typedef struct VkAccelerationStructureBuildGeometryInfoKHR_host
     VkAccelerationStructureKHR srcAccelerationStructure;
     VkAccelerationStructureKHR dstAccelerationStructure;
     uint32_t geometryCount;
-    const VkAccelerationStructureGeometryKHR *pGeometries;
-    const VkAccelerationStructureGeometryKHR * const*ppGeometries;
+    const VkAccelerationStructureGeometryKHR_host *pGeometries;
+    const VkAccelerationStructureGeometryKHR_host * const*ppGeometries;
     VkDeviceOrHostAddressKHR scratchData;
 } VkAccelerationStructureBuildGeometryInfoKHR_host;
 #else

[PATCH 5/8] winevulkan: Use local params struct declarations for 32-bit thunks.

[Jacek Caban]

From: Jacek Caban

---
 dlls/winevulkan/make_vulkan     |   13 +-
 dlls/winevulkan/vulkan_thunks.c | 4019 +++++++++++++++++++++++++++----
 2 files changed, 3516 insertions(+), 516 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 1b98dc7e9a6..d8b16fe8cf1 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -860,7 +860,18 @@ class VkFunction(object):
     def thunk(self, prefix=None, conv=False):
         thunk = "NTSTATUS {0}{1}(void *args)\n".format(prefix, self.name)
         thunk += "{\n"
-        thunk += "    struct {0}_params *params = args;\n".format(self.name)
+        if conv:
+            thunk += "    struct\n"
+            thunk += "    {\n"
+            for p in self.params:
+                thunk += "        {0};\n".format(p.definition(is_member=True))
+            if self.extra_param:
+                thunk += "        void *{0};\n".format(self.extra_param)
+            if self.type != "void":
+                thunk += "        {0} result;\n".format(self.type)
+            thunk += "    } *params = args;\n"
+        else:
+            thunk += "    struct {0}_params *params = args;\n".format(self.name)
         thunk += self.body(conv=conv, unwrap=self.thunk_type == ThunkType.PUBLIC, params_prefix="params->")
         thunk += "}\n\n"
         return thunk
diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c
index e1eb7b3a7b2..8b6f66ef649 100644
--- a/dlls/winevulkan/vulkan_thunks.c
+++ b/dlls/winevulkan/vulkan_thunks.c
@@ -10648,7 +10648,13 @@ static NTSTATUS thunk64_vkAcquireNextImage2KHR(void *args)

static NTSTATUS thunk32_vkAcquireNextImage2KHR(void *args)
 {
-    struct vkAcquireNextImage2KHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkAcquireNextImageInfoKHR *pAcquireInfo;
+        uint32_t *pImageIndex;
+        VkResult result;
+    } *params = args;
     VkAcquireNextImageInfoKHR_host pAcquireInfo_host;

TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pImageIndex);
@@ -10676,7 +10682,16 @@ static NTSTATUS thunk64_vkAcquireNextImageKHR(void *args)

static NTSTATUS thunk32_vkAcquireNextImageKHR(void *args)
 {
-    struct vkAcquireNextImageKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkSwapchainKHR DECLSPEC_ALIGN(8) swapchain;
+        uint64_t DECLSPEC_ALIGN(8) timeout;
+        VkSemaphore DECLSPEC_ALIGN(8) semaphore;
+        VkFence DECLSPEC_ALIGN(8) fence;
+        uint32_t *pImageIndex;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->timeout), wine_dbgstr_longlong(params->semaphore), wine_dbgstr_longlong(params->fence), params->pImageIndex);

@@ -10702,7 +10717,13 @@ static NTSTATUS thunk64_vkAcquirePerformanceConfigurationINTEL(void *args)

static NTSTATUS thunk32_vkAcquirePerformanceConfigurationINTEL(void *args)
 {
-    struct vkAcquirePerformanceConfigurationINTEL_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkPerformanceConfigurationAcquireInfoINTEL *pAcquireInfo;
+        VkPerformanceConfigurationINTEL *pConfiguration;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pConfiguration);

@@ -10728,7 +10749,12 @@ static NTSTATUS thunk64_vkAcquireProfilingLockKHR(void *args)

static NTSTATUS thunk32_vkAcquireProfilingLockKHR(void *args)
 {
-    struct vkAcquireProfilingLockKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkAcquireProfilingLockInfoKHR *pInfo;
+        VkResult result;
+    } *params = args;
     VkAcquireProfilingLockInfoKHR_host pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);
@@ -10756,7 +10782,13 @@ static NTSTATUS thunk64_vkAllocateCommandBuffers(void *args)

static NTSTATUS thunk32_vkAllocateCommandBuffers(void *args)
 {
-    struct vkAllocateCommandBuffers_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkCommandBufferAllocateInfo *pAllocateInfo;
+        VkCommandBuffer *pCommandBuffers;
+        VkResult result;
+    } *params = args;
     VkCommandBufferAllocateInfo_host pAllocateInfo_host;

TRACE("%p, %p, %p\n", params->device, params->pAllocateInfo, params->pCommandBuffers);
@@ -10784,7 +10816,13 @@ static NTSTATUS thunk64_vkAllocateDescriptorSets(void *args)

static NTSTATUS thunk32_vkAllocateDescriptorSets(void *args)
 {
-    struct vkAllocateDescriptorSets_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDescriptorSetAllocateInfo *pAllocateInfo;
+        VkDescriptorSet *pDescriptorSets;
+        VkResult result;
+    } *params = args;
     VkDescriptorSetAllocateInfo_host pAllocateInfo_host;

TRACE("%p, %p, %p\n", params->device, params->pAllocateInfo, params->pDescriptorSets);
@@ -10812,7 +10850,14 @@ static NTSTATUS thunk64_vkAllocateMemory(void *args)

static NTSTATUS thunk32_vkAllocateMemory(void *args)
 {
-    struct vkAllocateMemory_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkMemoryAllocateInfo *pAllocateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkDeviceMemory *pMemory;
+        VkResult result;
+    } *params = args;
     VkMemoryAllocateInfo_host pAllocateInfo_host;
     struct conversion_context ctx;

@@ -10843,7 +10888,12 @@ static NTSTATUS thunk64_vkBeginCommandBuffer(void *args)

static NTSTATUS thunk32_vkBeginCommandBuffer(void *args)
 {
-    struct vkBeginCommandBuffer_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCommandBufferBeginInfo *pBeginInfo;
+        VkResult result;
+    } *params = args;
     VkCommandBufferBeginInfo_host pBeginInfo_host;
     struct conversion_context ctx;

@@ -10874,7 +10924,13 @@ static NTSTATUS thunk64_vkBindAccelerationStructureMemoryNV(void *args)

static NTSTATUS thunk32_vkBindAccelerationStructureMemoryNV(void *args)
 {
-    struct vkBindAccelerationStructureMemoryNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t bindInfoCount;
+        const VkBindAccelerationStructureMemoryInfoNV *pBindInfos;
+        VkResult result;
+    } *params = args;
     const VkBindAccelerationStructureMemoryInfoNV_host *pBindInfos_host;
     struct conversion_context ctx;

@@ -10905,7 +10961,14 @@ static NTSTATUS thunk64_vkBindBufferMemory(void *args)

static NTSTATUS thunk32_vkBindBufferMemory(void *args)
 {
-    struct vkBindBufferMemory_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+        VkDeviceSize DECLSPEC_ALIGN(8) memoryOffset;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset));

@@ -10931,7 +10994,13 @@ static NTSTATUS thunk64_vkBindBufferMemory2(void *args)

static NTSTATUS thunk32_vkBindBufferMemory2(void *args)
 {
-    struct vkBindBufferMemory2_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t bindInfoCount;
+        const VkBindBufferMemoryInfo *pBindInfos;
+        VkResult result;
+    } *params = args;
     const VkBindBufferMemoryInfo_host *pBindInfos_host;
     struct conversion_context ctx;

@@ -10962,7 +11031,13 @@ static NTSTATUS thunk64_vkBindBufferMemory2KHR(void *args)

static NTSTATUS thunk32_vkBindBufferMemory2KHR(void *args)
 {
-    struct vkBindBufferMemory2KHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t bindInfoCount;
+        const VkBindBufferMemoryInfo *pBindInfos;
+        VkResult result;
+    } *params = args;
     const VkBindBufferMemoryInfo_host *pBindInfos_host;
     struct conversion_context ctx;

@@ -10993,7 +11068,14 @@ static NTSTATUS thunk64_vkBindImageMemory(void *args)

static NTSTATUS thunk32_vkBindImageMemory(void *args)
 {
-    struct vkBindImageMemory_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkImage DECLSPEC_ALIGN(8) image;
+        VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+        VkDeviceSize DECLSPEC_ALIGN(8) memoryOffset;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->image), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset));

@@ -11019,7 +11101,13 @@ static NTSTATUS thunk64_vkBindImageMemory2(void *args)

static NTSTATUS thunk32_vkBindImageMemory2(void *args)
 {
-    struct vkBindImageMemory2_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t bindInfoCount;
+        const VkBindImageMemoryInfo *pBindInfos;
+        VkResult result;
+    } *params = args;
     const VkBindImageMemoryInfo_host *pBindInfos_host;
     struct conversion_context ctx;

@@ -11050,7 +11138,13 @@ static NTSTATUS thunk64_vkBindImageMemory2KHR(void *args)

static NTSTATUS thunk32_vkBindImageMemory2KHR(void *args)
 {
-    struct vkBindImageMemory2KHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t bindInfoCount;
+        const VkBindImageMemoryInfo *pBindInfos;
+        VkResult result;
+    } *params = args;
     const VkBindImageMemoryInfo_host *pBindInfos_host;
     struct conversion_context ctx;

@@ -11081,7 +11175,15 @@ static NTSTATUS thunk64_vkBindOpticalFlowSessionImageNV(void *args)

static NTSTATUS thunk32_vkBindOpticalFlowSessionImageNV(void *args)
 {
-    struct vkBindOpticalFlowSessionImageNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkOpticalFlowSessionNV DECLSPEC_ALIGN(8) session;
+        VkOpticalFlowSessionBindingPointNV bindingPoint;
+        VkImageView DECLSPEC_ALIGN(8) view;
+        VkImageLayout layout;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %#x, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->session), params->bindingPoint, wine_dbgstr_longlong(params->view), params->layout);

@@ -11107,7 +11209,15 @@ static NTSTATUS thunk64_vkBuildAccelerationStructuresKHR(void *args)

static NTSTATUS thunk32_vkBuildAccelerationStructuresKHR(void *args)
 {
-    struct vkBuildAccelerationStructuresKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
+        uint32_t infoCount;
+        const VkAccelerationStructureBuildGeometryInfoKHR *pInfos;
+        const VkAccelerationStructureBuildRangeInfoKHR * const*ppBuildRangeInfos;
+        VkResult result;
+    } *params = args;
     const VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
     struct conversion_context ctx;

@@ -11138,7 +11248,14 @@ static NTSTATUS thunk64_vkBuildMicromapsEXT(void *args)

static NTSTATUS thunk32_vkBuildMicromapsEXT(void *args)
 {
-    struct vkBuildMicromapsEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
+        uint32_t infoCount;
+        const VkMicromapBuildInfoEXT *pInfos;
+        VkResult result;
+    } *params = args;
     const VkMicromapBuildInfoEXT_host *pInfos_host;
     struct conversion_context ctx;

@@ -11169,7 +11286,11 @@ static NTSTATUS thunk64_vkCmdBeginConditionalRenderingEXT(void *args)

static NTSTATUS thunk32_vkCmdBeginConditionalRenderingEXT(void *args)
 {
-    struct vkCmdBeginConditionalRenderingEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkConditionalRenderingBeginInfoEXT *pConditionalRenderingBegin;
+    } *params = args;
     VkConditionalRenderingBeginInfoEXT_host pConditionalRenderingBegin_host;

TRACE("%p, %p\n", params->commandBuffer, params->pConditionalRenderingBegin);
@@ -11197,7 +11318,11 @@ static NTSTATUS thunk64_vkCmdBeginDebugUtilsLabelEXT(void *args)

static NTSTATUS thunk32_vkCmdBeginDebugUtilsLabelEXT(void *args)
 {
-    struct vkCmdBeginDebugUtilsLabelEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkDebugUtilsLabelEXT *pLabelInfo;
+    } *params = args;

TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo);

@@ -11223,7 +11348,13 @@ static NTSTATUS thunk64_vkCmdBeginQuery(void *args)

static NTSTATUS thunk32_vkCmdBeginQuery(void *args)
 {
-    struct vkCmdBeginQuery_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t query;
+        VkQueryControlFlags flags;
+    } *params = args;

TRACE("%p, 0x%s, %u, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags);

@@ -11249,7 +11380,14 @@ static NTSTATUS thunk64_vkCmdBeginQueryIndexedEXT(void *args)

static NTSTATUS thunk32_vkCmdBeginQueryIndexedEXT(void *args)
 {
-    struct vkCmdBeginQueryIndexedEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t query;
+        VkQueryControlFlags flags;
+        uint32_t index;
+    } *params = args;

TRACE("%p, 0x%s, %u, %#x, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags, params->index);

@@ -11275,7 +11413,12 @@ static NTSTATUS thunk64_vkCmdBeginRenderPass(void *args)

static NTSTATUS thunk32_vkCmdBeginRenderPass(void *args)
 {
-    struct vkCmdBeginRenderPass_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkRenderPassBeginInfo *pRenderPassBegin;
+        VkSubpassContents contents;
+    } *params = args;
     VkRenderPassBeginInfo_host pRenderPassBegin_host;

TRACE("%p, %p, %#x\n", params->commandBuffer, params->pRenderPassBegin, params->contents);
@@ -11303,7 +11446,12 @@ static NTSTATUS thunk64_vkCmdBeginRenderPass2(void *args)

static NTSTATUS thunk32_vkCmdBeginRenderPass2(void *args)
 {
-    struct vkCmdBeginRenderPass2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkRenderPassBeginInfo *pRenderPassBegin;
+        const VkSubpassBeginInfo *pSubpassBeginInfo;
+    } *params = args;
     VkRenderPassBeginInfo_host pRenderPassBegin_host;

TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo);
@@ -11331,7 +11479,12 @@ static NTSTATUS thunk64_vkCmdBeginRenderPass2KHR(void *args)

static NTSTATUS thunk32_vkCmdBeginRenderPass2KHR(void *args)
 {
-    struct vkCmdBeginRenderPass2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkRenderPassBeginInfo *pRenderPassBegin;
+        const VkSubpassBeginInfo *pSubpassBeginInfo;
+    } *params = args;
     VkRenderPassBeginInfo_host pRenderPassBegin_host;

TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo);
@@ -11359,7 +11512,11 @@ static NTSTATUS thunk64_vkCmdBeginRendering(void *args)

static NTSTATUS thunk32_vkCmdBeginRendering(void *args)
 {
-    struct vkCmdBeginRendering_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkRenderingInfo *pRenderingInfo;
+    } *params = args;
     VkRenderingInfo_host pRenderingInfo_host;
     struct conversion_context ctx;

@@ -11390,7 +11547,11 @@ static NTSTATUS thunk64_vkCmdBeginRenderingKHR(void *args)

static NTSTATUS thunk32_vkCmdBeginRenderingKHR(void *args)
 {
-    struct vkCmdBeginRenderingKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkRenderingInfo *pRenderingInfo;
+    } *params = args;
     VkRenderingInfo_host pRenderingInfo_host;
     struct conversion_context ctx;

@@ -11421,7 +11582,14 @@ static NTSTATUS thunk64_vkCmdBeginTransformFeedbackEXT(void *args)

static NTSTATUS thunk32_vkCmdBeginTransformFeedbackEXT(void *args)
 {
-    struct vkCmdBeginTransformFeedbackEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstCounterBuffer;
+        uint32_t counterBufferCount;
+        const VkBuffer *pCounterBuffers;
+        const VkDeviceSize *pCounterBufferOffsets;
+    } *params = args;

TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets);

@@ -11447,7 +11615,17 @@ static NTSTATUS thunk64_vkCmdBindDescriptorSets(void *args)

static NTSTATUS thunk32_vkCmdBindDescriptorSets(void *args)
 {
-    struct vkCmdBindDescriptorSets_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPipelineBindPoint pipelineBindPoint;
+        VkPipelineLayout DECLSPEC_ALIGN(8) layout;
+        uint32_t firstSet;
+        uint32_t descriptorSetCount;
+        const VkDescriptorSet *pDescriptorSets;
+        uint32_t dynamicOffsetCount;
+        const uint32_t *pDynamicOffsets;
+    } *params = args;

TRACE("%p, %#x, 0x%s, %u, %u, %p, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->firstSet, params->descriptorSetCount, params->pDescriptorSets, params->dynamicOffsetCount, params->pDynamicOffsets);

@@ -11473,7 +11651,13 @@ static NTSTATUS thunk64_vkCmdBindIndexBuffer(void *args)

static NTSTATUS thunk32_vkCmdBindIndexBuffer(void *args)
 {
-    struct vkCmdBindIndexBuffer_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        VkIndexType indexType;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->indexType);

@@ -11499,7 +11683,12 @@ static NTSTATUS thunk64_vkCmdBindInvocationMaskHUAWEI(void *args)

static NTSTATUS thunk32_vkCmdBindInvocationMaskHUAWEI(void *args)
 {
-    struct vkCmdBindInvocationMaskHUAWEI_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkImageView DECLSPEC_ALIGN(8) imageView;
+        VkImageLayout imageLayout;
+    } *params = args;

TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout);

@@ -11525,7 +11714,12 @@ static NTSTATUS thunk64_vkCmdBindPipeline(void *args)

static NTSTATUS thunk32_vkCmdBindPipeline(void *args)
 {
-    struct vkCmdBindPipeline_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPipelineBindPoint pipelineBindPoint;
+        VkPipeline DECLSPEC_ALIGN(8) pipeline;
+    } *params = args;

TRACE("%p, %#x, 0x%s\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline));

@@ -11551,7 +11745,13 @@ static NTSTATUS thunk64_vkCmdBindPipelineShaderGroupNV(void *args)

static NTSTATUS thunk32_vkCmdBindPipelineShaderGroupNV(void *args)
 {
-    struct vkCmdBindPipelineShaderGroupNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPipelineBindPoint pipelineBindPoint;
+        VkPipeline DECLSPEC_ALIGN(8) pipeline;
+        uint32_t groupIndex;
+    } *params = args;

TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline), params->groupIndex);

@@ -11577,7 +11777,12 @@ static NTSTATUS thunk64_vkCmdBindShadingRateImageNV(void *args)

static NTSTATUS thunk32_vkCmdBindShadingRateImageNV(void *args)
 {
-    struct vkCmdBindShadingRateImageNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkImageView DECLSPEC_ALIGN(8) imageView;
+        VkImageLayout imageLayout;
+    } *params = args;

TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout);

@@ -11603,7 +11808,15 @@ static NTSTATUS thunk64_vkCmdBindTransformFeedbackBuffersEXT(void *args)

static NTSTATUS thunk32_vkCmdBindTransformFeedbackBuffersEXT(void *args)
 {
-    struct vkCmdBindTransformFeedbackBuffersEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstBinding;
+        uint32_t bindingCount;
+        const VkBuffer *pBuffers;
+        const VkDeviceSize *pOffsets;
+        const VkDeviceSize *pSizes;
+    } *params = args;

TRACE("%p, %u, %u, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes);

@@ -11629,7 +11842,14 @@ static NTSTATUS thunk64_vkCmdBindVertexBuffers(void *args)

static NTSTATUS thunk32_vkCmdBindVertexBuffers(void *args)
 {
-    struct vkCmdBindVertexBuffers_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstBinding;
+        uint32_t bindingCount;
+        const VkBuffer *pBuffers;
+        const VkDeviceSize *pOffsets;
+    } *params = args;

TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets);

@@ -11655,7 +11875,16 @@ static NTSTATUS thunk64_vkCmdBindVertexBuffers2(void *args)

static NTSTATUS thunk32_vkCmdBindVertexBuffers2(void *args)
 {
-    struct vkCmdBindVertexBuffers2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstBinding;
+        uint32_t bindingCount;
+        const VkBuffer *pBuffers;
+        const VkDeviceSize *pOffsets;
+        const VkDeviceSize *pSizes;
+        const VkDeviceSize *pStrides;
+    } *params = args;

TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides);

@@ -11681,7 +11910,16 @@ static NTSTATUS thunk64_vkCmdBindVertexBuffers2EXT(void *args)

static NTSTATUS thunk32_vkCmdBindVertexBuffers2EXT(void *args)
 {
-    struct vkCmdBindVertexBuffers2EXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstBinding;
+        uint32_t bindingCount;
+        const VkBuffer *pBuffers;
+        const VkDeviceSize *pOffsets;
+        const VkDeviceSize *pSizes;
+        const VkDeviceSize *pStrides;
+    } *params = args;

TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides);

@@ -11707,7 +11945,17 @@ static NTSTATUS thunk64_vkCmdBlitImage(void *args)

static NTSTATUS thunk32_vkCmdBlitImage(void *args)
 {
-    struct vkCmdBlitImage_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkImage DECLSPEC_ALIGN(8) srcImage;
+        VkImageLayout srcImageLayout;
+        VkImage DECLSPEC_ALIGN(8) dstImage;
+        VkImageLayout dstImageLayout;
+        uint32_t regionCount;
+        const VkImageBlit *pRegions;
+        VkFilter filter;
+    } *params = args;

TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions, params->filter);

@@ -11733,7 +11981,11 @@ static NTSTATUS thunk64_vkCmdBlitImage2(void *args)

static NTSTATUS thunk32_vkCmdBlitImage2(void *args)
 {
-    struct vkCmdBlitImage2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkBlitImageInfo2 *pBlitImageInfo;
+    } *params = args;
     VkBlitImageInfo2_host pBlitImageInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo);
@@ -11761,7 +12013,11 @@ static NTSTATUS thunk64_vkCmdBlitImage2KHR(void *args)

static NTSTATUS thunk32_vkCmdBlitImage2KHR(void *args)
 {
-    struct vkCmdBlitImage2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkBlitImageInfo2 *pBlitImageInfo;
+    } *params = args;
     VkBlitImageInfo2_host pBlitImageInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo);
@@ -11789,7 +12045,18 @@ static NTSTATUS thunk64_vkCmdBuildAccelerationStructureNV(void *args)

static NTSTATUS thunk32_vkCmdBuildAccelerationStructureNV(void *args)
 {
-    struct vkCmdBuildAccelerationStructureNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkAccelerationStructureInfoNV *pInfo;
+        VkBuffer DECLSPEC_ALIGN(8) instanceData;
+        VkDeviceSize DECLSPEC_ALIGN(8) instanceOffset;
+        VkBool32 update;
+        VkAccelerationStructureNV DECLSPEC_ALIGN(8) dst;
+        VkAccelerationStructureNV DECLSPEC_ALIGN(8) src;
+        VkBuffer DECLSPEC_ALIGN(8) scratch;
+        VkDeviceSize DECLSPEC_ALIGN(8) scratchOffset;
+    } *params = args;
     VkAccelerationStructureInfoNV_host pInfo_host;
     struct conversion_context ctx;

@@ -11820,7 +12087,15 @@ static NTSTATUS thunk64_vkCmdBuildAccelerationStructuresIndirectKHR(void *args)

static NTSTATUS thunk32_vkCmdBuildAccelerationStructuresIndirectKHR(void *args)
 {
-    struct vkCmdBuildAccelerationStructuresIndirectKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t infoCount;
+        const VkAccelerationStructureBuildGeometryInfoKHR *pInfos;
+        const VkDeviceAddress *pIndirectDeviceAddresses;
+        const uint32_t *pIndirectStrides;
+        const uint32_t * const*ppMaxPrimitiveCounts;
+    } *params = args;
     const VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
     struct conversion_context ctx;

@@ -11851,7 +12126,13 @@ static NTSTATUS thunk64_vkCmdBuildAccelerationStructuresKHR(void *args)

static NTSTATUS thunk32_vkCmdBuildAccelerationStructuresKHR(void *args)
 {
-    struct vkCmdBuildAccelerationStructuresKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t infoCount;
+        const VkAccelerationStructureBuildGeometryInfoKHR *pInfos;
+        const VkAccelerationStructureBuildRangeInfoKHR * const*ppBuildRangeInfos;
+    } *params = args;
     const VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
     struct conversion_context ctx;

@@ -11882,7 +12163,12 @@ static NTSTATUS thunk64_vkCmdBuildMicromapsEXT(void *args)

static NTSTATUS thunk32_vkCmdBuildMicromapsEXT(void *args)
 {
-    struct vkCmdBuildMicromapsEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t infoCount;
+        const VkMicromapBuildInfoEXT *pInfos;
+    } *params = args;
     const VkMicromapBuildInfoEXT_host *pInfos_host;
     struct conversion_context ctx;

@@ -11913,7 +12199,14 @@ static NTSTATUS thunk64_vkCmdClearAttachments(void *args)

static NTSTATUS thunk32_vkCmdClearAttachments(void *args)
 {
-    struct vkCmdClearAttachments_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t attachmentCount;
+        const VkClearAttachment *pAttachments;
+        uint32_t rectCount;
+        const VkClearRect *pRects;
+    } *params = args;

TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pAttachments, params->rectCount, params->pRects);

@@ -11939,7 +12232,15 @@ static NTSTATUS thunk64_vkCmdClearColorImage(void *args)

static NTSTATUS thunk32_vkCmdClearColorImage(void *args)
 {
-    struct vkCmdClearColorImage_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkImage DECLSPEC_ALIGN(8) image;
+        VkImageLayout imageLayout;
+        const VkClearColorValue *pColor;
+        uint32_t rangeCount;
+        const VkImageSubresourceRange *pRanges;
+    } *params = args;

TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pColor, params->rangeCount, params->pRanges);

@@ -11965,7 +12266,15 @@ static NTSTATUS thunk64_vkCmdClearDepthStencilImage(void *args)

static NTSTATUS thunk32_vkCmdClearDepthStencilImage(void *args)
 {
-    struct vkCmdClearDepthStencilImage_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkImage DECLSPEC_ALIGN(8) image;
+        VkImageLayout imageLayout;
+        const VkClearDepthStencilValue *pDepthStencil;
+        uint32_t rangeCount;
+        const VkImageSubresourceRange *pRanges;
+    } *params = args;

TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pDepthStencil, params->rangeCount, params->pRanges);

@@ -11991,7 +12300,11 @@ static NTSTATUS thunk64_vkCmdCopyAccelerationStructureKHR(void *args)

static NTSTATUS thunk32_vkCmdCopyAccelerationStructureKHR(void *args)
 {
-    struct vkCmdCopyAccelerationStructureKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyAccelerationStructureInfoKHR *pInfo;
+    } *params = args;
     VkCopyAccelerationStructureInfoKHR_host pInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pInfo);
@@ -12019,7 +12332,13 @@ static NTSTATUS thunk64_vkCmdCopyAccelerationStructureNV(void *args)

static NTSTATUS thunk32_vkCmdCopyAccelerationStructureNV(void *args)
 {
-    struct vkCmdCopyAccelerationStructureNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkAccelerationStructureNV DECLSPEC_ALIGN(8) dst;
+        VkAccelerationStructureNV DECLSPEC_ALIGN(8) src;
+        VkCopyAccelerationStructureModeKHR mode;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), params->mode);

@@ -12045,7 +12364,11 @@ static NTSTATUS thunk64_vkCmdCopyAccelerationStructureToMemoryKHR(void *args)

static NTSTATUS thunk32_vkCmdCopyAccelerationStructureToMemoryKHR(void *args)
 {
-    struct vkCmdCopyAccelerationStructureToMemoryKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyAccelerationStructureToMemoryInfoKHR *pInfo;
+    } *params = args;
     VkCopyAccelerationStructureToMemoryInfoKHR_host pInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pInfo);
@@ -12073,7 +12396,14 @@ static NTSTATUS thunk64_vkCmdCopyBuffer(void *args)

static NTSTATUS thunk32_vkCmdCopyBuffer(void *args)
 {
-    struct vkCmdCopyBuffer_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) srcBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) dstBuffer;
+        uint32_t regionCount;
+        const VkBufferCopy *pRegions;
+    } *params = args;
     const VkBufferCopy_host *pRegions_host;
     struct conversion_context ctx;

@@ -12104,7 +12434,11 @@ static NTSTATUS thunk64_vkCmdCopyBuffer2(void *args)

static NTSTATUS thunk32_vkCmdCopyBuffer2(void *args)
 {
-    struct vkCmdCopyBuffer2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyBufferInfo2 *pCopyBufferInfo;
+    } *params = args;
     VkCopyBufferInfo2_host pCopyBufferInfo_host;
     struct conversion_context ctx;

@@ -12135,7 +12469,11 @@ static NTSTATUS thunk64_vkCmdCopyBuffer2KHR(void *args)

static NTSTATUS thunk32_vkCmdCopyBuffer2KHR(void *args)
 {
-    struct vkCmdCopyBuffer2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyBufferInfo2 *pCopyBufferInfo;
+    } *params = args;
     VkCopyBufferInfo2_host pCopyBufferInfo_host;
     struct conversion_context ctx;

@@ -12166,7 +12504,15 @@ static NTSTATUS thunk64_vkCmdCopyBufferToImage(void *args)

static NTSTATUS thunk32_vkCmdCopyBufferToImage(void *args)
 {
-    struct vkCmdCopyBufferToImage_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) srcBuffer;
+        VkImage DECLSPEC_ALIGN(8) dstImage;
+        VkImageLayout dstImageLayout;
+        uint32_t regionCount;
+        const VkBufferImageCopy *pRegions;
+    } *params = args;
     const VkBufferImageCopy_host *pRegions_host;
     struct conversion_context ctx;

@@ -12197,7 +12543,11 @@ static NTSTATUS thunk64_vkCmdCopyBufferToImage2(void *args)

static NTSTATUS thunk32_vkCmdCopyBufferToImage2(void *args)
 {
-    struct vkCmdCopyBufferToImage2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo;
+    } *params = args;
     VkCopyBufferToImageInfo2_host pCopyBufferToImageInfo_host;
     struct conversion_context ctx;

@@ -12228,7 +12578,11 @@ static NTSTATUS thunk64_vkCmdCopyBufferToImage2KHR(void *args)

static NTSTATUS thunk32_vkCmdCopyBufferToImage2KHR(void *args)
 {
-    struct vkCmdCopyBufferToImage2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo;
+    } *params = args;
     VkCopyBufferToImageInfo2_host pCopyBufferToImageInfo_host;
     struct conversion_context ctx;

@@ -12259,7 +12613,16 @@ static NTSTATUS thunk64_vkCmdCopyImage(void *args)

static NTSTATUS thunk32_vkCmdCopyImage(void *args)
 {
-    struct vkCmdCopyImage_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkImage DECLSPEC_ALIGN(8) srcImage;
+        VkImageLayout srcImageLayout;
+        VkImage DECLSPEC_ALIGN(8) dstImage;
+        VkImageLayout dstImageLayout;
+        uint32_t regionCount;
+        const VkImageCopy *pRegions;
+    } *params = args;

TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions);

@@ -12285,7 +12648,11 @@ static NTSTATUS thunk64_vkCmdCopyImage2(void *args)

static NTSTATUS thunk32_vkCmdCopyImage2(void *args)
 {
-    struct vkCmdCopyImage2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyImageInfo2 *pCopyImageInfo;
+    } *params = args;
     VkCopyImageInfo2_host pCopyImageInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo);
@@ -12313,7 +12680,11 @@ static NTSTATUS thunk64_vkCmdCopyImage2KHR(void *args)

static NTSTATUS thunk32_vkCmdCopyImage2KHR(void *args)
 {
-    struct vkCmdCopyImage2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyImageInfo2 *pCopyImageInfo;
+    } *params = args;
     VkCopyImageInfo2_host pCopyImageInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo);
@@ -12341,7 +12712,15 @@ static NTSTATUS thunk64_vkCmdCopyImageToBuffer(void *args)

static NTSTATUS thunk32_vkCmdCopyImageToBuffer(void *args)
 {
-    struct vkCmdCopyImageToBuffer_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkImage DECLSPEC_ALIGN(8) srcImage;
+        VkImageLayout srcImageLayout;
+        VkBuffer DECLSPEC_ALIGN(8) dstBuffer;
+        uint32_t regionCount;
+        const VkBufferImageCopy *pRegions;
+    } *params = args;
     const VkBufferImageCopy_host *pRegions_host;
     struct conversion_context ctx;

@@ -12372,7 +12751,11 @@ static NTSTATUS thunk64_vkCmdCopyImageToBuffer2(void *args)

static NTSTATUS thunk32_vkCmdCopyImageToBuffer2(void *args)
 {
-    struct vkCmdCopyImageToBuffer2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo;
+    } *params = args;
     VkCopyImageToBufferInfo2_host pCopyImageToBufferInfo_host;
     struct conversion_context ctx;

@@ -12403,7 +12786,11 @@ static NTSTATUS thunk64_vkCmdCopyImageToBuffer2KHR(void *args)

static NTSTATUS thunk32_vkCmdCopyImageToBuffer2KHR(void *args)
 {
-    struct vkCmdCopyImageToBuffer2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo;
+    } *params = args;
     VkCopyImageToBufferInfo2_host pCopyImageToBufferInfo_host;
     struct conversion_context ctx;

@@ -12434,7 +12821,13 @@ static NTSTATUS thunk64_vkCmdCopyMemoryIndirectNV(void *args)

static NTSTATUS thunk32_vkCmdCopyMemoryIndirectNV(void *args)
 {
-    struct vkCmdCopyMemoryIndirectNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkDeviceAddress DECLSPEC_ALIGN(8) copyBufferAddress;
+        uint32_t copyCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->copyBufferAddress), params->copyCount, params->stride);

@@ -12460,7 +12853,11 @@ static NTSTATUS thunk64_vkCmdCopyMemoryToAccelerationStructureKHR(void *args)

static NTSTATUS thunk32_vkCmdCopyMemoryToAccelerationStructureKHR(void *args)
 {
-    struct vkCmdCopyMemoryToAccelerationStructureKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyMemoryToAccelerationStructureInfoKHR *pInfo;
+    } *params = args;
     VkCopyMemoryToAccelerationStructureInfoKHR_host pInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pInfo);
@@ -12488,7 +12885,16 @@ static NTSTATUS thunk64_vkCmdCopyMemoryToImageIndirectNV(void *args)

static NTSTATUS thunk32_vkCmdCopyMemoryToImageIndirectNV(void *args)
 {
-    struct vkCmdCopyMemoryToImageIndirectNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkDeviceAddress DECLSPEC_ALIGN(8) copyBufferAddress;
+        uint32_t copyCount;
+        uint32_t stride;
+        VkImage DECLSPEC_ALIGN(8) dstImage;
+        VkImageLayout dstImageLayout;
+        const VkImageSubresourceLayers *pImageSubresources;
+    } *params = args;

TRACE("%p, 0x%s, %u, %u, 0x%s, %#x, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->copyBufferAddress), params->copyCount, params->stride, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->pImageSubresources);

@@ -12514,7 +12920,11 @@ static NTSTATUS thunk64_vkCmdCopyMemoryToMicromapEXT(void *args)

static NTSTATUS thunk32_vkCmdCopyMemoryToMicromapEXT(void *args)
 {
-    struct vkCmdCopyMemoryToMicromapEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyMemoryToMicromapInfoEXT *pInfo;
+    } *params = args;
     VkCopyMemoryToMicromapInfoEXT_host pInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pInfo);
@@ -12542,7 +12952,11 @@ static NTSTATUS thunk64_vkCmdCopyMicromapEXT(void *args)

static NTSTATUS thunk32_vkCmdCopyMicromapEXT(void *args)
 {
-    struct vkCmdCopyMicromapEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyMicromapInfoEXT *pInfo;
+    } *params = args;
     VkCopyMicromapInfoEXT_host pInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pInfo);
@@ -12570,7 +12984,11 @@ static NTSTATUS thunk64_vkCmdCopyMicromapToMemoryEXT(void *args)

static NTSTATUS thunk32_vkCmdCopyMicromapToMemoryEXT(void *args)
 {
-    struct vkCmdCopyMicromapToMemoryEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCopyMicromapToMemoryInfoEXT *pInfo;
+    } *params = args;
     VkCopyMicromapToMemoryInfoEXT_host pInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pInfo);
@@ -12598,7 +13016,17 @@ static NTSTATUS thunk64_vkCmdCopyQueryPoolResults(void *args)

static NTSTATUS thunk32_vkCmdCopyQueryPoolResults(void *args)
 {
-    struct vkCmdCopyQueryPoolResults_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t firstQuery;
+        uint32_t queryCount;
+        VkBuffer DECLSPEC_ALIGN(8) dstBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) dstOffset;
+        VkDeviceSize DECLSPEC_ALIGN(8) stride;
+        VkQueryResultFlags flags;
+    } *params = args;

TRACE("%p, 0x%s, %u, %u, 0x%s, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->stride), params->flags);

@@ -12624,7 +13052,11 @@ static NTSTATUS thunk64_vkCmdCuLaunchKernelNVX(void *args)

static NTSTATUS thunk32_vkCmdCuLaunchKernelNVX(void *args)
 {
-    struct vkCmdCuLaunchKernelNVX_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkCuLaunchInfoNVX *pLaunchInfo;
+    } *params = args;
     VkCuLaunchInfoNVX_host pLaunchInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pLaunchInfo);
@@ -12652,7 +13084,11 @@ static NTSTATUS thunk64_vkCmdDebugMarkerBeginEXT(void *args)

static NTSTATUS thunk32_vkCmdDebugMarkerBeginEXT(void *args)
 {
-    struct vkCmdDebugMarkerBeginEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkDebugMarkerMarkerInfoEXT *pMarkerInfo;
+    } *params = args;

TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo);

@@ -12678,7 +13114,10 @@ static NTSTATUS thunk64_vkCmdDebugMarkerEndEXT(void *args)

static NTSTATUS thunk32_vkCmdDebugMarkerEndEXT(void *args)
 {
-    struct vkCmdDebugMarkerEndEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+    } *params = args;

TRACE("%p\n", params->commandBuffer);

@@ -12704,7 +13143,11 @@ static NTSTATUS thunk64_vkCmdDebugMarkerInsertEXT(void *args)

static NTSTATUS thunk32_vkCmdDebugMarkerInsertEXT(void *args)
 {
-    struct vkCmdDebugMarkerInsertEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkDebugMarkerMarkerInfoEXT *pMarkerInfo;
+    } *params = args;

TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo);

@@ -12730,7 +13173,13 @@ static NTSTATUS thunk64_vkCmdDecompressMemoryIndirectCountNV(void *args)

static NTSTATUS thunk32_vkCmdDecompressMemoryIndirectCountNV(void *args)
 {
-    struct vkCmdDecompressMemoryIndirectCountNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkDeviceAddress DECLSPEC_ALIGN(8) indirectCommandsAddress;
+        VkDeviceAddress DECLSPEC_ALIGN(8) indirectCommandsCountAddress;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->indirectCommandsAddress), wine_dbgstr_longlong(params->indirectCommandsCountAddress), params->stride);

@@ -12756,7 +13205,12 @@ static NTSTATUS thunk64_vkCmdDecompressMemoryNV(void *args)

static NTSTATUS thunk32_vkCmdDecompressMemoryNV(void *args)
 {
-    struct vkCmdDecompressMemoryNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t decompressRegionCount;
+        const VkDecompressMemoryRegionNV *pDecompressMemoryRegions;
+    } *params = args;
     const VkDecompressMemoryRegionNV_host *pDecompressMemoryRegions_host;
     struct conversion_context ctx;

@@ -12787,7 +13241,13 @@ static NTSTATUS thunk64_vkCmdDispatch(void *args)

static NTSTATUS thunk32_vkCmdDispatch(void *args)
 {
-    struct vkCmdDispatch_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t groupCountX;
+        uint32_t groupCountY;
+        uint32_t groupCountZ;
+    } *params = args;

TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ);

@@ -12813,7 +13273,16 @@ static NTSTATUS thunk64_vkCmdDispatchBase(void *args)

static NTSTATUS thunk32_vkCmdDispatchBase(void *args)
 {
-    struct vkCmdDispatchBase_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t baseGroupX;
+        uint32_t baseGroupY;
+        uint32_t baseGroupZ;
+        uint32_t groupCountX;
+        uint32_t groupCountY;
+        uint32_t groupCountZ;
+    } *params = args;

TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ);

@@ -12839,7 +13308,16 @@ static NTSTATUS thunk64_vkCmdDispatchBaseKHR(void *args)

static NTSTATUS thunk32_vkCmdDispatchBaseKHR(void *args)
 {
-    struct vkCmdDispatchBaseKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t baseGroupX;
+        uint32_t baseGroupY;
+        uint32_t baseGroupZ;
+        uint32_t groupCountX;
+        uint32_t groupCountY;
+        uint32_t groupCountZ;
+    } *params = args;

TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ);

@@ -12865,7 +13343,12 @@ static NTSTATUS thunk64_vkCmdDispatchIndirect(void *args)

static NTSTATUS thunk32_vkCmdDispatchIndirect(void *args)
 {
-    struct vkCmdDispatchIndirect_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset));

@@ -12891,7 +13374,14 @@ static NTSTATUS thunk64_vkCmdDraw(void *args)

static NTSTATUS thunk32_vkCmdDraw(void *args)
 {
-    struct vkCmdDraw_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t vertexCount;
+        uint32_t instanceCount;
+        uint32_t firstVertex;
+        uint32_t firstInstance;
+    } *params = args;

TRACE("%p, %u, %u, %u, %u\n", params->commandBuffer, params->vertexCount, params->instanceCount, params->firstVertex, params->firstInstance);

@@ -12917,7 +13407,15 @@ static NTSTATUS thunk64_vkCmdDrawIndexed(void *args)

static NTSTATUS thunk32_vkCmdDrawIndexed(void *args)
 {
-    struct vkCmdDrawIndexed_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t indexCount;
+        uint32_t instanceCount;
+        uint32_t firstIndex;
+        int32_t vertexOffset;
+        uint32_t firstInstance;
+    } *params = args;

TRACE("%p, %u, %u, %u, %d, %u\n", params->commandBuffer, params->indexCount, params->instanceCount, params->firstIndex, params->vertexOffset, params->firstInstance);

@@ -12943,7 +13441,14 @@ static NTSTATUS thunk64_vkCmdDrawIndexedIndirect(void *args)

static NTSTATUS thunk32_vkCmdDrawIndexedIndirect(void *args)
 {
-    struct vkCmdDrawIndexedIndirect_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        uint32_t drawCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride);

@@ -12969,7 +13474,16 @@ static NTSTATUS thunk64_vkCmdDrawIndexedIndirectCount(void *args)

static NTSTATUS thunk32_vkCmdDrawIndexedIndirectCount(void *args)
 {
-    struct vkCmdDrawIndexedIndirectCount_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        VkBuffer DECLSPEC_ALIGN(8) countBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset;
+        uint32_t maxDrawCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride);

@@ -12995,7 +13509,16 @@ static NTSTATUS thunk64_vkCmdDrawIndexedIndirectCountAMD(void *args)

static NTSTATUS thunk32_vkCmdDrawIndexedIndirectCountAMD(void *args)
 {
-    struct vkCmdDrawIndexedIndirectCountAMD_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        VkBuffer DECLSPEC_ALIGN(8) countBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset;
+        uint32_t maxDrawCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride);

@@ -13021,7 +13544,16 @@ static NTSTATUS thunk64_vkCmdDrawIndexedIndirectCountKHR(void *args)

static NTSTATUS thunk32_vkCmdDrawIndexedIndirectCountKHR(void *args)
 {
-    struct vkCmdDrawIndexedIndirectCountKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        VkBuffer DECLSPEC_ALIGN(8) countBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset;
+        uint32_t maxDrawCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride);

@@ -13047,7 +13579,14 @@ static NTSTATUS thunk64_vkCmdDrawIndirect(void *args)

static NTSTATUS thunk32_vkCmdDrawIndirect(void *args)
 {
-    struct vkCmdDrawIndirect_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        uint32_t drawCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride);

@@ -13073,7 +13612,16 @@ static NTSTATUS thunk64_vkCmdDrawIndirectByteCountEXT(void *args)

static NTSTATUS thunk32_vkCmdDrawIndirectByteCountEXT(void *args)
 {
-    struct vkCmdDrawIndirectByteCountEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t instanceCount;
+        uint32_t firstInstance;
+        VkBuffer DECLSPEC_ALIGN(8) counterBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) counterBufferOffset;
+        uint32_t counterOffset;
+        uint32_t vertexStride;
+    } *params = args;

TRACE("%p, %u, %u, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, params->instanceCount, params->firstInstance, wine_dbgstr_longlong(params->counterBuffer), wine_dbgstr_longlong(params->counterBufferOffset), params->counterOffset, params->vertexStride);

@@ -13099,7 +13647,16 @@ static NTSTATUS thunk64_vkCmdDrawIndirectCount(void *args)

static NTSTATUS thunk32_vkCmdDrawIndirectCount(void *args)
 {
-    struct vkCmdDrawIndirectCount_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        VkBuffer DECLSPEC_ALIGN(8) countBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset;
+        uint32_t maxDrawCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride);

@@ -13125,7 +13682,16 @@ static NTSTATUS thunk64_vkCmdDrawIndirectCountAMD(void *args)

static NTSTATUS thunk32_vkCmdDrawIndirectCountAMD(void *args)
 {
-    struct vkCmdDrawIndirectCountAMD_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        VkBuffer DECLSPEC_ALIGN(8) countBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset;
+        uint32_t maxDrawCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride);

@@ -13151,7 +13717,16 @@ static NTSTATUS thunk64_vkCmdDrawIndirectCountKHR(void *args)

static NTSTATUS thunk32_vkCmdDrawIndirectCountKHR(void *args)
 {
-    struct vkCmdDrawIndirectCountKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        VkBuffer DECLSPEC_ALIGN(8) countBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset;
+        uint32_t maxDrawCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride);

@@ -13177,7 +13752,13 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksEXT(void *args)

static NTSTATUS thunk32_vkCmdDrawMeshTasksEXT(void *args)
 {
-    struct vkCmdDrawMeshTasksEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t groupCountX;
+        uint32_t groupCountY;
+        uint32_t groupCountZ;
+    } *params = args;

TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ);

@@ -13203,7 +13784,16 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectCountEXT(void *args)

static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectCountEXT(void *args)
 {
-    struct vkCmdDrawMeshTasksIndirectCountEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        VkBuffer DECLSPEC_ALIGN(8) countBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset;
+        uint32_t maxDrawCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride);

@@ -13229,7 +13819,16 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectCountNV(void *args)

static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectCountNV(void *args)
 {
-    struct vkCmdDrawMeshTasksIndirectCountNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        VkBuffer DECLSPEC_ALIGN(8) countBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset;
+        uint32_t maxDrawCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride);

@@ -13255,7 +13854,14 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectEXT(void *args)

static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectEXT(void *args)
 {
-    struct vkCmdDrawMeshTasksIndirectEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        uint32_t drawCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride);

@@ -13281,7 +13887,14 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectNV(void *args)

static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectNV(void *args)
 {
-    struct vkCmdDrawMeshTasksIndirectNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        uint32_t drawCount;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride);

@@ -13307,7 +13920,12 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksNV(void *args)

static NTSTATUS thunk32_vkCmdDrawMeshTasksNV(void *args)
 {
-    struct vkCmdDrawMeshTasksNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t taskCount;
+        uint32_t firstTask;
+    } *params = args;

TRACE("%p, %u, %u\n", params->commandBuffer, params->taskCount, params->firstTask);

@@ -13333,7 +13951,15 @@ static NTSTATUS thunk64_vkCmdDrawMultiEXT(void *args)

static NTSTATUS thunk32_vkCmdDrawMultiEXT(void *args)
 {
-    struct vkCmdDrawMultiEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t drawCount;
+        const VkMultiDrawInfoEXT *pVertexInfo;
+        uint32_t instanceCount;
+        uint32_t firstInstance;
+        uint32_t stride;
+    } *params = args;

TRACE("%p, %u, %p, %u, %u, %u\n", params->commandBuffer, params->drawCount, params->pVertexInfo, params->instanceCount, params->firstInstance, params->stride);

@@ -13359,7 +13985,16 @@ static NTSTATUS thunk64_vkCmdDrawMultiIndexedEXT(void *args)

static NTSTATUS thunk32_vkCmdDrawMultiIndexedEXT(void *args)
 {
-    struct vkCmdDrawMultiIndexedEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t drawCount;
+        const VkMultiDrawIndexedInfoEXT *pIndexInfo;
+        uint32_t instanceCount;
+        uint32_t firstInstance;
+        uint32_t stride;
+        const int32_t *pVertexOffset;
+    } *params = args;

TRACE("%p, %u, %p, %u, %u, %u, %p\n", params->commandBuffer, params->drawCount, params->pIndexInfo, params->instanceCount, params->firstInstance, params->stride, params->pVertexOffset);

@@ -13385,7 +14020,10 @@ static NTSTATUS thunk64_vkCmdEndConditionalRenderingEXT(void *args)

static NTSTATUS thunk32_vkCmdEndConditionalRenderingEXT(void *args)
 {
-    struct vkCmdEndConditionalRenderingEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+    } *params = args;

TRACE("%p\n", params->commandBuffer);

@@ -13411,7 +14049,10 @@ static NTSTATUS thunk64_vkCmdEndDebugUtilsLabelEXT(void *args)

static NTSTATUS thunk32_vkCmdEndDebugUtilsLabelEXT(void *args)
 {
-    struct vkCmdEndDebugUtilsLabelEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+    } *params = args;

TRACE("%p\n", params->commandBuffer);

@@ -13437,7 +14078,12 @@ static NTSTATUS thunk64_vkCmdEndQuery(void *args)

static NTSTATUS thunk32_vkCmdEndQuery(void *args)
 {
-    struct vkCmdEndQuery_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t query;
+    } *params = args;

TRACE("%p, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query);

@@ -13463,7 +14109,13 @@ static NTSTATUS thunk64_vkCmdEndQueryIndexedEXT(void *args)

static NTSTATUS thunk32_vkCmdEndQueryIndexedEXT(void *args)
 {
-    struct vkCmdEndQueryIndexedEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t query;
+        uint32_t index;
+    } *params = args;

TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->index);

@@ -13489,7 +14141,10 @@ static NTSTATUS thunk64_vkCmdEndRenderPass(void *args)

static NTSTATUS thunk32_vkCmdEndRenderPass(void *args)
 {
-    struct vkCmdEndRenderPass_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+    } *params = args;

TRACE("%p\n", params->commandBuffer);

@@ -13515,7 +14170,11 @@ static NTSTATUS thunk64_vkCmdEndRenderPass2(void *args)

static NTSTATUS thunk32_vkCmdEndRenderPass2(void *args)
 {
-    struct vkCmdEndRenderPass2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkSubpassEndInfo *pSubpassEndInfo;
+    } *params = args;

TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo);

@@ -13541,7 +14200,11 @@ static NTSTATUS thunk64_vkCmdEndRenderPass2KHR(void *args)

static NTSTATUS thunk32_vkCmdEndRenderPass2KHR(void *args)
 {
-    struct vkCmdEndRenderPass2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkSubpassEndInfo *pSubpassEndInfo;
+    } *params = args;

TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo);

@@ -13567,7 +14230,10 @@ static NTSTATUS thunk64_vkCmdEndRendering(void *args)

static NTSTATUS thunk32_vkCmdEndRendering(void *args)
 {
-    struct vkCmdEndRendering_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+    } *params = args;

TRACE("%p\n", params->commandBuffer);

@@ -13593,7 +14259,10 @@ static NTSTATUS thunk64_vkCmdEndRenderingKHR(void *args)

static NTSTATUS thunk32_vkCmdEndRenderingKHR(void *args)
 {
-    struct vkCmdEndRenderingKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+    } *params = args;

TRACE("%p\n", params->commandBuffer);

@@ -13619,7 +14288,14 @@ static NTSTATUS thunk64_vkCmdEndTransformFeedbackEXT(void *args)

static NTSTATUS thunk32_vkCmdEndTransformFeedbackEXT(void *args)
 {
-    struct vkCmdEndTransformFeedbackEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstCounterBuffer;
+        uint32_t counterBufferCount;
+        const VkBuffer *pCounterBuffers;
+        const VkDeviceSize *pCounterBufferOffsets;
+    } *params = args;

TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets);

@@ -13650,7 +14326,12 @@ static NTSTATUS thunk64_vkCmdExecuteCommands(void *args)

static NTSTATUS thunk32_vkCmdExecuteCommands(void *args)
 {
-    struct vkCmdExecuteCommands_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t commandBufferCount;
+        const VkCommandBuffer *pCommandBuffers;
+    } *params = args;
     const VkCommandBuffer *pCommandBuffers_host;
     struct conversion_context ctx;

@@ -13681,7 +14362,12 @@ static NTSTATUS thunk64_vkCmdExecuteGeneratedCommandsNV(void *args)

static NTSTATUS thunk32_vkCmdExecuteGeneratedCommandsNV(void *args)
 {
-    struct vkCmdExecuteGeneratedCommandsNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 isPreprocessed;
+        const VkGeneratedCommandsInfoNV *pGeneratedCommandsInfo;
+    } *params = args;
     VkGeneratedCommandsInfoNV_host pGeneratedCommandsInfo_host;
     struct conversion_context ctx;

@@ -13712,7 +14398,14 @@ static NTSTATUS thunk64_vkCmdFillBuffer(void *args)

static NTSTATUS thunk32_vkCmdFillBuffer(void *args)
 {
-    struct vkCmdFillBuffer_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) dstBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) dstOffset;
+        VkDeviceSize DECLSPEC_ALIGN(8) size;
+        uint32_t data;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->size), params->data);

@@ -13738,7 +14431,11 @@ static NTSTATUS thunk64_vkCmdInsertDebugUtilsLabelEXT(void *args)

static NTSTATUS thunk32_vkCmdInsertDebugUtilsLabelEXT(void *args)
 {
-    struct vkCmdInsertDebugUtilsLabelEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkDebugUtilsLabelEXT *pLabelInfo;
+    } *params = args;

TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo);

@@ -13764,7 +14461,11 @@ static NTSTATUS thunk64_vkCmdNextSubpass(void *args)

static NTSTATUS thunk32_vkCmdNextSubpass(void *args)
 {
-    struct vkCmdNextSubpass_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkSubpassContents contents;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->contents);

@@ -13790,7 +14491,12 @@ static NTSTATUS thunk64_vkCmdNextSubpass2(void *args)

static NTSTATUS thunk32_vkCmdNextSubpass2(void *args)
 {
-    struct vkCmdNextSubpass2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkSubpassBeginInfo *pSubpassBeginInfo;
+        const VkSubpassEndInfo *pSubpassEndInfo;
+    } *params = args;

TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo);

@@ -13816,7 +14522,12 @@ static NTSTATUS thunk64_vkCmdNextSubpass2KHR(void *args)

static NTSTATUS thunk32_vkCmdNextSubpass2KHR(void *args)
 {
-    struct vkCmdNextSubpass2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkSubpassBeginInfo *pSubpassBeginInfo;
+        const VkSubpassEndInfo *pSubpassEndInfo;
+    } *params = args;

TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo);

@@ -13842,7 +14553,12 @@ static NTSTATUS thunk64_vkCmdOpticalFlowExecuteNV(void *args)

static NTSTATUS thunk32_vkCmdOpticalFlowExecuteNV(void *args)
 {
-    struct vkCmdOpticalFlowExecuteNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkOpticalFlowSessionNV DECLSPEC_ALIGN(8) session;
+        const VkOpticalFlowExecuteInfoNV *pExecuteInfo;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->session), params->pExecuteInfo);

@@ -13868,7 +14584,19 @@ static NTSTATUS thunk64_vkCmdPipelineBarrier(void *args)

static NTSTATUS thunk32_vkCmdPipelineBarrier(void *args)
 {
-    struct vkCmdPipelineBarrier_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPipelineStageFlags srcStageMask;
+        VkPipelineStageFlags dstStageMask;
+        VkDependencyFlags dependencyFlags;
+        uint32_t memoryBarrierCount;
+        const VkMemoryBarrier *pMemoryBarriers;
+        uint32_t bufferMemoryBarrierCount;
+        const VkBufferMemoryBarrier *pBufferMemoryBarriers;
+        uint32_t imageMemoryBarrierCount;
+        const VkImageMemoryBarrier *pImageMemoryBarriers;
+    } *params = args;
     const VkBufferMemoryBarrier_host *pBufferMemoryBarriers_host;
     const VkImageMemoryBarrier_host *pImageMemoryBarriers_host;
     struct conversion_context ctx;
@@ -13901,7 +14629,11 @@ static NTSTATUS thunk64_vkCmdPipelineBarrier2(void *args)

static NTSTATUS thunk32_vkCmdPipelineBarrier2(void *args)
 {
-    struct vkCmdPipelineBarrier2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkDependencyInfo *pDependencyInfo;
+    } *params = args;
     VkDependencyInfo_host pDependencyInfo_host;
     struct conversion_context ctx;

@@ -13932,7 +14664,11 @@ static NTSTATUS thunk64_vkCmdPipelineBarrier2KHR(void *args)

static NTSTATUS thunk32_vkCmdPipelineBarrier2KHR(void *args)
 {
-    struct vkCmdPipelineBarrier2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkDependencyInfo *pDependencyInfo;
+    } *params = args;
     VkDependencyInfo_host pDependencyInfo_host;
     struct conversion_context ctx;

@@ -13963,7 +14699,11 @@ static NTSTATUS thunk64_vkCmdPreprocessGeneratedCommandsNV(void *args)

static NTSTATUS thunk32_vkCmdPreprocessGeneratedCommandsNV(void *args)
 {
-    struct vkCmdPreprocessGeneratedCommandsNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkGeneratedCommandsInfoNV *pGeneratedCommandsInfo;
+    } *params = args;
     VkGeneratedCommandsInfoNV_host pGeneratedCommandsInfo_host;
     struct conversion_context ctx;

@@ -13994,7 +14734,15 @@ static NTSTATUS thunk64_vkCmdPushConstants(void *args)

static NTSTATUS thunk32_vkCmdPushConstants(void *args)
 {
-    struct vkCmdPushConstants_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPipelineLayout DECLSPEC_ALIGN(8) layout;
+        VkShaderStageFlags stageFlags;
+        uint32_t offset;
+        uint32_t size;
+        const void *pValues;
+    } *params = args;

TRACE("%p, 0x%s, %#x, %u, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->layout), params->stageFlags, params->offset, params->size, params->pValues);

@@ -14020,7 +14768,15 @@ static NTSTATUS thunk64_vkCmdPushDescriptorSetKHR(void *args)

static NTSTATUS thunk32_vkCmdPushDescriptorSetKHR(void *args)
 {
-    struct vkCmdPushDescriptorSetKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPipelineBindPoint pipelineBindPoint;
+        VkPipelineLayout DECLSPEC_ALIGN(8) layout;
+        uint32_t set;
+        uint32_t descriptorWriteCount;
+        const VkWriteDescriptorSet *pDescriptorWrites;
+    } *params = args;
     const VkWriteDescriptorSet_host *pDescriptorWrites_host;
     struct conversion_context ctx;

@@ -14051,7 +14807,14 @@ static NTSTATUS thunk64_vkCmdPushDescriptorSetWithTemplateKHR(void *args)

static NTSTATUS thunk32_vkCmdPushDescriptorSetWithTemplateKHR(void *args)
 {
-    struct vkCmdPushDescriptorSetWithTemplateKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkDescriptorUpdateTemplate DECLSPEC_ALIGN(8) descriptorUpdateTemplate;
+        VkPipelineLayout DECLSPEC_ALIGN(8) layout;
+        uint32_t set;
+        const void *pData;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->descriptorUpdateTemplate), wine_dbgstr_longlong(params->layout), params->set, params->pData);

@@ -14077,7 +14840,12 @@ static NTSTATUS thunk64_vkCmdResetEvent(void *args)

static NTSTATUS thunk32_vkCmdResetEvent(void *args)
 {
-    struct vkCmdResetEvent_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkEvent DECLSPEC_ALIGN(8) event;
+        VkPipelineStageFlags stageMask;
+    } *params = args;

TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask);

@@ -14103,7 +14871,12 @@ static NTSTATUS thunk64_vkCmdResetEvent2(void *args)

static NTSTATUS thunk32_vkCmdResetEvent2(void *args)
 {
-    struct vkCmdResetEvent2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkEvent DECLSPEC_ALIGN(8) event;
+        VkPipelineStageFlags2 stageMask;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask));

@@ -14129,7 +14902,12 @@ static NTSTATUS thunk64_vkCmdResetEvent2KHR(void *args)

static NTSTATUS thunk32_vkCmdResetEvent2KHR(void *args)
 {
-    struct vkCmdResetEvent2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkEvent DECLSPEC_ALIGN(8) event;
+        VkPipelineStageFlags2 stageMask;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask));

@@ -14155,7 +14933,13 @@ static NTSTATUS thunk64_vkCmdResetQueryPool(void *args)

static NTSTATUS thunk32_vkCmdResetQueryPool(void *args)
 {
-    struct vkCmdResetQueryPool_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t firstQuery;
+        uint32_t queryCount;
+    } *params = args;

TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount);

@@ -14181,7 +14965,16 @@ static NTSTATUS thunk64_vkCmdResolveImage(void *args)

static NTSTATUS thunk32_vkCmdResolveImage(void *args)
 {
-    struct vkCmdResolveImage_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkImage DECLSPEC_ALIGN(8) srcImage;
+        VkImageLayout srcImageLayout;
+        VkImage DECLSPEC_ALIGN(8) dstImage;
+        VkImageLayout dstImageLayout;
+        uint32_t regionCount;
+        const VkImageResolve *pRegions;
+    } *params = args;

TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions);

@@ -14207,7 +15000,11 @@ static NTSTATUS thunk64_vkCmdResolveImage2(void *args)

static NTSTATUS thunk32_vkCmdResolveImage2(void *args)
 {
-    struct vkCmdResolveImage2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkResolveImageInfo2 *pResolveImageInfo;
+    } *params = args;
     VkResolveImageInfo2_host pResolveImageInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo);
@@ -14235,7 +15032,11 @@ static NTSTATUS thunk64_vkCmdResolveImage2KHR(void *args)

static NTSTATUS thunk32_vkCmdResolveImage2KHR(void *args)
 {
-    struct vkCmdResolveImage2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkResolveImageInfo2 *pResolveImageInfo;
+    } *params = args;
     VkResolveImageInfo2_host pResolveImageInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo);
@@ -14263,7 +15064,11 @@ static NTSTATUS thunk64_vkCmdSetAlphaToCoverageEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetAlphaToCoverageEnableEXT(void *args)
 {
-    struct vkCmdSetAlphaToCoverageEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 alphaToCoverageEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->alphaToCoverageEnable);

@@ -14289,7 +15094,11 @@ static NTSTATUS thunk64_vkCmdSetAlphaToOneEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetAlphaToOneEnableEXT(void *args)
 {
-    struct vkCmdSetAlphaToOneEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 alphaToOneEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->alphaToOneEnable);

@@ -14315,7 +15124,11 @@ static NTSTATUS thunk64_vkCmdSetBlendConstants(void *args)

static NTSTATUS thunk32_vkCmdSetBlendConstants(void *args)
 {
-    struct vkCmdSetBlendConstants_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const float *blendConstants;
+    } *params = args;

TRACE("%p, %p\n", params->commandBuffer, params->blendConstants);

@@ -14341,7 +15154,11 @@ static NTSTATUS thunk64_vkCmdSetCheckpointNV(void *args)

static NTSTATUS thunk32_vkCmdSetCheckpointNV(void *args)
 {
-    struct vkCmdSetCheckpointNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const void *pCheckpointMarker;
+    } *params = args;

TRACE("%p, %p\n", params->commandBuffer, params->pCheckpointMarker);

@@ -14367,7 +15184,13 @@ static NTSTATUS thunk64_vkCmdSetCoarseSampleOrderNV(void *args)

static NTSTATUS thunk32_vkCmdSetCoarseSampleOrderNV(void *args)
 {
-    struct vkCmdSetCoarseSampleOrderNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkCoarseSampleOrderTypeNV sampleOrderType;
+        uint32_t customSampleOrderCount;
+        const VkCoarseSampleOrderCustomNV *pCustomSampleOrders;
+    } *params = args;

TRACE("%p, %#x, %u, %p\n", params->commandBuffer, params->sampleOrderType, params->customSampleOrderCount, params->pCustomSampleOrders);

@@ -14393,7 +15216,13 @@ static NTSTATUS thunk64_vkCmdSetColorBlendAdvancedEXT(void *args)

static NTSTATUS thunk32_vkCmdSetColorBlendAdvancedEXT(void *args)
 {
-    struct vkCmdSetColorBlendAdvancedEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstAttachment;
+        uint32_t attachmentCount;
+        const VkColorBlendAdvancedEXT *pColorBlendAdvanced;
+    } *params = args;

TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstAttachment, params->attachmentCount, params->pColorBlendAdvanced);

@@ -14419,7 +15248,13 @@ static NTSTATUS thunk64_vkCmdSetColorBlendEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetColorBlendEnableEXT(void *args)
 {
-    struct vkCmdSetColorBlendEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstAttachment;
+        uint32_t attachmentCount;
+        const VkBool32 *pColorBlendEnables;
+    } *params = args;

TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstAttachment, params->attachmentCount, params->pColorBlendEnables);

@@ -14445,7 +15280,13 @@ static NTSTATUS thunk64_vkCmdSetColorBlendEquationEXT(void *args)

static NTSTATUS thunk32_vkCmdSetColorBlendEquationEXT(void *args)
 {
-    struct vkCmdSetColorBlendEquationEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstAttachment;
+        uint32_t attachmentCount;
+        const VkColorBlendEquationEXT *pColorBlendEquations;
+    } *params = args;

TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstAttachment, params->attachmentCount, params->pColorBlendEquations);

@@ -14471,7 +15312,12 @@ static NTSTATUS thunk64_vkCmdSetColorWriteEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetColorWriteEnableEXT(void *args)
 {
-    struct vkCmdSetColorWriteEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t attachmentCount;
+        const VkBool32 *pColorWriteEnables;
+    } *params = args;

TRACE("%p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pColorWriteEnables);

@@ -14497,7 +15343,13 @@ static NTSTATUS thunk64_vkCmdSetColorWriteMaskEXT(void *args)

static NTSTATUS thunk32_vkCmdSetColorWriteMaskEXT(void *args)
 {
-    struct vkCmdSetColorWriteMaskEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstAttachment;
+        uint32_t attachmentCount;
+        const VkColorComponentFlags *pColorWriteMasks;
+    } *params = args;

TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstAttachment, params->attachmentCount, params->pColorWriteMasks);

@@ -14523,7 +15375,11 @@ static NTSTATUS thunk64_vkCmdSetConservativeRasterizationModeEXT(void *args)

static NTSTATUS thunk32_vkCmdSetConservativeRasterizationModeEXT(void *args)
 {
-    struct vkCmdSetConservativeRasterizationModeEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkConservativeRasterizationModeEXT conservativeRasterizationMode;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->conservativeRasterizationMode);

@@ -14549,7 +15405,11 @@ static NTSTATUS thunk64_vkCmdSetCoverageModulationModeNV(void *args)

static NTSTATUS thunk32_vkCmdSetCoverageModulationModeNV(void *args)
 {
-    struct vkCmdSetCoverageModulationModeNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkCoverageModulationModeNV coverageModulationMode;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->coverageModulationMode);

@@ -14575,7 +15435,11 @@ static NTSTATUS thunk64_vkCmdSetCoverageModulationTableEnableNV(void *args)

static NTSTATUS thunk32_vkCmdSetCoverageModulationTableEnableNV(void *args)
 {
-    struct vkCmdSetCoverageModulationTableEnableNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 coverageModulationTableEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->coverageModulationTableEnable);

@@ -14601,7 +15465,12 @@ static NTSTATUS thunk64_vkCmdSetCoverageModulationTableNV(void *args)

static NTSTATUS thunk32_vkCmdSetCoverageModulationTableNV(void *args)
 {
-    struct vkCmdSetCoverageModulationTableNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t coverageModulationTableCount;
+        const float *pCoverageModulationTable;
+    } *params = args;

TRACE("%p, %u, %p\n", params->commandBuffer, params->coverageModulationTableCount, params->pCoverageModulationTable);

@@ -14627,7 +15496,11 @@ static NTSTATUS thunk64_vkCmdSetCoverageReductionModeNV(void *args)

static NTSTATUS thunk32_vkCmdSetCoverageReductionModeNV(void *args)
 {
-    struct vkCmdSetCoverageReductionModeNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkCoverageReductionModeNV coverageReductionMode;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->coverageReductionMode);

@@ -14653,7 +15526,11 @@ static NTSTATUS thunk64_vkCmdSetCoverageToColorEnableNV(void *args)

static NTSTATUS thunk32_vkCmdSetCoverageToColorEnableNV(void *args)
 {
-    struct vkCmdSetCoverageToColorEnableNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 coverageToColorEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->coverageToColorEnable);

@@ -14679,7 +15556,11 @@ static NTSTATUS thunk64_vkCmdSetCoverageToColorLocationNV(void *args)

static NTSTATUS thunk32_vkCmdSetCoverageToColorLocationNV(void *args)
 {
-    struct vkCmdSetCoverageToColorLocationNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t coverageToColorLocation;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->coverageToColorLocation);

@@ -14705,7 +15586,11 @@ static NTSTATUS thunk64_vkCmdSetCullMode(void *args)

static NTSTATUS thunk32_vkCmdSetCullMode(void *args)
 {
-    struct vkCmdSetCullMode_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkCullModeFlags cullMode;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->cullMode);

@@ -14731,7 +15616,11 @@ static NTSTATUS thunk64_vkCmdSetCullModeEXT(void *args)

static NTSTATUS thunk32_vkCmdSetCullModeEXT(void *args)
 {
-    struct vkCmdSetCullModeEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkCullModeFlags cullMode;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->cullMode);

@@ -14757,7 +15646,13 @@ static NTSTATUS thunk64_vkCmdSetDepthBias(void *args)

static NTSTATUS thunk32_vkCmdSetDepthBias(void *args)
 {
-    struct vkCmdSetDepthBias_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        float depthBiasConstantFactor;
+        float depthBiasClamp;
+        float depthBiasSlopeFactor;
+    } *params = args;

TRACE("%p, %f, %f, %f\n", params->commandBuffer, params->depthBiasConstantFactor, params->depthBiasClamp, params->depthBiasSlopeFactor);

@@ -14783,7 +15678,11 @@ static NTSTATUS thunk64_vkCmdSetDepthBiasEnable(void *args)

static NTSTATUS thunk32_vkCmdSetDepthBiasEnable(void *args)
 {
-    struct vkCmdSetDepthBiasEnable_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 depthBiasEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable);

@@ -14809,7 +15708,11 @@ static NTSTATUS thunk64_vkCmdSetDepthBiasEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetDepthBiasEnableEXT(void *args)
 {
-    struct vkCmdSetDepthBiasEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 depthBiasEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable);

@@ -14835,7 +15738,12 @@ static NTSTATUS thunk64_vkCmdSetDepthBounds(void *args)

static NTSTATUS thunk32_vkCmdSetDepthBounds(void *args)
 {
-    struct vkCmdSetDepthBounds_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        float minDepthBounds;
+        float maxDepthBounds;
+    } *params = args;

TRACE("%p, %f, %f\n", params->commandBuffer, params->minDepthBounds, params->maxDepthBounds);

@@ -14861,7 +15769,11 @@ static NTSTATUS thunk64_vkCmdSetDepthBoundsTestEnable(void *args)

static NTSTATUS thunk32_vkCmdSetDepthBoundsTestEnable(void *args)
 {
-    struct vkCmdSetDepthBoundsTestEnable_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 depthBoundsTestEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable);

@@ -14887,7 +15799,11 @@ static NTSTATUS thunk64_vkCmdSetDepthBoundsTestEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetDepthBoundsTestEnableEXT(void *args)
 {
-    struct vkCmdSetDepthBoundsTestEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 depthBoundsTestEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable);

@@ -14913,7 +15829,11 @@ static NTSTATUS thunk64_vkCmdSetDepthClampEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetDepthClampEnableEXT(void *args)
 {
-    struct vkCmdSetDepthClampEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 depthClampEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->depthClampEnable);

@@ -14939,7 +15859,11 @@ static NTSTATUS thunk64_vkCmdSetDepthClipEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetDepthClipEnableEXT(void *args)
 {
-    struct vkCmdSetDepthClipEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 depthClipEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->depthClipEnable);

@@ -14965,7 +15889,11 @@ static NTSTATUS thunk64_vkCmdSetDepthClipNegativeOneToOneEXT(void *args)

static NTSTATUS thunk32_vkCmdSetDepthClipNegativeOneToOneEXT(void *args)
 {
-    struct vkCmdSetDepthClipNegativeOneToOneEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 negativeOneToOne;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->negativeOneToOne);

@@ -14991,7 +15919,11 @@ static NTSTATUS thunk64_vkCmdSetDepthCompareOp(void *args)

static NTSTATUS thunk32_vkCmdSetDepthCompareOp(void *args)
 {
-    struct vkCmdSetDepthCompareOp_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkCompareOp depthCompareOp;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp);

@@ -15017,7 +15949,11 @@ static NTSTATUS thunk64_vkCmdSetDepthCompareOpEXT(void *args)

static NTSTATUS thunk32_vkCmdSetDepthCompareOpEXT(void *args)
 {
-    struct vkCmdSetDepthCompareOpEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkCompareOp depthCompareOp;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp);

@@ -15043,7 +15979,11 @@ static NTSTATUS thunk64_vkCmdSetDepthTestEnable(void *args)

static NTSTATUS thunk32_vkCmdSetDepthTestEnable(void *args)
 {
-    struct vkCmdSetDepthTestEnable_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 depthTestEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable);

@@ -15069,7 +16009,11 @@ static NTSTATUS thunk64_vkCmdSetDepthTestEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetDepthTestEnableEXT(void *args)
 {
-    struct vkCmdSetDepthTestEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 depthTestEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable);

@@ -15095,7 +16039,11 @@ static NTSTATUS thunk64_vkCmdSetDepthWriteEnable(void *args)

static NTSTATUS thunk32_vkCmdSetDepthWriteEnable(void *args)
 {
-    struct vkCmdSetDepthWriteEnable_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 depthWriteEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable);

@@ -15121,7 +16069,11 @@ static NTSTATUS thunk64_vkCmdSetDepthWriteEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetDepthWriteEnableEXT(void *args)
 {
-    struct vkCmdSetDepthWriteEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 depthWriteEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable);

@@ -15147,7 +16099,11 @@ static NTSTATUS thunk64_vkCmdSetDeviceMask(void *args)

static NTSTATUS thunk32_vkCmdSetDeviceMask(void *args)
 {
-    struct vkCmdSetDeviceMask_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t deviceMask;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->deviceMask);

@@ -15173,7 +16129,11 @@ static NTSTATUS thunk64_vkCmdSetDeviceMaskKHR(void *args)

static NTSTATUS thunk32_vkCmdSetDeviceMaskKHR(void *args)
 {
-    struct vkCmdSetDeviceMaskKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t deviceMask;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->deviceMask);

@@ -15199,7 +16159,13 @@ static NTSTATUS thunk64_vkCmdSetDiscardRectangleEXT(void *args)

static NTSTATUS thunk32_vkCmdSetDiscardRectangleEXT(void *args)
 {
-    struct vkCmdSetDiscardRectangleEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstDiscardRectangle;
+        uint32_t discardRectangleCount;
+        const VkRect2D *pDiscardRectangles;
+    } *params = args;

TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstDiscardRectangle, params->discardRectangleCount, params->pDiscardRectangles);

@@ -15225,7 +16191,12 @@ static NTSTATUS thunk64_vkCmdSetEvent(void *args)

static NTSTATUS thunk32_vkCmdSetEvent(void *args)
 {
-    struct vkCmdSetEvent_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkEvent DECLSPEC_ALIGN(8) event;
+        VkPipelineStageFlags stageMask;
+    } *params = args;

TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask);

@@ -15251,7 +16222,12 @@ static NTSTATUS thunk64_vkCmdSetEvent2(void *args)

static NTSTATUS thunk32_vkCmdSetEvent2(void *args)
 {
-    struct vkCmdSetEvent2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkEvent DECLSPEC_ALIGN(8) event;
+        const VkDependencyInfo *pDependencyInfo;
+    } *params = args;
     VkDependencyInfo_host pDependencyInfo_host;
     struct conversion_context ctx;

@@ -15282,7 +16258,12 @@ static NTSTATUS thunk64_vkCmdSetEvent2KHR(void *args)

static NTSTATUS thunk32_vkCmdSetEvent2KHR(void *args)
 {
-    struct vkCmdSetEvent2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkEvent DECLSPEC_ALIGN(8) event;
+        const VkDependencyInfo *pDependencyInfo;
+    } *params = args;
     VkDependencyInfo_host pDependencyInfo_host;
     struct conversion_context ctx;

@@ -15313,7 +16294,13 @@ static NTSTATUS thunk64_vkCmdSetExclusiveScissorNV(void *args)

static NTSTATUS thunk32_vkCmdSetExclusiveScissorNV(void *args)
 {
-    struct vkCmdSetExclusiveScissorNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstExclusiveScissor;
+        uint32_t exclusiveScissorCount;
+        const VkRect2D *pExclusiveScissors;
+    } *params = args;

TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstExclusiveScissor, params->exclusiveScissorCount, params->pExclusiveScissors);

@@ -15339,7 +16326,11 @@ static NTSTATUS thunk64_vkCmdSetExtraPrimitiveOverestimationSizeEXT(void *args)

static NTSTATUS thunk32_vkCmdSetExtraPrimitiveOverestimationSizeEXT(void *args)
 {
-    struct vkCmdSetExtraPrimitiveOverestimationSizeEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        float extraPrimitiveOverestimationSize;
+    } *params = args;

TRACE("%p, %f\n", params->commandBuffer, params->extraPrimitiveOverestimationSize);

@@ -15365,7 +16356,12 @@ static NTSTATUS thunk64_vkCmdSetFragmentShadingRateEnumNV(void *args)

static NTSTATUS thunk32_vkCmdSetFragmentShadingRateEnumNV(void *args)
 {
-    struct vkCmdSetFragmentShadingRateEnumNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkFragmentShadingRateNV shadingRate;
+        const VkFragmentShadingRateCombinerOpKHR *combinerOps;
+    } *params = args;

TRACE("%p, %#x, %p\n", params->commandBuffer, params->shadingRate, params->combinerOps);

@@ -15391,7 +16387,12 @@ static NTSTATUS thunk64_vkCmdSetFragmentShadingRateKHR(void *args)

static NTSTATUS thunk32_vkCmdSetFragmentShadingRateKHR(void *args)
 {
-    struct vkCmdSetFragmentShadingRateKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkExtent2D *pFragmentSize;
+        const VkFragmentShadingRateCombinerOpKHR *combinerOps;
+    } *params = args;

TRACE("%p, %p, %p\n", params->commandBuffer, params->pFragmentSize, params->combinerOps);

@@ -15417,7 +16418,11 @@ static NTSTATUS thunk64_vkCmdSetFrontFace(void *args)

static NTSTATUS thunk32_vkCmdSetFrontFace(void *args)
 {
-    struct vkCmdSetFrontFace_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkFrontFace frontFace;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->frontFace);

@@ -15443,7 +16448,11 @@ static NTSTATUS thunk64_vkCmdSetFrontFaceEXT(void *args)

static NTSTATUS thunk32_vkCmdSetFrontFaceEXT(void *args)
 {
-    struct vkCmdSetFrontFaceEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkFrontFace frontFace;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->frontFace);

@@ -15469,7 +16478,11 @@ static NTSTATUS thunk64_vkCmdSetLineRasterizationModeEXT(void *args)

static NTSTATUS thunk32_vkCmdSetLineRasterizationModeEXT(void *args)
 {
-    struct vkCmdSetLineRasterizationModeEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkLineRasterizationModeEXT lineRasterizationMode;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->lineRasterizationMode);

@@ -15495,7 +16508,12 @@ static NTSTATUS thunk64_vkCmdSetLineStippleEXT(void *args)

static NTSTATUS thunk32_vkCmdSetLineStippleEXT(void *args)
 {
-    struct vkCmdSetLineStippleEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t lineStippleFactor;
+        uint16_t lineStipplePattern;
+    } *params = args;

TRACE("%p, %u, %u\n", params->commandBuffer, params->lineStippleFactor, params->lineStipplePattern);

@@ -15521,7 +16539,11 @@ static NTSTATUS thunk64_vkCmdSetLineStippleEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetLineStippleEnableEXT(void *args)
 {
-    struct vkCmdSetLineStippleEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 stippledLineEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->stippledLineEnable);

@@ -15547,7 +16569,11 @@ static NTSTATUS thunk64_vkCmdSetLineWidth(void *args)

static NTSTATUS thunk32_vkCmdSetLineWidth(void *args)
 {
-    struct vkCmdSetLineWidth_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        float lineWidth;
+    } *params = args;

TRACE("%p, %f\n", params->commandBuffer, params->lineWidth);

@@ -15573,7 +16599,11 @@ static NTSTATUS thunk64_vkCmdSetLogicOpEXT(void *args)

static NTSTATUS thunk32_vkCmdSetLogicOpEXT(void *args)
 {
-    struct vkCmdSetLogicOpEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkLogicOp logicOp;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->logicOp);

@@ -15599,7 +16629,11 @@ static NTSTATUS thunk64_vkCmdSetLogicOpEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetLogicOpEnableEXT(void *args)
 {
-    struct vkCmdSetLogicOpEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 logicOpEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->logicOpEnable);

@@ -15625,7 +16659,11 @@ static NTSTATUS thunk64_vkCmdSetPatchControlPointsEXT(void *args)

static NTSTATUS thunk32_vkCmdSetPatchControlPointsEXT(void *args)
 {
-    struct vkCmdSetPatchControlPointsEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t patchControlPoints;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->patchControlPoints);

@@ -15651,7 +16689,12 @@ static NTSTATUS thunk64_vkCmdSetPerformanceMarkerINTEL(void *args)

static NTSTATUS thunk32_vkCmdSetPerformanceMarkerINTEL(void *args)
 {
-    struct vkCmdSetPerformanceMarkerINTEL_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkPerformanceMarkerInfoINTEL *pMarkerInfo;
+        VkResult result;
+    } *params = args;
     VkPerformanceMarkerInfoINTEL_host pMarkerInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo);
@@ -15679,7 +16722,12 @@ static NTSTATUS thunk64_vkCmdSetPerformanceOverrideINTEL(void *args)

static NTSTATUS thunk32_vkCmdSetPerformanceOverrideINTEL(void *args)
 {
-    struct vkCmdSetPerformanceOverrideINTEL_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkPerformanceOverrideInfoINTEL *pOverrideInfo;
+        VkResult result;
+    } *params = args;
     VkPerformanceOverrideInfoINTEL_host pOverrideInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pOverrideInfo);
@@ -15707,7 +16755,12 @@ static NTSTATUS thunk64_vkCmdSetPerformanceStreamMarkerINTEL(void *args)

static NTSTATUS thunk32_vkCmdSetPerformanceStreamMarkerINTEL(void *args)
 {
-    struct vkCmdSetPerformanceStreamMarkerINTEL_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkPerformanceStreamMarkerInfoINTEL *pMarkerInfo;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo);

@@ -15733,7 +16786,11 @@ static NTSTATUS thunk64_vkCmdSetPolygonModeEXT(void *args)

static NTSTATUS thunk32_vkCmdSetPolygonModeEXT(void *args)
 {
-    struct vkCmdSetPolygonModeEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPolygonMode polygonMode;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->polygonMode);

@@ -15759,7 +16816,11 @@ static NTSTATUS thunk64_vkCmdSetPrimitiveRestartEnable(void *args)

static NTSTATUS thunk32_vkCmdSetPrimitiveRestartEnable(void *args)
 {
-    struct vkCmdSetPrimitiveRestartEnable_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 primitiveRestartEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable);

@@ -15785,7 +16846,11 @@ static NTSTATUS thunk64_vkCmdSetPrimitiveRestartEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetPrimitiveRestartEnableEXT(void *args)
 {
-    struct vkCmdSetPrimitiveRestartEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 primitiveRestartEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable);

@@ -15811,7 +16876,11 @@ static NTSTATUS thunk64_vkCmdSetPrimitiveTopology(void *args)

static NTSTATUS thunk32_vkCmdSetPrimitiveTopology(void *args)
 {
-    struct vkCmdSetPrimitiveTopology_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPrimitiveTopology primitiveTopology;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology);

@@ -15837,7 +16906,11 @@ static NTSTATUS thunk64_vkCmdSetPrimitiveTopologyEXT(void *args)

static NTSTATUS thunk32_vkCmdSetPrimitiveTopologyEXT(void *args)
 {
-    struct vkCmdSetPrimitiveTopologyEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPrimitiveTopology primitiveTopology;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology);

@@ -15863,7 +16936,11 @@ static NTSTATUS thunk64_vkCmdSetProvokingVertexModeEXT(void *args)

static NTSTATUS thunk32_vkCmdSetProvokingVertexModeEXT(void *args)
 {
-    struct vkCmdSetProvokingVertexModeEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkProvokingVertexModeEXT provokingVertexMode;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->provokingVertexMode);

@@ -15889,7 +16966,11 @@ static NTSTATUS thunk64_vkCmdSetRasterizationSamplesEXT(void *args)

static NTSTATUS thunk32_vkCmdSetRasterizationSamplesEXT(void *args)
 {
-    struct vkCmdSetRasterizationSamplesEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkSampleCountFlagBits rasterizationSamples;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->rasterizationSamples);

@@ -15915,7 +16996,11 @@ static NTSTATUS thunk64_vkCmdSetRasterizationStreamEXT(void *args)

static NTSTATUS thunk32_vkCmdSetRasterizationStreamEXT(void *args)
 {
-    struct vkCmdSetRasterizationStreamEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t rasterizationStream;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->rasterizationStream);

@@ -15941,7 +17026,11 @@ static NTSTATUS thunk64_vkCmdSetRasterizerDiscardEnable(void *args)

static NTSTATUS thunk32_vkCmdSetRasterizerDiscardEnable(void *args)
 {
-    struct vkCmdSetRasterizerDiscardEnable_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 rasterizerDiscardEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable);

@@ -15967,7 +17056,11 @@ static NTSTATUS thunk64_vkCmdSetRasterizerDiscardEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetRasterizerDiscardEnableEXT(void *args)
 {
-    struct vkCmdSetRasterizerDiscardEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 rasterizerDiscardEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable);

@@ -15993,7 +17086,11 @@ static NTSTATUS thunk64_vkCmdSetRayTracingPipelineStackSizeKHR(void *args)

static NTSTATUS thunk32_vkCmdSetRayTracingPipelineStackSizeKHR(void *args)
 {
-    struct vkCmdSetRayTracingPipelineStackSizeKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t pipelineStackSize;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->pipelineStackSize);

@@ -16019,7 +17116,11 @@ static NTSTATUS thunk64_vkCmdSetRepresentativeFragmentTestEnableNV(void *args)

static NTSTATUS thunk32_vkCmdSetRepresentativeFragmentTestEnableNV(void *args)
 {
-    struct vkCmdSetRepresentativeFragmentTestEnableNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 representativeFragmentTestEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->representativeFragmentTestEnable);

@@ -16045,7 +17146,11 @@ static NTSTATUS thunk64_vkCmdSetSampleLocationsEXT(void *args)

static NTSTATUS thunk32_vkCmdSetSampleLocationsEXT(void *args)
 {
-    struct vkCmdSetSampleLocationsEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkSampleLocationsInfoEXT *pSampleLocationsInfo;
+    } *params = args;

TRACE("%p, %p\n", params->commandBuffer, params->pSampleLocationsInfo);

@@ -16071,7 +17176,11 @@ static NTSTATUS thunk64_vkCmdSetSampleLocationsEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetSampleLocationsEnableEXT(void *args)
 {
-    struct vkCmdSetSampleLocationsEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 sampleLocationsEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->sampleLocationsEnable);

@@ -16097,7 +17206,12 @@ static NTSTATUS thunk64_vkCmdSetSampleMaskEXT(void *args)

static NTSTATUS thunk32_vkCmdSetSampleMaskEXT(void *args)
 {
-    struct vkCmdSetSampleMaskEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkSampleCountFlagBits samples;
+        const VkSampleMask *pSampleMask;
+    } *params = args;

TRACE("%p, %#x, %p\n", params->commandBuffer, params->samples, params->pSampleMask);

@@ -16123,7 +17237,13 @@ static NTSTATUS thunk64_vkCmdSetScissor(void *args)

static NTSTATUS thunk32_vkCmdSetScissor(void *args)
 {
-    struct vkCmdSetScissor_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstScissor;
+        uint32_t scissorCount;
+        const VkRect2D *pScissors;
+    } *params = args;

TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstScissor, params->scissorCount, params->pScissors);

@@ -16149,7 +17269,12 @@ static NTSTATUS thunk64_vkCmdSetScissorWithCount(void *args)

static NTSTATUS thunk32_vkCmdSetScissorWithCount(void *args)
 {
-    struct vkCmdSetScissorWithCount_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t scissorCount;
+        const VkRect2D *pScissors;
+    } *params = args;

TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors);

@@ -16175,7 +17300,12 @@ static NTSTATUS thunk64_vkCmdSetScissorWithCountEXT(void *args)

static NTSTATUS thunk32_vkCmdSetScissorWithCountEXT(void *args)
 {
-    struct vkCmdSetScissorWithCountEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t scissorCount;
+        const VkRect2D *pScissors;
+    } *params = args;

TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors);

@@ -16201,7 +17331,11 @@ static NTSTATUS thunk64_vkCmdSetShadingRateImageEnableNV(void *args)

static NTSTATUS thunk32_vkCmdSetShadingRateImageEnableNV(void *args)
 {
-    struct vkCmdSetShadingRateImageEnableNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 shadingRateImageEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->shadingRateImageEnable);

@@ -16227,7 +17361,12 @@ static NTSTATUS thunk64_vkCmdSetStencilCompareMask(void *args)

static NTSTATUS thunk32_vkCmdSetStencilCompareMask(void *args)
 {
-    struct vkCmdSetStencilCompareMask_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkStencilFaceFlags faceMask;
+        uint32_t compareMask;
+    } *params = args;

TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->compareMask);

@@ -16253,7 +17392,15 @@ static NTSTATUS thunk64_vkCmdSetStencilOp(void *args)

static NTSTATUS thunk32_vkCmdSetStencilOp(void *args)
 {
-    struct vkCmdSetStencilOp_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkStencilFaceFlags faceMask;
+        VkStencilOp failOp;
+        VkStencilOp passOp;
+        VkStencilOp depthFailOp;
+        VkCompareOp compareOp;
+    } *params = args;

TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp);

@@ -16279,7 +17426,15 @@ static NTSTATUS thunk64_vkCmdSetStencilOpEXT(void *args)

static NTSTATUS thunk32_vkCmdSetStencilOpEXT(void *args)
 {
-    struct vkCmdSetStencilOpEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkStencilFaceFlags faceMask;
+        VkStencilOp failOp;
+        VkStencilOp passOp;
+        VkStencilOp depthFailOp;
+        VkCompareOp compareOp;
+    } *params = args;

TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp);

@@ -16305,7 +17460,12 @@ static NTSTATUS thunk64_vkCmdSetStencilReference(void *args)

static NTSTATUS thunk32_vkCmdSetStencilReference(void *args)
 {
-    struct vkCmdSetStencilReference_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkStencilFaceFlags faceMask;
+        uint32_t reference;
+    } *params = args;

TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->reference);

@@ -16331,7 +17491,11 @@ static NTSTATUS thunk64_vkCmdSetStencilTestEnable(void *args)

static NTSTATUS thunk32_vkCmdSetStencilTestEnable(void *args)
 {
-    struct vkCmdSetStencilTestEnable_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 stencilTestEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable);

@@ -16357,7 +17521,11 @@ static NTSTATUS thunk64_vkCmdSetStencilTestEnableEXT(void *args)

static NTSTATUS thunk32_vkCmdSetStencilTestEnableEXT(void *args)
 {
-    struct vkCmdSetStencilTestEnableEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 stencilTestEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable);

@@ -16383,7 +17551,12 @@ static NTSTATUS thunk64_vkCmdSetStencilWriteMask(void *args)

static NTSTATUS thunk32_vkCmdSetStencilWriteMask(void *args)
 {
-    struct vkCmdSetStencilWriteMask_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkStencilFaceFlags faceMask;
+        uint32_t writeMask;
+    } *params = args;

TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->writeMask);

@@ -16409,7 +17582,11 @@ static NTSTATUS thunk64_vkCmdSetTessellationDomainOriginEXT(void *args)

static NTSTATUS thunk32_vkCmdSetTessellationDomainOriginEXT(void *args)
 {
-    struct vkCmdSetTessellationDomainOriginEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkTessellationDomainOrigin domainOrigin;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->domainOrigin);

@@ -16435,7 +17612,14 @@ static NTSTATUS thunk64_vkCmdSetVertexInputEXT(void *args)

static NTSTATUS thunk32_vkCmdSetVertexInputEXT(void *args)
 {
-    struct vkCmdSetVertexInputEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t vertexBindingDescriptionCount;
+        const VkVertexInputBindingDescription2EXT *pVertexBindingDescriptions;
+        uint32_t vertexAttributeDescriptionCount;
+        const VkVertexInputAttributeDescription2EXT *pVertexAttributeDescriptions;
+    } *params = args;

TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->vertexBindingDescriptionCount, params->pVertexBindingDescriptions, params->vertexAttributeDescriptionCount, params->pVertexAttributeDescriptions);

@@ -16461,7 +17645,13 @@ static NTSTATUS thunk64_vkCmdSetViewport(void *args)

static NTSTATUS thunk32_vkCmdSetViewport(void *args)
 {
-    struct vkCmdSetViewport_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstViewport;
+        uint32_t viewportCount;
+        const VkViewport *pViewports;
+    } *params = args;

TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewports);

@@ -16487,7 +17677,13 @@ static NTSTATUS thunk64_vkCmdSetViewportShadingRatePaletteNV(void *args)

static NTSTATUS thunk32_vkCmdSetViewportShadingRatePaletteNV(void *args)
 {
-    struct vkCmdSetViewportShadingRatePaletteNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstViewport;
+        uint32_t viewportCount;
+        const VkShadingRatePaletteNV *pShadingRatePalettes;
+    } *params = args;

TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pShadingRatePalettes);

@@ -16513,7 +17709,13 @@ static NTSTATUS thunk64_vkCmdSetViewportSwizzleNV(void *args)

static NTSTATUS thunk32_vkCmdSetViewportSwizzleNV(void *args)
 {
-    struct vkCmdSetViewportSwizzleNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstViewport;
+        uint32_t viewportCount;
+        const VkViewportSwizzleNV *pViewportSwizzles;
+    } *params = args;

TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewportSwizzles);

@@ -16539,7 +17741,11 @@ static NTSTATUS thunk64_vkCmdSetViewportWScalingEnableNV(void *args)

static NTSTATUS thunk32_vkCmdSetViewportWScalingEnableNV(void *args)
 {
-    struct vkCmdSetViewportWScalingEnableNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBool32 viewportWScalingEnable;
+    } *params = args;

TRACE("%p, %u\n", params->commandBuffer, params->viewportWScalingEnable);

@@ -16565,7 +17771,13 @@ static NTSTATUS thunk64_vkCmdSetViewportWScalingNV(void *args)

static NTSTATUS thunk32_vkCmdSetViewportWScalingNV(void *args)
 {
-    struct vkCmdSetViewportWScalingNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t firstViewport;
+        uint32_t viewportCount;
+        const VkViewportWScalingNV *pViewportWScalings;
+    } *params = args;

TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewportWScalings);

@@ -16591,7 +17803,12 @@ static NTSTATUS thunk64_vkCmdSetViewportWithCount(void *args)

static NTSTATUS thunk32_vkCmdSetViewportWithCount(void *args)
 {
-    struct vkCmdSetViewportWithCount_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t viewportCount;
+        const VkViewport *pViewports;
+    } *params = args;

TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports);

@@ -16617,7 +17834,12 @@ static NTSTATUS thunk64_vkCmdSetViewportWithCountEXT(void *args)

static NTSTATUS thunk32_vkCmdSetViewportWithCountEXT(void *args)
 {
-    struct vkCmdSetViewportWithCountEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t viewportCount;
+        const VkViewport *pViewports;
+    } *params = args;

TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports);

@@ -16643,7 +17865,10 @@ static NTSTATUS thunk64_vkCmdSubpassShadingHUAWEI(void *args)

static NTSTATUS thunk32_vkCmdSubpassShadingHUAWEI(void *args)
 {
-    struct vkCmdSubpassShadingHUAWEI_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+    } *params = args;

TRACE("%p\n", params->commandBuffer);

@@ -16669,7 +17894,11 @@ static NTSTATUS thunk64_vkCmdTraceRaysIndirect2KHR(void *args)

static NTSTATUS thunk32_vkCmdTraceRaysIndirect2KHR(void *args)
 {
-    struct vkCmdTraceRaysIndirect2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkDeviceAddress DECLSPEC_ALIGN(8) indirectDeviceAddress;
+    } *params = args;

TRACE("%p, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->indirectDeviceAddress));

@@ -16695,7 +17924,15 @@ static NTSTATUS thunk64_vkCmdTraceRaysIndirectKHR(void *args)

static NTSTATUS thunk32_vkCmdTraceRaysIndirectKHR(void *args)
 {
-    struct vkCmdTraceRaysIndirectKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkStridedDeviceAddressRegionKHR *pRaygenShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR *pHitShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR *pCallableShaderBindingTable;
+        VkDeviceAddress DECLSPEC_ALIGN(8) indirectDeviceAddress;
+    } *params = args;
     VkStridedDeviceAddressRegionKHR_host pRaygenShaderBindingTable_host;
     VkStridedDeviceAddressRegionKHR_host pMissShaderBindingTable_host;
     VkStridedDeviceAddressRegionKHR_host pHitShaderBindingTable_host;
@@ -16729,7 +17966,17 @@ static NTSTATUS thunk64_vkCmdTraceRaysKHR(void *args)

static NTSTATUS thunk32_vkCmdTraceRaysKHR(void *args)
 {
-    struct vkCmdTraceRaysKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        const VkStridedDeviceAddressRegionKHR *pRaygenShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR *pHitShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR *pCallableShaderBindingTable;
+        uint32_t width;
+        uint32_t height;
+        uint32_t depth;
+    } *params = args;
     VkStridedDeviceAddressRegionKHR_host pRaygenShaderBindingTable_host;
     VkStridedDeviceAddressRegionKHR_host pMissShaderBindingTable_host;
     VkStridedDeviceAddressRegionKHR_host pHitShaderBindingTable_host;
@@ -16763,7 +18010,24 @@ static NTSTATUS thunk64_vkCmdTraceRaysNV(void *args)

static NTSTATUS thunk32_vkCmdTraceRaysNV(void *args)
 {
-    struct vkCmdTraceRaysNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) raygenShaderBindingTableBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) raygenShaderBindingOffset;
+        VkBuffer DECLSPEC_ALIGN(8) missShaderBindingTableBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) missShaderBindingOffset;
+        VkDeviceSize DECLSPEC_ALIGN(8) missShaderBindingStride;
+        VkBuffer DECLSPEC_ALIGN(8) hitShaderBindingTableBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) hitShaderBindingOffset;
+        VkDeviceSize DECLSPEC_ALIGN(8) hitShaderBindingStride;
+        VkBuffer DECLSPEC_ALIGN(8) callableShaderBindingTableBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) callableShaderBindingOffset;
+        VkDeviceSize DECLSPEC_ALIGN(8) callableShaderBindingStride;
+        uint32_t width;
+        uint32_t height;
+        uint32_t depth;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->raygenShaderBindingTableBuffer), wine_dbgstr_longlong(params->raygenShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingTableBuffer), wine_dbgstr_longlong(params->missShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingStride), wine_dbgstr_longlong(params->hitShaderBindingTableBuffer), wine_dbgstr_longlong(params->hitShaderBindingOffset), wine_dbgstr_longlong(params->hitShaderBindingStride), wine_dbgstr_longlong(params->callableShaderBindingTableBuffer), wine_dbgstr_longlong(params->callableShaderBindingOffset), wine_dbgstr_longlong(params->callableShaderBindingStride), params->width, params->height, params->depth);

@@ -16789,7 +18053,14 @@ static NTSTATUS thunk64_vkCmdUpdateBuffer(void *args)

static NTSTATUS thunk32_vkCmdUpdateBuffer(void *args)
 {
-    struct vkCmdUpdateBuffer_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkBuffer DECLSPEC_ALIGN(8) dstBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) dstOffset;
+        VkDeviceSize DECLSPEC_ALIGN(8) dataSize;
+        const void *pData;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->dataSize), params->pData);

@@ -16815,7 +18086,20 @@ static NTSTATUS thunk64_vkCmdWaitEvents(void *args)

static NTSTATUS thunk32_vkCmdWaitEvents(void *args)
 {
-    struct vkCmdWaitEvents_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t eventCount;
+        const VkEvent *pEvents;
+        VkPipelineStageFlags srcStageMask;
+        VkPipelineStageFlags dstStageMask;
+        uint32_t memoryBarrierCount;
+        const VkMemoryBarrier *pMemoryBarriers;
+        uint32_t bufferMemoryBarrierCount;
+        const VkBufferMemoryBarrier *pBufferMemoryBarriers;
+        uint32_t imageMemoryBarrierCount;
+        const VkImageMemoryBarrier *pImageMemoryBarriers;
+    } *params = args;
     const VkBufferMemoryBarrier_host *pBufferMemoryBarriers_host;
     const VkImageMemoryBarrier_host *pImageMemoryBarriers_host;
     struct conversion_context ctx;
@@ -16848,7 +18132,13 @@ static NTSTATUS thunk64_vkCmdWaitEvents2(void *args)

static NTSTATUS thunk32_vkCmdWaitEvents2(void *args)
 {
-    struct vkCmdWaitEvents2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t eventCount;
+        const VkEvent *pEvents;
+        const VkDependencyInfo *pDependencyInfos;
+    } *params = args;
     const VkDependencyInfo_host *pDependencyInfos_host;
     struct conversion_context ctx;

@@ -16879,7 +18169,13 @@ static NTSTATUS thunk64_vkCmdWaitEvents2KHR(void *args)

static NTSTATUS thunk32_vkCmdWaitEvents2KHR(void *args)
 {
-    struct vkCmdWaitEvents2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t eventCount;
+        const VkEvent *pEvents;
+        const VkDependencyInfo *pDependencyInfos;
+    } *params = args;
     const VkDependencyInfo_host *pDependencyInfos_host;
     struct conversion_context ctx;

@@ -16910,7 +18206,15 @@ static NTSTATUS thunk64_vkCmdWriteAccelerationStructuresPropertiesKHR(void *args

static NTSTATUS thunk32_vkCmdWriteAccelerationStructuresPropertiesKHR(void *args)
 {
-    struct vkCmdWriteAccelerationStructuresPropertiesKHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t accelerationStructureCount;
+        const VkAccelerationStructureKHR *pAccelerationStructures;
+        VkQueryType queryType;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t firstQuery;
+    } *params = args;

TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery);

@@ -16936,7 +18240,15 @@ static NTSTATUS thunk64_vkCmdWriteAccelerationStructuresPropertiesNV(void *args)

static NTSTATUS thunk32_vkCmdWriteAccelerationStructuresPropertiesNV(void *args)
 {
-    struct vkCmdWriteAccelerationStructuresPropertiesNV_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t accelerationStructureCount;
+        const VkAccelerationStructureNV *pAccelerationStructures;
+        VkQueryType queryType;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t firstQuery;
+    } *params = args;

TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery);

@@ -16962,7 +18274,14 @@ static NTSTATUS thunk64_vkCmdWriteBufferMarker2AMD(void *args)

static NTSTATUS thunk32_vkCmdWriteBufferMarker2AMD(void *args)
 {
-    struct vkCmdWriteBufferMarker2AMD_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPipelineStageFlags2 stage;
+        VkBuffer DECLSPEC_ALIGN(8) dstBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) dstOffset;
+        uint32_t marker;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker);

@@ -16988,7 +18307,14 @@ static NTSTATUS thunk64_vkCmdWriteBufferMarkerAMD(void *args)

static NTSTATUS thunk32_vkCmdWriteBufferMarkerAMD(void *args)
 {
-    struct vkCmdWriteBufferMarkerAMD_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPipelineStageFlagBits pipelineStage;
+        VkBuffer DECLSPEC_ALIGN(8) dstBuffer;
+        VkDeviceSize DECLSPEC_ALIGN(8) dstOffset;
+        uint32_t marker;
+    } *params = args;

TRACE("%p, %#x, 0x%s, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker);

@@ -17014,7 +18340,15 @@ static NTSTATUS thunk64_vkCmdWriteMicromapsPropertiesEXT(void *args)

static NTSTATUS thunk32_vkCmdWriteMicromapsPropertiesEXT(void *args)
 {
-    struct vkCmdWriteMicromapsPropertiesEXT_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        uint32_t micromapCount;
+        const VkMicromapEXT *pMicromaps;
+        VkQueryType queryType;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t firstQuery;
+    } *params = args;

TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->micromapCount, params->pMicromaps, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery);

@@ -17040,7 +18374,13 @@ static NTSTATUS thunk64_vkCmdWriteTimestamp(void *args)

static NTSTATUS thunk32_vkCmdWriteTimestamp(void *args)
 {
-    struct vkCmdWriteTimestamp_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPipelineStageFlagBits pipelineStage;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t query;
+    } *params = args;

TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->queryPool), params->query);

@@ -17066,7 +18406,13 @@ static NTSTATUS thunk64_vkCmdWriteTimestamp2(void *args)

static NTSTATUS thunk32_vkCmdWriteTimestamp2(void *args)
 {
-    struct vkCmdWriteTimestamp2_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPipelineStageFlags2 stage;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t query;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query);

@@ -17092,7 +18438,13 @@ static NTSTATUS thunk64_vkCmdWriteTimestamp2KHR(void *args)

static NTSTATUS thunk32_vkCmdWriteTimestamp2KHR(void *args)
 {
-    struct vkCmdWriteTimestamp2KHR_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkPipelineStageFlags2 stage;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t query;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query);

@@ -17118,7 +18470,13 @@ static NTSTATUS thunk64_vkCompileDeferredNV(void *args)

static NTSTATUS thunk32_vkCompileDeferredNV(void *args)
 {
-    struct vkCompileDeferredNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipeline DECLSPEC_ALIGN(8) pipeline;
+        uint32_t shader;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %u\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shader);

@@ -17144,7 +18502,13 @@ static NTSTATUS thunk64_vkCopyAccelerationStructureKHR(void *args)

static NTSTATUS thunk32_vkCopyAccelerationStructureKHR(void *args)
 {
-    struct vkCopyAccelerationStructureKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
+        const VkCopyAccelerationStructureInfoKHR *pInfo;
+        VkResult result;
+    } *params = args;
     VkCopyAccelerationStructureInfoKHR_host pInfo_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo);
@@ -17172,7 +18536,13 @@ static NTSTATUS thunk64_vkCopyAccelerationStructureToMemoryKHR(void *args)

static NTSTATUS thunk32_vkCopyAccelerationStructureToMemoryKHR(void *args)
 {
-    struct vkCopyAccelerationStructureToMemoryKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
+        const VkCopyAccelerationStructureToMemoryInfoKHR *pInfo;
+        VkResult result;
+    } *params = args;
     VkCopyAccelerationStructureToMemoryInfoKHR_host pInfo_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo);
@@ -17200,7 +18570,13 @@ static NTSTATUS thunk64_vkCopyMemoryToAccelerationStructureKHR(void *args)

static NTSTATUS thunk32_vkCopyMemoryToAccelerationStructureKHR(void *args)
 {
-    struct vkCopyMemoryToAccelerationStructureKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
+        const VkCopyMemoryToAccelerationStructureInfoKHR *pInfo;
+        VkResult result;
+    } *params = args;
     VkCopyMemoryToAccelerationStructureInfoKHR_host pInfo_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo);
@@ -17228,7 +18604,13 @@ static NTSTATUS thunk64_vkCopyMemoryToMicromapEXT(void *args)

static NTSTATUS thunk32_vkCopyMemoryToMicromapEXT(void *args)
 {
-    struct vkCopyMemoryToMicromapEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
+        const VkCopyMemoryToMicromapInfoEXT *pInfo;
+        VkResult result;
+    } *params = args;
     VkCopyMemoryToMicromapInfoEXT_host pInfo_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo);
@@ -17256,7 +18638,13 @@ static NTSTATUS thunk64_vkCopyMicromapEXT(void *args)

static NTSTATUS thunk32_vkCopyMicromapEXT(void *args)
 {
-    struct vkCopyMicromapEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
+        const VkCopyMicromapInfoEXT *pInfo;
+        VkResult result;
+    } *params = args;
     VkCopyMicromapInfoEXT_host pInfo_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo);
@@ -17284,7 +18672,13 @@ static NTSTATUS thunk64_vkCopyMicromapToMemoryEXT(void *args)

static NTSTATUS thunk32_vkCopyMicromapToMemoryEXT(void *args)
 {
-    struct vkCopyMicromapToMemoryEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
+        const VkCopyMicromapToMemoryInfoEXT *pInfo;
+        VkResult result;
+    } *params = args;
     VkCopyMicromapToMemoryInfoEXT_host pInfo_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo);
@@ -17312,7 +18706,14 @@ static NTSTATUS thunk64_vkCreateAccelerationStructureKHR(void *args)

static NTSTATUS thunk32_vkCreateAccelerationStructureKHR(void *args)
 {
-    struct vkCreateAccelerationStructureKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkAccelerationStructureCreateInfoKHR *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkAccelerationStructureKHR *pAccelerationStructure;
+        VkResult result;
+    } *params = args;
     VkAccelerationStructureCreateInfoKHR_host pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pAccelerationStructure);
@@ -17340,7 +18741,14 @@ static NTSTATUS thunk64_vkCreateAccelerationStructureNV(void *args)

static NTSTATUS thunk32_vkCreateAccelerationStructureNV(void *args)
 {
-    struct vkCreateAccelerationStructureNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkAccelerationStructureCreateInfoNV *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkAccelerationStructureNV *pAccelerationStructure;
+        VkResult result;
+    } *params = args;
     VkAccelerationStructureCreateInfoNV_host pCreateInfo_host;
     struct conversion_context ctx;

@@ -17371,7 +18779,14 @@ static NTSTATUS thunk64_vkCreateBuffer(void *args)

static NTSTATUS thunk32_vkCreateBuffer(void *args)
 {
-    struct vkCreateBuffer_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkBufferCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkBuffer *pBuffer;
+        VkResult result;
+    } *params = args;
     VkBufferCreateInfo_host pCreateInfo_host;
     struct conversion_context ctx;

@@ -17402,7 +18817,14 @@ static NTSTATUS thunk64_vkCreateBufferView(void *args)

static NTSTATUS thunk32_vkCreateBufferView(void *args)
 {
-    struct vkCreateBufferView_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkBufferViewCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkBufferView *pView;
+        VkResult result;
+    } *params = args;
     VkBufferViewCreateInfo_host pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView);
@@ -17430,7 +18852,15 @@ static NTSTATUS thunk64_vkCreateCommandPool(void *args)

static NTSTATUS thunk32_vkCreateCommandPool(void *args)
 {
-    struct vkCreateCommandPool_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkCommandPoolCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkCommandPool *pCommandPool;
+        void *client_ptr;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pCommandPool);

@@ -17461,7 +18891,16 @@ static NTSTATUS thunk64_vkCreateComputePipelines(void *args)

static NTSTATUS thunk32_vkCreateComputePipelines(void *args)
 {
-    struct vkCreateComputePipelines_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache;
+        uint32_t createInfoCount;
+        const VkComputePipelineCreateInfo *pCreateInfos;
+        const VkAllocationCallbacks *pAllocator;
+        VkPipeline *pPipelines;
+        VkResult result;
+    } *params = args;
     const VkComputePipelineCreateInfo_host *pCreateInfos_host;
     struct conversion_context ctx;

@@ -17493,7 +18932,14 @@ static NTSTATUS thunk64_vkCreateCuFunctionNVX(void *args)

static NTSTATUS thunk32_vkCreateCuFunctionNVX(void *args)
 {
-    struct vkCreateCuFunctionNVX_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkCuFunctionCreateInfoNVX *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkCuFunctionNVX *pFunction;
+        VkResult result;
+    } *params = args;
     VkCuFunctionCreateInfoNVX_host pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFunction);
@@ -17521,7 +18967,14 @@ static NTSTATUS thunk64_vkCreateCuModuleNVX(void *args)

static NTSTATUS thunk32_vkCreateCuModuleNVX(void *args)
 {
-    struct vkCreateCuModuleNVX_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkCuModuleCreateInfoNVX *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkCuModuleNVX *pModule;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pModule);

@@ -17547,7 +19000,14 @@ static NTSTATUS thunk64_vkCreateDebugReportCallbackEXT(void *args)

static NTSTATUS thunk32_vkCreateDebugReportCallbackEXT(void *args)
 {
-    struct vkCreateDebugReportCallbackEXT_params *params = args;
+    struct
+    {
+        VkInstance instance;
+        const VkDebugReportCallbackCreateInfoEXT *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkDebugReportCallbackEXT *pCallback;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->instance, params->pCreateInfo, params->pAllocator, params->pCallback);

@@ -17573,7 +19033,14 @@ static NTSTATUS thunk64_vkCreateDebugUtilsMessengerEXT(void *args)

static NTSTATUS thunk32_vkCreateDebugUtilsMessengerEXT(void *args)
 {
-    struct vkCreateDebugUtilsMessengerEXT_params *params = args;
+    struct
+    {
+        VkInstance instance;
+        const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkDebugUtilsMessengerEXT *pMessenger;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->instance, params->pCreateInfo, params->pAllocator, params->pMessenger);

@@ -17599,7 +19066,13 @@ static NTSTATUS thunk64_vkCreateDeferredOperationKHR(void *args)

static NTSTATUS thunk32_vkCreateDeferredOperationKHR(void *args)
 {
-    struct vkCreateDeferredOperationKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkAllocationCallbacks *pAllocator;
+        VkDeferredOperationKHR *pDeferredOperation;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->device, params->pAllocator, params->pDeferredOperation);

@@ -17625,7 +19098,14 @@ static NTSTATUS thunk64_vkCreateDescriptorPool(void *args)

static NTSTATUS thunk32_vkCreateDescriptorPool(void *args)
 {
-    struct vkCreateDescriptorPool_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDescriptorPoolCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkDescriptorPool *pDescriptorPool;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorPool);

@@ -17651,7 +19131,14 @@ static NTSTATUS thunk64_vkCreateDescriptorSetLayout(void *args)

static NTSTATUS thunk32_vkCreateDescriptorSetLayout(void *args)
 {
-    struct vkCreateDescriptorSetLayout_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDescriptorSetLayoutCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkDescriptorSetLayout *pSetLayout;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSetLayout);

@@ -17677,7 +19164,14 @@ static NTSTATUS thunk64_vkCreateDescriptorUpdateTemplate(void *args)

static NTSTATUS thunk32_vkCreateDescriptorUpdateTemplate(void *args)
 {
-    struct vkCreateDescriptorUpdateTemplate_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDescriptorUpdateTemplateCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkDescriptorUpdateTemplate *pDescriptorUpdateTemplate;
+        VkResult result;
+    } *params = args;
     VkDescriptorUpdateTemplateCreateInfo_host pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate);
@@ -17705,7 +19199,14 @@ static NTSTATUS thunk64_vkCreateDescriptorUpdateTemplateKHR(void *args)

static NTSTATUS thunk32_vkCreateDescriptorUpdateTemplateKHR(void *args)
 {
-    struct vkCreateDescriptorUpdateTemplateKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDescriptorUpdateTemplateCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkDescriptorUpdateTemplate *pDescriptorUpdateTemplate;
+        VkResult result;
+    } *params = args;
     VkDescriptorUpdateTemplateCreateInfo_host pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate);
@@ -17738,7 +19239,15 @@ static NTSTATUS thunk64_vkCreateDevice(void *args)

static NTSTATUS thunk32_vkCreateDevice(void *args)
 {
-    struct vkCreateDevice_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkDeviceCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkDevice *pDevice;
+        void *client_ptr;
+        VkResult result;
+    } *params = args;
     VkDeviceCreateInfo pCreateInfo_host;
     struct conversion_context ctx;

@@ -17769,7 +19278,14 @@ static NTSTATUS thunk64_vkCreateEvent(void *args)

static NTSTATUS thunk32_vkCreateEvent(void *args)
 {
-    struct vkCreateEvent_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkEventCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkEvent *pEvent;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pEvent);

@@ -17795,7 +19311,14 @@ static NTSTATUS thunk64_vkCreateFence(void *args)

static NTSTATUS thunk32_vkCreateFence(void *args)
 {
-    struct vkCreateFence_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkFenceCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkFence *pFence;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFence);

@@ -17821,7 +19344,14 @@ static NTSTATUS thunk64_vkCreateFramebuffer(void *args)

static NTSTATUS thunk32_vkCreateFramebuffer(void *args)
 {
-    struct vkCreateFramebuffer_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkFramebufferCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkFramebuffer *pFramebuffer;
+        VkResult result;
+    } *params = args;
     VkFramebufferCreateInfo_host pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFramebuffer);
@@ -17854,7 +19384,16 @@ static NTSTATUS thunk64_vkCreateGraphicsPipelines(void *args)

static NTSTATUS thunk32_vkCreateGraphicsPipelines(void *args)
 {
-    struct vkCreateGraphicsPipelines_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache;
+        uint32_t createInfoCount;
+        const VkGraphicsPipelineCreateInfo *pCreateInfos;
+        const VkAllocationCallbacks *pAllocator;
+        VkPipeline *pPipelines;
+        VkResult result;
+    } *params = args;
     const VkGraphicsPipelineCreateInfo_host *pCreateInfos_host;
     struct conversion_context ctx;

@@ -17886,7 +19425,14 @@ static NTSTATUS thunk64_vkCreateImage(void *args)

static NTSTATUS thunk32_vkCreateImage(void *args)
 {
-    struct vkCreateImage_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkImageCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkImage *pImage;
+        VkResult result;
+    } *params = args;
     VkImageCreateInfo pCreateInfo_host;
     struct conversion_context ctx;

@@ -17917,7 +19463,14 @@ static NTSTATUS thunk64_vkCreateImageView(void *args)

static NTSTATUS thunk32_vkCreateImageView(void *args)
 {
-    struct vkCreateImageView_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkImageViewCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkImageView *pView;
+        VkResult result;
+    } *params = args;
     VkImageViewCreateInfo_host pCreateInfo_host;
     struct conversion_context ctx;

@@ -17948,7 +19501,14 @@ static NTSTATUS thunk64_vkCreateIndirectCommandsLayoutNV(void *args)

static NTSTATUS thunk32_vkCreateIndirectCommandsLayoutNV(void *args)
 {
-    struct vkCreateIndirectCommandsLayoutNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkIndirectCommandsLayoutCreateInfoNV *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkIndirectCommandsLayoutNV *pIndirectCommandsLayout;
+        VkResult result;
+    } *params = args;
     VkIndirectCommandsLayoutCreateInfoNV_host pCreateInfo_host;
     struct conversion_context ctx;

@@ -17984,7 +19544,14 @@ static NTSTATUS thunk64_vkCreateInstance(void *args)

static NTSTATUS thunk32_vkCreateInstance(void *args)
 {
-    struct vkCreateInstance_params *params = args;
+    struct
+    {
+        const VkInstanceCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkInstance *pInstance;
+        void *client_ptr;
+        VkResult result;
+    } *params = args;
     VkInstanceCreateInfo pCreateInfo_host;
     struct conversion_context ctx;

@@ -18015,7 +19582,14 @@ static NTSTATUS thunk64_vkCreateMicromapEXT(void *args)

static NTSTATUS thunk32_vkCreateMicromapEXT(void *args)
 {
-    struct vkCreateMicromapEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkMicromapCreateInfoEXT *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkMicromapEXT *pMicromap;
+        VkResult result;
+    } *params = args;
     VkMicromapCreateInfoEXT_host pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pMicromap);
@@ -18043,7 +19617,14 @@ static NTSTATUS thunk64_vkCreateOpticalFlowSessionNV(void *args)

static NTSTATUS thunk32_vkCreateOpticalFlowSessionNV(void *args)
 {
-    struct vkCreateOpticalFlowSessionNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkOpticalFlowSessionCreateInfoNV *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkOpticalFlowSessionNV *pSession;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSession);

@@ -18069,7 +19650,14 @@ static NTSTATUS thunk64_vkCreatePipelineCache(void *args)

static NTSTATUS thunk32_vkCreatePipelineCache(void *args)
 {
-    struct vkCreatePipelineCache_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkPipelineCacheCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkPipelineCache *pPipelineCache;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineCache);

@@ -18095,7 +19683,14 @@ static NTSTATUS thunk64_vkCreatePipelineLayout(void *args)

static NTSTATUS thunk32_vkCreatePipelineLayout(void *args)
 {
-    struct vkCreatePipelineLayout_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkPipelineLayoutCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkPipelineLayout *pPipelineLayout;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineLayout);

@@ -18121,7 +19716,14 @@ static NTSTATUS thunk64_vkCreatePrivateDataSlot(void *args)

static NTSTATUS thunk32_vkCreatePrivateDataSlot(void *args)
 {
-    struct vkCreatePrivateDataSlot_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkPrivateDataSlotCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkPrivateDataSlot *pPrivateDataSlot;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot);

@@ -18147,7 +19749,14 @@ static NTSTATUS thunk64_vkCreatePrivateDataSlotEXT(void *args)

static NTSTATUS thunk32_vkCreatePrivateDataSlotEXT(void *args)
 {
-    struct vkCreatePrivateDataSlotEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkPrivateDataSlotCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkPrivateDataSlot *pPrivateDataSlot;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot);

@@ -18173,7 +19782,14 @@ static NTSTATUS thunk64_vkCreateQueryPool(void *args)

static NTSTATUS thunk32_vkCreateQueryPool(void *args)
 {
-    struct vkCreateQueryPool_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkQueryPoolCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkQueryPool *pQueryPool;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pQueryPool);

@@ -18204,7 +19820,17 @@ static NTSTATUS thunk64_vkCreateRayTracingPipelinesKHR(void *args)

static NTSTATUS thunk32_vkCreateRayTracingPipelinesKHR(void *args)
 {
-    struct vkCreateRayTracingPipelinesKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
+        VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache;
+        uint32_t createInfoCount;
+        const VkRayTracingPipelineCreateInfoKHR *pCreateInfos;
+        const VkAllocationCallbacks *pAllocator;
+        VkPipeline *pPipelines;
+        VkResult result;
+    } *params = args;
     const VkRayTracingPipelineCreateInfoKHR_host *pCreateInfos_host;
     struct conversion_context ctx;

@@ -18241,7 +19867,16 @@ static NTSTATUS thunk64_vkCreateRayTracingPipelinesNV(void *args)

static NTSTATUS thunk32_vkCreateRayTracingPipelinesNV(void *args)
 {
-    struct vkCreateRayTracingPipelinesNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache;
+        uint32_t createInfoCount;
+        const VkRayTracingPipelineCreateInfoNV *pCreateInfos;
+        const VkAllocationCallbacks *pAllocator;
+        VkPipeline *pPipelines;
+        VkResult result;
+    } *params = args;
     const VkRayTracingPipelineCreateInfoNV_host *pCreateInfos_host;
     struct conversion_context ctx;

@@ -18273,7 +19908,14 @@ static NTSTATUS thunk64_vkCreateRenderPass(void *args)

static NTSTATUS thunk32_vkCreateRenderPass(void *args)
 {
-    struct vkCreateRenderPass_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkRenderPassCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkRenderPass *pRenderPass;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass);

@@ -18299,7 +19941,14 @@ static NTSTATUS thunk64_vkCreateRenderPass2(void *args)

static NTSTATUS thunk32_vkCreateRenderPass2(void *args)
 {
-    struct vkCreateRenderPass2_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkRenderPassCreateInfo2 *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkRenderPass *pRenderPass;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass);

@@ -18325,7 +19974,14 @@ static NTSTATUS thunk64_vkCreateRenderPass2KHR(void *args)

static NTSTATUS thunk32_vkCreateRenderPass2KHR(void *args)
 {
-    struct vkCreateRenderPass2KHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkRenderPassCreateInfo2 *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkRenderPass *pRenderPass;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass);

@@ -18351,7 +20007,14 @@ static NTSTATUS thunk64_vkCreateSampler(void *args)

static NTSTATUS thunk32_vkCreateSampler(void *args)
 {
-    struct vkCreateSampler_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkSamplerCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkSampler *pSampler;
+        VkResult result;
+    } *params = args;
     VkSamplerCreateInfo pCreateInfo_host;
     struct conversion_context ctx;

@@ -18382,7 +20045,14 @@ static NTSTATUS thunk64_vkCreateSamplerYcbcrConversion(void *args)

static NTSTATUS thunk32_vkCreateSamplerYcbcrConversion(void *args)
 {
-    struct vkCreateSamplerYcbcrConversion_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkSamplerYcbcrConversionCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkSamplerYcbcrConversion *pYcbcrConversion;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion);

@@ -18408,7 +20078,14 @@ static NTSTATUS thunk64_vkCreateSamplerYcbcrConversionKHR(void *args)

static NTSTATUS thunk32_vkCreateSamplerYcbcrConversionKHR(void *args)
 {
-    struct vkCreateSamplerYcbcrConversionKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkSamplerYcbcrConversionCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkSamplerYcbcrConversion *pYcbcrConversion;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion);

@@ -18434,7 +20111,14 @@ static NTSTATUS thunk64_vkCreateSemaphore(void *args)

static NTSTATUS thunk32_vkCreateSemaphore(void *args)
 {
-    struct vkCreateSemaphore_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkSemaphoreCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkSemaphore *pSemaphore;
+        VkResult result;
+    } *params = args;
     VkSemaphoreCreateInfo pCreateInfo_host;
     struct conversion_context ctx;

@@ -18465,7 +20149,14 @@ static NTSTATUS thunk64_vkCreateShaderModule(void *args)

static NTSTATUS thunk32_vkCreateShaderModule(void *args)
 {
-    struct vkCreateShaderModule_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkShaderModuleCreateInfo *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkShaderModule *pShaderModule;
+        VkResult result;
+    } *params = args;
     VkShaderModuleCreateInfo pCreateInfo_host;
     struct conversion_context ctx;

@@ -18498,7 +20189,14 @@ static NTSTATUS thunk64_vkCreateSwapchainKHR(void *args)

static NTSTATUS thunk32_vkCreateSwapchainKHR(void *args)
 {
-    struct vkCreateSwapchainKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkSwapchainCreateInfoKHR *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkSwapchainKHR *pSwapchain;
+        VkResult result;
+    } *params = args;
     VkSwapchainCreateInfoKHR_host pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSwapchain);
@@ -18526,7 +20224,14 @@ static NTSTATUS thunk64_vkCreateValidationCacheEXT(void *args)

static NTSTATUS thunk32_vkCreateValidationCacheEXT(void *args)
 {
-    struct vkCreateValidationCacheEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkValidationCacheCreateInfoEXT *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkValidationCacheEXT *pValidationCache;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pValidationCache);

@@ -18552,7 +20257,14 @@ static NTSTATUS thunk64_vkCreateWin32SurfaceKHR(void *args)

static NTSTATUS thunk32_vkCreateWin32SurfaceKHR(void *args)
 {
-    struct vkCreateWin32SurfaceKHR_params *params = args;
+    struct
+    {
+        VkInstance instance;
+        const VkWin32SurfaceCreateInfoKHR *pCreateInfo;
+        const VkAllocationCallbacks *pAllocator;
+        VkSurfaceKHR *pSurface;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->instance, params->pCreateInfo, params->pAllocator, params->pSurface);

@@ -18580,7 +20292,12 @@ static NTSTATUS thunk64_vkDebugMarkerSetObjectNameEXT(void *args)

static NTSTATUS thunk32_vkDebugMarkerSetObjectNameEXT(void *args)
 {
-    struct vkDebugMarkerSetObjectNameEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDebugMarkerObjectNameInfoEXT *pNameInfo;
+        VkResult result;
+    } *params = args;
     VkDebugMarkerObjectNameInfoEXT_host pNameInfo_host;

TRACE("%p, %p\n", params->device, params->pNameInfo);
@@ -18610,7 +20327,12 @@ static NTSTATUS thunk64_vkDebugMarkerSetObjectTagEXT(void *args)

static NTSTATUS thunk32_vkDebugMarkerSetObjectTagEXT(void *args)
 {
-    struct vkDebugMarkerSetObjectTagEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDebugMarkerObjectTagInfoEXT *pTagInfo;
+        VkResult result;
+    } *params = args;
     VkDebugMarkerObjectTagInfoEXT_host pTagInfo_host;

TRACE("%p, %p\n", params->device, params->pTagInfo);
@@ -18638,7 +20360,17 @@ static NTSTATUS thunk64_vkDebugReportMessageEXT(void *args)

static NTSTATUS thunk32_vkDebugReportMessageEXT(void *args)
 {
-    struct vkDebugReportMessageEXT_params *params = args;
+    struct
+    {
+        VkInstance instance;
+        VkDebugReportFlagsEXT flags;
+        VkDebugReportObjectTypeEXT objectType;
+        uint64_t DECLSPEC_ALIGN(8) object;
+        size_t location;
+        int32_t messageCode;
+        const char *pLayerPrefix;
+        const char *pMessage;
+    } *params = args;

TRACE("%p, %#x, %#x, 0x%s, 0x%s, %d, %p, %p\n", params->instance, params->flags, params->objectType, wine_dbgstr_longlong(params->object), wine_dbgstr_longlong(params->location), params->messageCode, params->pLayerPrefix, params->pMessage);

@@ -18664,7 +20396,12 @@ static NTSTATUS thunk64_vkDeferredOperationJoinKHR(void *args)

static NTSTATUS thunk32_vkDeferredOperationJoinKHR(void *args)
 {
-    struct vkDeferredOperationJoinKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) operation;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation));

@@ -18690,7 +20427,12 @@ static NTSTATUS thunk64_vkDestroyAccelerationStructureKHR(void *args)

static NTSTATUS thunk32_vkDestroyAccelerationStructureKHR(void *args)
 {
-    struct vkDestroyAccelerationStructureKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkAccelerationStructureKHR DECLSPEC_ALIGN(8) accelerationStructure;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator);

@@ -18716,7 +20458,12 @@ static NTSTATUS thunk64_vkDestroyAccelerationStructureNV(void *args)

static NTSTATUS thunk32_vkDestroyAccelerationStructureNV(void *args)
 {
-    struct vkDestroyAccelerationStructureNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkAccelerationStructureNV DECLSPEC_ALIGN(8) accelerationStructure;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator);

@@ -18742,7 +20489,12 @@ static NTSTATUS thunk64_vkDestroyBuffer(void *args)

static NTSTATUS thunk32_vkDestroyBuffer(void *args)
 {
-    struct vkDestroyBuffer_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pAllocator);

@@ -18768,7 +20520,12 @@ static NTSTATUS thunk64_vkDestroyBufferView(void *args)

static NTSTATUS thunk32_vkDestroyBufferView(void *args)
 {
-    struct vkDestroyBufferView_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkBufferView DECLSPEC_ALIGN(8) bufferView;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->bufferView), params->pAllocator);

@@ -18794,7 +20551,12 @@ static NTSTATUS thunk64_vkDestroyCommandPool(void *args)

static NTSTATUS thunk32_vkDestroyCommandPool(void *args)
 {
-    struct vkDestroyCommandPool_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkCommandPool DECLSPEC_ALIGN(8) commandPool;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->commandPool), params->pAllocator);

@@ -18820,7 +20582,12 @@ static NTSTATUS thunk64_vkDestroyCuFunctionNVX(void *args)

static NTSTATUS thunk32_vkDestroyCuFunctionNVX(void *args)
 {
-    struct vkDestroyCuFunctionNVX_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkCuFunctionNVX DECLSPEC_ALIGN(8) function;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->function), params->pAllocator);

@@ -18846,7 +20613,12 @@ static NTSTATUS thunk64_vkDestroyCuModuleNVX(void *args)

static NTSTATUS thunk32_vkDestroyCuModuleNVX(void *args)
 {
-    struct vkDestroyCuModuleNVX_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkCuModuleNVX DECLSPEC_ALIGN(8) module;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->module), params->pAllocator);

@@ -18872,7 +20644,12 @@ static NTSTATUS thunk64_vkDestroyDebugReportCallbackEXT(void *args)

static NTSTATUS thunk32_vkDestroyDebugReportCallbackEXT(void *args)
 {
-    struct vkDestroyDebugReportCallbackEXT_params *params = args;
+    struct
+    {
+        VkInstance instance;
+        VkDebugReportCallbackEXT DECLSPEC_ALIGN(8) callback;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->instance, wine_dbgstr_longlong(params->callback), params->pAllocator);

@@ -18898,7 +20675,12 @@ static NTSTATUS thunk64_vkDestroyDebugUtilsMessengerEXT(void *args)

static NTSTATUS thunk32_vkDestroyDebugUtilsMessengerEXT(void *args)
 {
-    struct vkDestroyDebugUtilsMessengerEXT_params *params = args;
+    struct
+    {
+        VkInstance instance;
+        VkDebugUtilsMessengerEXT DECLSPEC_ALIGN(8) messenger;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->instance, wine_dbgstr_longlong(params->messenger), params->pAllocator);

@@ -18924,7 +20706,12 @@ static NTSTATUS thunk64_vkDestroyDeferredOperationKHR(void *args)

static NTSTATUS thunk32_vkDestroyDeferredOperationKHR(void *args)
 {
-    struct vkDestroyDeferredOperationKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) operation;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->operation), params->pAllocator);

@@ -18950,7 +20737,12 @@ static NTSTATUS thunk64_vkDestroyDescriptorPool(void *args)

static NTSTATUS thunk32_vkDestroyDescriptorPool(void *args)
 {
-    struct vkDestroyDescriptorPool_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDescriptorPool DECLSPEC_ALIGN(8) descriptorPool;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->pAllocator);

@@ -18976,7 +20768,12 @@ static NTSTATUS thunk64_vkDestroyDescriptorSetLayout(void *args)

static NTSTATUS thunk32_vkDestroyDescriptorSetLayout(void *args)
 {
-    struct vkDestroyDescriptorSetLayout_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDescriptorSetLayout DECLSPEC_ALIGN(8) descriptorSetLayout;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSetLayout), params->pAllocator);

@@ -19002,7 +20799,12 @@ static NTSTATUS thunk64_vkDestroyDescriptorUpdateTemplate(void *args)

static NTSTATUS thunk32_vkDestroyDescriptorUpdateTemplate(void *args)
 {
-    struct vkDestroyDescriptorUpdateTemplate_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDescriptorUpdateTemplate DECLSPEC_ALIGN(8) descriptorUpdateTemplate;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator);

@@ -19028,7 +20830,12 @@ static NTSTATUS thunk64_vkDestroyDescriptorUpdateTemplateKHR(void *args)

static NTSTATUS thunk32_vkDestroyDescriptorUpdateTemplateKHR(void *args)
 {
-    struct vkDestroyDescriptorUpdateTemplateKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDescriptorUpdateTemplate DECLSPEC_ALIGN(8) descriptorUpdateTemplate;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator);

@@ -19057,7 +20864,11 @@ static NTSTATUS thunk64_vkDestroyDevice(void *args)

static NTSTATUS thunk32_vkDestroyDevice(void *args)
 {
-    struct vkDestroyDevice_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, %p\n", params->device, params->pAllocator);

@@ -19086,7 +20897,12 @@ static NTSTATUS thunk64_vkDestroyEvent(void *args)

static NTSTATUS thunk32_vkDestroyEvent(void *args)
 {
-    struct vkDestroyEvent_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkEvent DECLSPEC_ALIGN(8) event;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->event), params->pAllocator);

@@ -19112,7 +20928,12 @@ static NTSTATUS thunk64_vkDestroyFence(void *args)

static NTSTATUS thunk32_vkDestroyFence(void *args)
 {
-    struct vkDestroyFence_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkFence DECLSPEC_ALIGN(8) fence;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->fence), params->pAllocator);

@@ -19138,7 +20959,12 @@ static NTSTATUS thunk64_vkDestroyFramebuffer(void *args)

static NTSTATUS thunk32_vkDestroyFramebuffer(void *args)
 {
-    struct vkDestroyFramebuffer_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkFramebuffer DECLSPEC_ALIGN(8) framebuffer;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pAllocator);

@@ -19164,7 +20990,12 @@ static NTSTATUS thunk64_vkDestroyImage(void *args)

static NTSTATUS thunk32_vkDestroyImage(void *args)
 {
-    struct vkDestroyImage_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkImage DECLSPEC_ALIGN(8) image;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pAllocator);

@@ -19190,7 +21021,12 @@ static NTSTATUS thunk64_vkDestroyImageView(void *args)

static NTSTATUS thunk32_vkDestroyImageView(void *args)
 {
-    struct vkDestroyImageView_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkImageView DECLSPEC_ALIGN(8) imageView;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pAllocator);

@@ -19216,7 +21052,12 @@ static NTSTATUS thunk64_vkDestroyIndirectCommandsLayoutNV(void *args)

static NTSTATUS thunk32_vkDestroyIndirectCommandsLayoutNV(void *args)
 {
-    struct vkDestroyIndirectCommandsLayoutNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkIndirectCommandsLayoutNV DECLSPEC_ALIGN(8) indirectCommandsLayout;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->indirectCommandsLayout), params->pAllocator);

@@ -19245,7 +21086,11 @@ static NTSTATUS thunk64_vkDestroyInstance(void *args)

static NTSTATUS thunk32_vkDestroyInstance(void *args)
 {
-    struct vkDestroyInstance_params *params = args;
+    struct
+    {
+        VkInstance instance;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, %p\n", params->instance, params->pAllocator);

@@ -19274,7 +21119,12 @@ static NTSTATUS thunk64_vkDestroyMicromapEXT(void *args)

static NTSTATUS thunk32_vkDestroyMicromapEXT(void *args)
 {
-    struct vkDestroyMicromapEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkMicromapEXT DECLSPEC_ALIGN(8) micromap;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->micromap), params->pAllocator);

@@ -19300,7 +21150,12 @@ static NTSTATUS thunk64_vkDestroyOpticalFlowSessionNV(void *args)

static NTSTATUS thunk32_vkDestroyOpticalFlowSessionNV(void *args)
 {
-    struct vkDestroyOpticalFlowSessionNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkOpticalFlowSessionNV DECLSPEC_ALIGN(8) session;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->session), params->pAllocator);

@@ -19326,7 +21181,12 @@ static NTSTATUS thunk64_vkDestroyPipeline(void *args)

static NTSTATUS thunk32_vkDestroyPipeline(void *args)
 {
-    struct vkDestroyPipeline_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipeline DECLSPEC_ALIGN(8) pipeline;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->pAllocator);

@@ -19352,7 +21212,12 @@ static NTSTATUS thunk64_vkDestroyPipelineCache(void *args)

static NTSTATUS thunk32_vkDestroyPipelineCache(void *args)
 {
-    struct vkDestroyPipelineCache_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pAllocator);

@@ -19378,7 +21243,12 @@ static NTSTATUS thunk64_vkDestroyPipelineLayout(void *args)

static NTSTATUS thunk32_vkDestroyPipelineLayout(void *args)
 {
-    struct vkDestroyPipelineLayout_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipelineLayout DECLSPEC_ALIGN(8) pipelineLayout;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineLayout), params->pAllocator);

@@ -19404,7 +21274,12 @@ static NTSTATUS thunk64_vkDestroyPrivateDataSlot(void *args)

static NTSTATUS thunk32_vkDestroyPrivateDataSlot(void *args)
 {
-    struct vkDestroyPrivateDataSlot_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPrivateDataSlot DECLSPEC_ALIGN(8) privateDataSlot;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator);

@@ -19430,7 +21305,12 @@ static NTSTATUS thunk64_vkDestroyPrivateDataSlotEXT(void *args)

static NTSTATUS thunk32_vkDestroyPrivateDataSlotEXT(void *args)
 {
-    struct vkDestroyPrivateDataSlotEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPrivateDataSlot DECLSPEC_ALIGN(8) privateDataSlot;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator);

@@ -19456,7 +21336,12 @@ static NTSTATUS thunk64_vkDestroyQueryPool(void *args)

static NTSTATUS thunk32_vkDestroyQueryPool(void *args)
 {
-    struct vkDestroyQueryPool_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->queryPool), params->pAllocator);

@@ -19482,7 +21367,12 @@ static NTSTATUS thunk64_vkDestroyRenderPass(void *args)

static NTSTATUS thunk32_vkDestroyRenderPass(void *args)
 {
-    struct vkDestroyRenderPass_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkRenderPass DECLSPEC_ALIGN(8) renderPass;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pAllocator);

@@ -19508,7 +21398,12 @@ static NTSTATUS thunk64_vkDestroySampler(void *args)

static NTSTATUS thunk32_vkDestroySampler(void *args)
 {
-    struct vkDestroySampler_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkSampler DECLSPEC_ALIGN(8) sampler;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->sampler), params->pAllocator);

@@ -19534,7 +21429,12 @@ static NTSTATUS thunk64_vkDestroySamplerYcbcrConversion(void *args)

static NTSTATUS thunk32_vkDestroySamplerYcbcrConversion(void *args)
 {
-    struct vkDestroySamplerYcbcrConversion_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkSamplerYcbcrConversion DECLSPEC_ALIGN(8) ycbcrConversion;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator);

@@ -19560,7 +21460,12 @@ static NTSTATUS thunk64_vkDestroySamplerYcbcrConversionKHR(void *args)

static NTSTATUS thunk32_vkDestroySamplerYcbcrConversionKHR(void *args)
 {
-    struct vkDestroySamplerYcbcrConversionKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkSamplerYcbcrConversion DECLSPEC_ALIGN(8) ycbcrConversion;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator);

@@ -19586,7 +21491,12 @@ static NTSTATUS thunk64_vkDestroySemaphore(void *args)

static NTSTATUS thunk32_vkDestroySemaphore(void *args)
 {
-    struct vkDestroySemaphore_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkSemaphore DECLSPEC_ALIGN(8) semaphore;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pAllocator);

@@ -19612,7 +21522,12 @@ static NTSTATUS thunk64_vkDestroyShaderModule(void *args)

static NTSTATUS thunk32_vkDestroyShaderModule(void *args)
 {
-    struct vkDestroyShaderModule_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkShaderModule DECLSPEC_ALIGN(8) shaderModule;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pAllocator);

@@ -19638,7 +21553,12 @@ static NTSTATUS thunk64_vkDestroySurfaceKHR(void *args)

static NTSTATUS thunk32_vkDestroySurfaceKHR(void *args)
 {
-    struct vkDestroySurfaceKHR_params *params = args;
+    struct
+    {
+        VkInstance instance;
+        VkSurfaceKHR DECLSPEC_ALIGN(8) surface;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->instance, wine_dbgstr_longlong(params->surface), params->pAllocator);

@@ -19664,7 +21584,12 @@ static NTSTATUS thunk64_vkDestroySwapchainKHR(void *args)

static NTSTATUS thunk32_vkDestroySwapchainKHR(void *args)
 {
-    struct vkDestroySwapchainKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkSwapchainKHR DECLSPEC_ALIGN(8) swapchain;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pAllocator);

@@ -19690,7 +21615,12 @@ static NTSTATUS thunk64_vkDestroyValidationCacheEXT(void *args)

static NTSTATUS thunk32_vkDestroyValidationCacheEXT(void *args)
 {
-    struct vkDestroyValidationCacheEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkValidationCacheEXT DECLSPEC_ALIGN(8) validationCache;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pAllocator);

@@ -19716,7 +21646,11 @@ static NTSTATUS thunk64_vkDeviceWaitIdle(void *args)

static NTSTATUS thunk32_vkDeviceWaitIdle(void *args)
 {
-    struct vkDeviceWaitIdle_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkResult result;
+    } *params = args;

TRACE("%p\n", params->device);

@@ -19742,7 +21676,11 @@ static NTSTATUS thunk64_vkEndCommandBuffer(void *args)

static NTSTATUS thunk32_vkEndCommandBuffer(void *args)
 {
-    struct vkEndCommandBuffer_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkResult result;
+    } *params = args;

TRACE("%p\n", params->commandBuffer);

@@ -19768,7 +21706,14 @@ static NTSTATUS thunk64_vkEnumerateDeviceExtensionProperties(void *args)

static NTSTATUS thunk32_vkEnumerateDeviceExtensionProperties(void *args)
 {
-    struct vkEnumerateDeviceExtensionProperties_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const char *pLayerName;
+        uint32_t *pPropertyCount;
+        VkExtensionProperties *pProperties;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pLayerName, params->pPropertyCount, params->pProperties);

@@ -19794,7 +21739,13 @@ static NTSTATUS thunk64_vkEnumerateDeviceLayerProperties(void *args)

static NTSTATUS thunk32_vkEnumerateDeviceLayerProperties(void *args)
 {
-    struct vkEnumerateDeviceLayerProperties_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t *pPropertyCount;
+        VkLayerProperties *pProperties;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pPropertyCount, params->pProperties);

@@ -19820,7 +21771,13 @@ static NTSTATUS thunk64_vkEnumerateInstanceExtensionProperties(void *args)

static NTSTATUS thunk32_vkEnumerateInstanceExtensionProperties(void *args)
 {
-    struct vkEnumerateInstanceExtensionProperties_params *params = args;
+    struct
+    {
+        const char *pLayerName;
+        uint32_t *pPropertyCount;
+        VkExtensionProperties *pProperties;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->pLayerName, params->pPropertyCount, params->pProperties);

@@ -19846,7 +21803,11 @@ static NTSTATUS thunk64_vkEnumerateInstanceVersion(void *args)

static NTSTATUS thunk32_vkEnumerateInstanceVersion(void *args)
 {
-    struct vkEnumerateInstanceVersion_params *params = args;
+    struct
+    {
+        uint32_t *pApiVersion;
+        VkResult result;
+    } *params = args;

TRACE("%p\n", params->pApiVersion);

@@ -19872,7 +21833,13 @@ static NTSTATUS thunk64_vkEnumeratePhysicalDeviceGroups(void *args)

static NTSTATUS thunk32_vkEnumeratePhysicalDeviceGroups(void *args)
 {
-    struct vkEnumeratePhysicalDeviceGroups_params *params = args;
+    struct
+    {
+        VkInstance instance;
+        uint32_t *pPhysicalDeviceGroupCount;
+        VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties);

@@ -19898,7 +21865,13 @@ static NTSTATUS thunk64_vkEnumeratePhysicalDeviceGroupsKHR(void *args)

static NTSTATUS thunk32_vkEnumeratePhysicalDeviceGroupsKHR(void *args)
 {
-    struct vkEnumeratePhysicalDeviceGroupsKHR_params *params = args;
+    struct
+    {
+        VkInstance instance;
+        uint32_t *pPhysicalDeviceGroupCount;
+        VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties);

@@ -19924,7 +21897,15 @@ static NTSTATUS thunk64_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCoun

static NTSTATUS thunk32_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(void *args)
 {
-    struct vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t queueFamilyIndex;
+        uint32_t *pCounterCount;
+        VkPerformanceCounterKHR *pCounters;
+        VkPerformanceCounterDescriptionKHR *pCounterDescriptions;
+        VkResult result;
+    } *params = args;

TRACE("%p, %u, %p, %p, %p\n", params->physicalDevice, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions);

@@ -19950,7 +21931,13 @@ static NTSTATUS thunk64_vkEnumeratePhysicalDevices(void *args)

static NTSTATUS thunk32_vkEnumeratePhysicalDevices(void *args)
 {
-    struct vkEnumeratePhysicalDevices_params *params = args;
+    struct
+    {
+        VkInstance instance;
+        uint32_t *pPhysicalDeviceCount;
+        VkPhysicalDevice *pPhysicalDevices;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->instance, params->pPhysicalDeviceCount, params->pPhysicalDevices);

@@ -19976,7 +21963,13 @@ static NTSTATUS thunk64_vkFlushMappedMemoryRanges(void *args)

static NTSTATUS thunk32_vkFlushMappedMemoryRanges(void *args)
 {
-    struct vkFlushMappedMemoryRanges_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t memoryRangeCount;
+        const VkMappedMemoryRange *pMemoryRanges;
+        VkResult result;
+    } *params = args;
     const VkMappedMemoryRange_host *pMemoryRanges_host;
     struct conversion_context ctx;

@@ -20007,7 +22000,13 @@ static NTSTATUS thunk64_vkFreeCommandBuffers(void *args)

static NTSTATUS thunk32_vkFreeCommandBuffers(void *args)
 {
-    struct vkFreeCommandBuffers_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkCommandPool DECLSPEC_ALIGN(8) commandPool;
+        uint32_t commandBufferCount;
+        const VkCommandBuffer *pCommandBuffers;
+    } *params = args;

TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->commandPool), params->commandBufferCount, params->pCommandBuffers);

@@ -20033,7 +22032,14 @@ static NTSTATUS thunk64_vkFreeDescriptorSets(void *args)

static NTSTATUS thunk32_vkFreeDescriptorSets(void *args)
 {
-    struct vkFreeDescriptorSets_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDescriptorPool DECLSPEC_ALIGN(8) descriptorPool;
+        uint32_t descriptorSetCount;
+        const VkDescriptorSet *pDescriptorSets;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->descriptorSetCount, params->pDescriptorSets);

@@ -20059,7 +22065,12 @@ static NTSTATUS thunk64_vkFreeMemory(void *args)

static NTSTATUS thunk32_vkFreeMemory(void *args)
 {
-    struct vkFreeMemory_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+        const VkAllocationCallbacks *pAllocator;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pAllocator);

@@ -20085,7 +22096,14 @@ static NTSTATUS thunk64_vkGetAccelerationStructureBuildSizesKHR(void *args)

static NTSTATUS thunk32_vkGetAccelerationStructureBuildSizesKHR(void *args)
 {
-    struct vkGetAccelerationStructureBuildSizesKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkAccelerationStructureBuildTypeKHR buildType;
+        const VkAccelerationStructureBuildGeometryInfoKHR *pBuildInfo;
+        const uint32_t *pMaxPrimitiveCounts;
+        VkAccelerationStructureBuildSizesInfoKHR *pSizeInfo;
+    } *params = args;
     VkAccelerationStructureBuildGeometryInfoKHR_host pBuildInfo_host;
     VkAccelerationStructureBuildSizesInfoKHR_host pSizeInfo_host;
     struct conversion_context ctx;
@@ -20119,7 +22137,12 @@ static NTSTATUS thunk64_vkGetAccelerationStructureDeviceAddressKHR(void *args)

static NTSTATUS thunk32_vkGetAccelerationStructureDeviceAddressKHR(void *args)
 {
-    struct vkGetAccelerationStructureDeviceAddressKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkAccelerationStructureDeviceAddressInfoKHR *pInfo;
+        VkDeviceAddress result;
+    } *params = args;
     VkAccelerationStructureDeviceAddressInfoKHR_host pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);
@@ -20147,7 +22170,14 @@ static NTSTATUS thunk64_vkGetAccelerationStructureHandleNV(void *args)

static NTSTATUS thunk32_vkGetAccelerationStructureHandleNV(void *args)
 {
-    struct vkGetAccelerationStructureHandleNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkAccelerationStructureNV DECLSPEC_ALIGN(8) accelerationStructure;
+        size_t dataSize;
+        void *pData;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), wine_dbgstr_longlong(params->dataSize), params->pData);

@@ -20173,7 +22203,12 @@ static NTSTATUS thunk64_vkGetAccelerationStructureMemoryRequirementsNV(void *arg

static NTSTATUS thunk32_vkGetAccelerationStructureMemoryRequirementsNV(void *args)
 {
-    struct vkGetAccelerationStructureMemoryRequirementsNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkAccelerationStructureMemoryRequirementsInfoNV *pInfo;
+        VkMemoryRequirements2KHR *pMemoryRequirements;
+    } *params = args;
     VkAccelerationStructureMemoryRequirementsInfoNV_host pInfo_host;
     VkMemoryRequirements2KHR_host pMemoryRequirements_host;

@@ -20204,7 +22239,12 @@ static NTSTATUS thunk64_vkGetBufferDeviceAddress(void *args)

static NTSTATUS thunk32_vkGetBufferDeviceAddress(void *args)
 {
-    struct vkGetBufferDeviceAddress_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkBufferDeviceAddressInfo *pInfo;
+        VkDeviceAddress result;
+    } *params = args;
     VkBufferDeviceAddressInfo_host pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);
@@ -20232,7 +22272,12 @@ static NTSTATUS thunk64_vkGetBufferDeviceAddressEXT(void *args)

static NTSTATUS thunk32_vkGetBufferDeviceAddressEXT(void *args)
 {
-    struct vkGetBufferDeviceAddressEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkBufferDeviceAddressInfo *pInfo;
+        VkDeviceAddress result;
+    } *params = args;
     VkBufferDeviceAddressInfo_host pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);
@@ -20260,7 +22305,12 @@ static NTSTATUS thunk64_vkGetBufferDeviceAddressKHR(void *args)

static NTSTATUS thunk32_vkGetBufferDeviceAddressKHR(void *args)
 {
-    struct vkGetBufferDeviceAddressKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkBufferDeviceAddressInfo *pInfo;
+        VkDeviceAddress result;
+    } *params = args;
     VkBufferDeviceAddressInfo_host pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);
@@ -20288,7 +22338,12 @@ static NTSTATUS thunk64_vkGetBufferMemoryRequirements(void *args)

static NTSTATUS thunk32_vkGetBufferMemoryRequirements(void *args)
 {
-    struct vkGetBufferMemoryRequirements_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkBuffer DECLSPEC_ALIGN(8) buffer;
+        VkMemoryRequirements *pMemoryRequirements;
+    } *params = args;
     VkMemoryRequirements_host pMemoryRequirements_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pMemoryRequirements);
@@ -20316,7 +22371,12 @@ static NTSTATUS thunk64_vkGetBufferMemoryRequirements2(void *args)

static NTSTATUS thunk32_vkGetBufferMemoryRequirements2(void *args)
 {
-    struct vkGetBufferMemoryRequirements2_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkBufferMemoryRequirementsInfo2 *pInfo;
+        VkMemoryRequirements2 *pMemoryRequirements;
+    } *params = args;
     VkBufferMemoryRequirementsInfo2_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;

@@ -20347,7 +22407,12 @@ static NTSTATUS thunk64_vkGetBufferMemoryRequirements2KHR(void *args)

static NTSTATUS thunk32_vkGetBufferMemoryRequirements2KHR(void *args)
 {
-    struct vkGetBufferMemoryRequirements2KHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkBufferMemoryRequirementsInfo2 *pInfo;
+        VkMemoryRequirements2 *pMemoryRequirements;
+    } *params = args;
     VkBufferMemoryRequirementsInfo2_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;

@@ -20378,7 +22443,12 @@ static NTSTATUS thunk64_vkGetBufferOpaqueCaptureAddress(void *args)

static NTSTATUS thunk32_vkGetBufferOpaqueCaptureAddress(void *args)
 {
-    struct vkGetBufferOpaqueCaptureAddress_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkBufferDeviceAddressInfo *pInfo;
+        uint64_t result;
+    } *params = args;
     VkBufferDeviceAddressInfo_host pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);
@@ -20406,7 +22476,12 @@ static NTSTATUS thunk64_vkGetBufferOpaqueCaptureAddressKHR(void *args)

static NTSTATUS thunk32_vkGetBufferOpaqueCaptureAddressKHR(void *args)
 {
-    struct vkGetBufferOpaqueCaptureAddressKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkBufferDeviceAddressInfo *pInfo;
+        uint64_t result;
+    } *params = args;
     VkBufferDeviceAddressInfo_host pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);
@@ -20434,7 +22509,15 @@ static NTSTATUS thunk64_vkGetCalibratedTimestampsEXT(void *args)

static NTSTATUS thunk32_vkGetCalibratedTimestampsEXT(void *args)
 {
-    struct vkGetCalibratedTimestampsEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t timestampCount;
+        const VkCalibratedTimestampInfoEXT *pTimestampInfos;
+        uint64_t *pTimestamps;
+        uint64_t *pMaxDeviation;
+        VkResult result;
+    } *params = args;

TRACE("%p, %u, %p, %p, %p\n", params->device, params->timestampCount, params->pTimestampInfos, params->pTimestamps, params->pMaxDeviation);

@@ -20460,7 +22543,12 @@ static NTSTATUS thunk64_vkGetDeferredOperationMaxConcurrencyKHR(void *args)

static NTSTATUS thunk32_vkGetDeferredOperationMaxConcurrencyKHR(void *args)
 {
-    struct vkGetDeferredOperationMaxConcurrencyKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) operation;
+        uint32_t result;
+    } *params = args;

TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation));

@@ -20486,7 +22574,12 @@ static NTSTATUS thunk64_vkGetDeferredOperationResultKHR(void *args)

static NTSTATUS thunk32_vkGetDeferredOperationResultKHR(void *args)
 {
-    struct vkGetDeferredOperationResultKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeferredOperationKHR DECLSPEC_ALIGN(8) operation;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation));

@@ -20512,7 +22605,12 @@ static NTSTATUS thunk64_vkGetDescriptorSetHostMappingVALVE(void *args)

static NTSTATUS thunk32_vkGetDescriptorSetHostMappingVALVE(void *args)
 {
-    struct vkGetDescriptorSetHostMappingVALVE_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDescriptorSet DECLSPEC_ALIGN(8) descriptorSet;
+        void **ppData;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), params->ppData);

@@ -20538,7 +22636,12 @@ static NTSTATUS thunk64_vkGetDescriptorSetLayoutHostMappingInfoVALVE(void *args)

static NTSTATUS thunk32_vkGetDescriptorSetLayoutHostMappingInfoVALVE(void *args)
 {
-    struct vkGetDescriptorSetLayoutHostMappingInfoVALVE_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDescriptorSetBindingReferenceVALVE *pBindingReference;
+        VkDescriptorSetLayoutHostMappingInfoVALVE *pHostMapping;
+    } *params = args;
     VkDescriptorSetBindingReferenceVALVE_host pBindingReference_host;

TRACE("%p, %p, %p\n", params->device, params->pBindingReference, params->pHostMapping);
@@ -20566,7 +22669,12 @@ static NTSTATUS thunk64_vkGetDescriptorSetLayoutSupport(void *args)

static NTSTATUS thunk32_vkGetDescriptorSetLayoutSupport(void *args)
 {
-    struct vkGetDescriptorSetLayoutSupport_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDescriptorSetLayoutCreateInfo *pCreateInfo;
+        VkDescriptorSetLayoutSupport *pSupport;
+    } *params = args;

TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport);

@@ -20592,7 +22700,12 @@ static NTSTATUS thunk64_vkGetDescriptorSetLayoutSupportKHR(void *args)

static NTSTATUS thunk32_vkGetDescriptorSetLayoutSupportKHR(void *args)
 {
-    struct vkGetDescriptorSetLayoutSupportKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDescriptorSetLayoutCreateInfo *pCreateInfo;
+        VkDescriptorSetLayoutSupport *pSupport;
+    } *params = args;

TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport);

@@ -20618,7 +22731,12 @@ static NTSTATUS thunk64_vkGetDeviceAccelerationStructureCompatibilityKHR(void *a

static NTSTATUS thunk32_vkGetDeviceAccelerationStructureCompatibilityKHR(void *args)
 {
-    struct vkGetDeviceAccelerationStructureCompatibilityKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkAccelerationStructureVersionInfoKHR *pVersionInfo;
+        VkAccelerationStructureCompatibilityKHR *pCompatibility;
+    } *params = args;

TRACE("%p, %p, %p\n", params->device, params->pVersionInfo, params->pCompatibility);

@@ -20644,7 +22762,12 @@ static NTSTATUS thunk64_vkGetDeviceBufferMemoryRequirements(void *args)

static NTSTATUS thunk32_vkGetDeviceBufferMemoryRequirements(void *args)
 {
-    struct vkGetDeviceBufferMemoryRequirements_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDeviceBufferMemoryRequirements *pInfo;
+        VkMemoryRequirements2 *pMemoryRequirements;
+    } *params = args;
     VkDeviceBufferMemoryRequirements_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
     struct conversion_context ctx;
@@ -20678,7 +22801,12 @@ static NTSTATUS thunk64_vkGetDeviceBufferMemoryRequirementsKHR(void *args)

static NTSTATUS thunk32_vkGetDeviceBufferMemoryRequirementsKHR(void *args)
 {
-    struct vkGetDeviceBufferMemoryRequirementsKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDeviceBufferMemoryRequirements *pInfo;
+        VkMemoryRequirements2 *pMemoryRequirements;
+    } *params = args;
     VkDeviceBufferMemoryRequirements_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
     struct conversion_context ctx;
@@ -20712,7 +22840,13 @@ static NTSTATUS thunk64_vkGetDeviceFaultInfoEXT(void *args)

static NTSTATUS thunk32_vkGetDeviceFaultInfoEXT(void *args)
 {
-    struct vkGetDeviceFaultInfoEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeviceFaultCountsEXT *pFaultCounts;
+        VkDeviceFaultInfoEXT *pFaultInfo;
+        VkResult result;
+    } *params = args;
     VkDeviceFaultCountsEXT_host pFaultCounts_host;
     VkDeviceFaultInfoEXT_host *pFaultInfo_host = NULL;
     struct conversion_context ctx;
@@ -20751,7 +22885,14 @@ static NTSTATUS thunk64_vkGetDeviceGroupPeerMemoryFeatures(void *args)

static NTSTATUS thunk32_vkGetDeviceGroupPeerMemoryFeatures(void *args)
 {
-    struct vkGetDeviceGroupPeerMemoryFeatures_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t heapIndex;
+        uint32_t localDeviceIndex;
+        uint32_t remoteDeviceIndex;
+        VkPeerMemoryFeatureFlags *pPeerMemoryFeatures;
+    } *params = args;

TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures);

@@ -20777,7 +22918,14 @@ static NTSTATUS thunk64_vkGetDeviceGroupPeerMemoryFeaturesKHR(void *args)

static NTSTATUS thunk32_vkGetDeviceGroupPeerMemoryFeaturesKHR(void *args)
 {
-    struct vkGetDeviceGroupPeerMemoryFeaturesKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t heapIndex;
+        uint32_t localDeviceIndex;
+        uint32_t remoteDeviceIndex;
+        VkPeerMemoryFeatureFlags *pPeerMemoryFeatures;
+    } *params = args;

TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures);

@@ -20803,7 +22951,12 @@ static NTSTATUS thunk64_vkGetDeviceGroupPresentCapabilitiesKHR(void *args)

static NTSTATUS thunk32_vkGetDeviceGroupPresentCapabilitiesKHR(void *args)
 {
-    struct vkGetDeviceGroupPresentCapabilitiesKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeviceGroupPresentCapabilitiesKHR *pDeviceGroupPresentCapabilities;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p\n", params->device, params->pDeviceGroupPresentCapabilities);

@@ -20829,7 +22982,13 @@ static NTSTATUS thunk64_vkGetDeviceGroupSurfacePresentModesKHR(void *args)

static NTSTATUS thunk32_vkGetDeviceGroupSurfacePresentModesKHR(void *args)
 {
-    struct vkGetDeviceGroupSurfacePresentModesKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkSurfaceKHR DECLSPEC_ALIGN(8) surface;
+        VkDeviceGroupPresentModeFlagsKHR *pModes;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->surface), params->pModes);

@@ -20855,7 +23014,12 @@ static NTSTATUS thunk64_vkGetDeviceImageMemoryRequirements(void *args)

static NTSTATUS thunk32_vkGetDeviceImageMemoryRequirements(void *args)
 {
-    struct vkGetDeviceImageMemoryRequirements_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDeviceImageMemoryRequirements *pInfo;
+        VkMemoryRequirements2 *pMemoryRequirements;
+    } *params = args;
     VkDeviceImageMemoryRequirements pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
     struct conversion_context ctx;
@@ -20889,7 +23053,12 @@ static NTSTATUS thunk64_vkGetDeviceImageMemoryRequirementsKHR(void *args)

static NTSTATUS thunk32_vkGetDeviceImageMemoryRequirementsKHR(void *args)
 {
-    struct vkGetDeviceImageMemoryRequirementsKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDeviceImageMemoryRequirements *pInfo;
+        VkMemoryRequirements2 *pMemoryRequirements;
+    } *params = args;
     VkDeviceImageMemoryRequirements pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
     struct conversion_context ctx;
@@ -20923,7 +23092,13 @@ static NTSTATUS thunk64_vkGetDeviceImageSparseMemoryRequirements(void *args)

static NTSTATUS thunk32_vkGetDeviceImageSparseMemoryRequirements(void *args)
 {
-    struct vkGetDeviceImageSparseMemoryRequirements_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDeviceImageMemoryRequirements *pInfo;
+        uint32_t *pSparseMemoryRequirementCount;
+        VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements;
+    } *params = args;
     VkDeviceImageMemoryRequirements pInfo_host;
     VkSparseImageMemoryRequirements2_host *pSparseMemoryRequirements_host;
     struct conversion_context ctx;
@@ -20957,7 +23132,13 @@ static NTSTATUS thunk64_vkGetDeviceImageSparseMemoryRequirementsKHR(void *args)

static NTSTATUS thunk32_vkGetDeviceImageSparseMemoryRequirementsKHR(void *args)
 {
-    struct vkGetDeviceImageSparseMemoryRequirementsKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDeviceImageMemoryRequirements *pInfo;
+        uint32_t *pSparseMemoryRequirementCount;
+        VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements;
+    } *params = args;
     VkDeviceImageMemoryRequirements pInfo_host;
     VkSparseImageMemoryRequirements2_host *pSparseMemoryRequirements_host;
     struct conversion_context ctx;
@@ -20991,7 +23172,12 @@ static NTSTATUS thunk64_vkGetDeviceMemoryCommitment(void *args)

static NTSTATUS thunk32_vkGetDeviceMemoryCommitment(void *args)
 {
-    struct vkGetDeviceMemoryCommitment_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+        VkDeviceSize *pCommittedMemoryInBytes;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pCommittedMemoryInBytes);

@@ -21017,7 +23203,12 @@ static NTSTATUS thunk64_vkGetDeviceMemoryOpaqueCaptureAddress(void *args)

static NTSTATUS thunk32_vkGetDeviceMemoryOpaqueCaptureAddress(void *args)
 {
-    struct vkGetDeviceMemoryOpaqueCaptureAddress_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDeviceMemoryOpaqueCaptureAddressInfo *pInfo;
+        uint64_t result;
+    } *params = args;
     VkDeviceMemoryOpaqueCaptureAddressInfo_host pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);
@@ -21045,7 +23236,12 @@ static NTSTATUS thunk64_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args)

static NTSTATUS thunk32_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args)
 {
-    struct vkGetDeviceMemoryOpaqueCaptureAddressKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDeviceMemoryOpaqueCaptureAddressInfo *pInfo;
+        uint64_t result;
+    } *params = args;
     VkDeviceMemoryOpaqueCaptureAddressInfo_host pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);
@@ -21073,7 +23269,12 @@ static NTSTATUS thunk64_vkGetDeviceMicromapCompatibilityEXT(void *args)

static NTSTATUS thunk32_vkGetDeviceMicromapCompatibilityEXT(void *args)
 {
-    struct vkGetDeviceMicromapCompatibilityEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkMicromapVersionInfoEXT *pVersionInfo;
+        VkAccelerationStructureCompatibilityKHR *pCompatibility;
+    } *params = args;

TRACE("%p, %p, %p\n", params->device, params->pVersionInfo, params->pCompatibility);

@@ -21099,7 +23300,13 @@ static NTSTATUS thunk64_vkGetDeviceQueue(void *args)

static NTSTATUS thunk32_vkGetDeviceQueue(void *args)
 {
-    struct vkGetDeviceQueue_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t queueFamilyIndex;
+        uint32_t queueIndex;
+        VkQueue *pQueue;
+    } *params = args;

TRACE("%p, %u, %u, %p\n", params->device, params->queueFamilyIndex, params->queueIndex, params->pQueue);

@@ -21125,7 +23332,12 @@ static NTSTATUS thunk64_vkGetDeviceQueue2(void *args)

static NTSTATUS thunk32_vkGetDeviceQueue2(void *args)
 {
-    struct vkGetDeviceQueue2_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDeviceQueueInfo2 *pQueueInfo;
+        VkQueue *pQueue;
+    } *params = args;

TRACE("%p, %p, %p\n", params->device, params->pQueueInfo, params->pQueue);

@@ -21151,7 +23363,13 @@ static NTSTATUS thunk64_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *ar

static NTSTATUS thunk32_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *args)
 {
-    struct vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkRenderPass DECLSPEC_ALIGN(8) renderpass;
+        VkExtent2D *pMaxWorkgroupSize;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderpass), params->pMaxWorkgroupSize);

@@ -21177,7 +23395,13 @@ static NTSTATUS thunk64_vkGetDynamicRenderingTilePropertiesQCOM(void *args)

static NTSTATUS thunk32_vkGetDynamicRenderingTilePropertiesQCOM(void *args)
 {
-    struct vkGetDynamicRenderingTilePropertiesQCOM_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkRenderingInfo *pRenderingInfo;
+        VkTilePropertiesQCOM *pProperties;
+        VkResult result;
+    } *params = args;
     VkRenderingInfo_host pRenderingInfo_host;
     struct conversion_context ctx;

@@ -21208,7 +23432,12 @@ static NTSTATUS thunk64_vkGetEventStatus(void *args)

static NTSTATUS thunk32_vkGetEventStatus(void *args)
 {
-    struct vkGetEventStatus_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkEvent DECLSPEC_ALIGN(8) event;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event));

@@ -21234,7 +23463,12 @@ static NTSTATUS thunk64_vkGetFenceStatus(void *args)

static NTSTATUS thunk32_vkGetFenceStatus(void *args)
 {
-    struct vkGetFenceStatus_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkFence DECLSPEC_ALIGN(8) fence;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->fence));

@@ -21260,7 +23494,14 @@ static NTSTATUS thunk64_vkGetFramebufferTilePropertiesQCOM(void *args)

static NTSTATUS thunk32_vkGetFramebufferTilePropertiesQCOM(void *args)
 {
-    struct vkGetFramebufferTilePropertiesQCOM_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkFramebuffer DECLSPEC_ALIGN(8) framebuffer;
+        uint32_t *pPropertiesCount;
+        VkTilePropertiesQCOM *pProperties;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pPropertiesCount, params->pProperties);

@@ -21286,7 +23527,12 @@ static NTSTATUS thunk64_vkGetGeneratedCommandsMemoryRequirementsNV(void *args)

static NTSTATUS thunk32_vkGetGeneratedCommandsMemoryRequirementsNV(void *args)
 {
-    struct vkGetGeneratedCommandsMemoryRequirementsNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkGeneratedCommandsMemoryRequirementsInfoNV *pInfo;
+        VkMemoryRequirements2 *pMemoryRequirements;
+    } *params = args;
     VkGeneratedCommandsMemoryRequirementsInfoNV_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;

@@ -21317,7 +23563,12 @@ static NTSTATUS thunk64_vkGetImageMemoryRequirements(void *args)

static NTSTATUS thunk32_vkGetImageMemoryRequirements(void *args)
 {
-    struct vkGetImageMemoryRequirements_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkImage DECLSPEC_ALIGN(8) image;
+        VkMemoryRequirements *pMemoryRequirements;
+    } *params = args;
     VkMemoryRequirements_host pMemoryRequirements_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pMemoryRequirements);
@@ -21345,7 +23596,12 @@ static NTSTATUS thunk64_vkGetImageMemoryRequirements2(void *args)

static NTSTATUS thunk32_vkGetImageMemoryRequirements2(void *args)
 {
-    struct vkGetImageMemoryRequirements2_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkImageMemoryRequirementsInfo2 *pInfo;
+        VkMemoryRequirements2 *pMemoryRequirements;
+    } *params = args;
     VkImageMemoryRequirementsInfo2_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;

@@ -21376,7 +23632,12 @@ static NTSTATUS thunk64_vkGetImageMemoryRequirements2KHR(void *args)

static NTSTATUS thunk32_vkGetImageMemoryRequirements2KHR(void *args)
 {
-    struct vkGetImageMemoryRequirements2KHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkImageMemoryRequirementsInfo2 *pInfo;
+        VkMemoryRequirements2 *pMemoryRequirements;
+    } *params = args;
     VkImageMemoryRequirementsInfo2_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;

@@ -21407,7 +23668,13 @@ static NTSTATUS thunk64_vkGetImageSparseMemoryRequirements(void *args)

static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements(void *args)
 {
-    struct vkGetImageSparseMemoryRequirements_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkImage DECLSPEC_ALIGN(8) image;
+        uint32_t *pSparseMemoryRequirementCount;
+        VkSparseImageMemoryRequirements *pSparseMemoryRequirements;
+    } *params = args;
     VkSparseImageMemoryRequirements_host *pSparseMemoryRequirements_host;
     struct conversion_context ctx;

@@ -21439,7 +23706,13 @@ static NTSTATUS thunk64_vkGetImageSparseMemoryRequirements2(void *args)

static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements2(void *args)
 {
-    struct vkGetImageSparseMemoryRequirements2_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkImageSparseMemoryRequirementsInfo2 *pInfo;
+        uint32_t *pSparseMemoryRequirementCount;
+        VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements;
+    } *params = args;
     VkImageSparseMemoryRequirementsInfo2_host pInfo_host;
     VkSparseImageMemoryRequirements2_host *pSparseMemoryRequirements_host;
     struct conversion_context ctx;
@@ -21473,7 +23746,13 @@ static NTSTATUS thunk64_vkGetImageSparseMemoryRequirements2KHR(void *args)

static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements2KHR(void *args)
 {
-    struct vkGetImageSparseMemoryRequirements2KHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkImageSparseMemoryRequirementsInfo2 *pInfo;
+        uint32_t *pSparseMemoryRequirementCount;
+        VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements;
+    } *params = args;
     VkImageSparseMemoryRequirementsInfo2_host pInfo_host;
     VkSparseImageMemoryRequirements2_host *pSparseMemoryRequirements_host;
     struct conversion_context ctx;
@@ -21507,7 +23786,13 @@ static NTSTATUS thunk64_vkGetImageSubresourceLayout(void *args)

static NTSTATUS thunk32_vkGetImageSubresourceLayout(void *args)
 {
-    struct vkGetImageSubresourceLayout_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkImage DECLSPEC_ALIGN(8) image;
+        const VkImageSubresource *pSubresource;
+        VkSubresourceLayout *pLayout;
+    } *params = args;
     VkSubresourceLayout_host pLayout_host;

TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout);
@@ -21535,7 +23820,13 @@ static NTSTATUS thunk64_vkGetImageSubresourceLayout2EXT(void *args)

static NTSTATUS thunk32_vkGetImageSubresourceLayout2EXT(void *args)
 {
-    struct vkGetImageSubresourceLayout2EXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkImage DECLSPEC_ALIGN(8) image;
+        const VkImageSubresource2EXT *pSubresource;
+        VkSubresourceLayout2EXT *pLayout;
+    } *params = args;
     VkSubresourceLayout2EXT_host pLayout_host;

TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout);
@@ -21564,7 +23855,13 @@ static NTSTATUS thunk64_vkGetImageViewAddressNVX(void *args)

static NTSTATUS thunk32_vkGetImageViewAddressNVX(void *args)
 {
-    struct vkGetImageViewAddressNVX_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkImageView DECLSPEC_ALIGN(8) imageView;
+        VkImageViewAddressPropertiesNVX *pProperties;
+        VkResult result;
+    } *params = args;
     VkImageViewAddressPropertiesNVX_host pProperties_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pProperties);
@@ -21593,7 +23890,12 @@ static NTSTATUS thunk64_vkGetImageViewHandleNVX(void *args)

static NTSTATUS thunk32_vkGetImageViewHandleNVX(void *args)
 {
-    struct vkGetImageViewHandleNVX_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkImageViewHandleInfoNVX *pInfo;
+        uint32_t result;
+    } *params = args;
     VkImageViewHandleInfoNVX_host pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);
@@ -21621,7 +23923,14 @@ static NTSTATUS thunk64_vkGetMemoryHostPointerPropertiesEXT(void *args)

static NTSTATUS thunk32_vkGetMemoryHostPointerPropertiesEXT(void *args)
 {
-    struct vkGetMemoryHostPointerPropertiesEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkExternalMemoryHandleTypeFlagBits handleType;
+        const void *pHostPointer;
+        VkMemoryHostPointerPropertiesEXT *pMemoryHostPointerProperties;
+        VkResult result;
+    } *params = args;

TRACE("%p, %#x, %p, %p\n", params->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties);

@@ -21647,7 +23956,13 @@ static NTSTATUS thunk64_vkGetMicromapBuildSizesEXT(void *args)

static NTSTATUS thunk32_vkGetMicromapBuildSizesEXT(void *args)
 {
-    struct vkGetMicromapBuildSizesEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkAccelerationStructureBuildTypeKHR buildType;
+        const VkMicromapBuildInfoEXT *pBuildInfo;
+        VkMicromapBuildSizesInfoEXT *pSizeInfo;
+    } *params = args;
     VkMicromapBuildInfoEXT_host pBuildInfo_host;
     VkMicromapBuildSizesInfoEXT_host pSizeInfo_host;

@@ -21678,7 +23993,13 @@ static NTSTATUS thunk64_vkGetPerformanceParameterINTEL(void *args)

static NTSTATUS thunk32_vkGetPerformanceParameterINTEL(void *args)
 {
-    struct vkGetPerformanceParameterINTEL_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPerformanceParameterTypeINTEL parameter;
+        VkPerformanceValueINTEL *pValue;
+        VkResult result;
+    } *params = args;
     VkPerformanceValueINTEL_host pValue_host;

TRACE("%p, %#x, %p\n", params->device, params->parameter, params->pValue);
@@ -21707,7 +24028,13 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(void *arg

static NTSTATUS thunk32_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(void *args)
 {
-    struct vkGetPhysicalDeviceCalibrateableTimeDomainsEXT_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t *pTimeDomainCount;
+        VkTimeDomainEXT *pTimeDomains;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pTimeDomainCount, params->pTimeDomains);

@@ -21733,7 +24060,13 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *a

static NTSTATUS thunk32_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *args)
 {
-    struct vkGetPhysicalDeviceCooperativeMatrixPropertiesNV_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t *pPropertyCount;
+        VkCooperativeMatrixPropertiesNV *pProperties;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pPropertyCount, params->pProperties);

@@ -21759,7 +24092,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceExternalBufferProperties(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceExternalBufferProperties(void *args)
 {
-    struct vkGetPhysicalDeviceExternalBufferProperties_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo;
+        VkExternalBufferProperties *pExternalBufferProperties;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties);

@@ -21785,7 +24123,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceExternalBufferPropertiesKHR(void *arg

static NTSTATUS thunk32_vkGetPhysicalDeviceExternalBufferPropertiesKHR(void *args)
 {
-    struct vkGetPhysicalDeviceExternalBufferPropertiesKHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo;
+        VkExternalBufferProperties *pExternalBufferProperties;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties);

@@ -21811,7 +24154,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceExternalFenceProperties(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceExternalFenceProperties(void *args)
 {
-    struct vkGetPhysicalDeviceExternalFenceProperties_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo;
+        VkExternalFenceProperties *pExternalFenceProperties;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties);

@@ -21837,7 +24185,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceExternalFencePropertiesKHR(void *args

static NTSTATUS thunk32_vkGetPhysicalDeviceExternalFencePropertiesKHR(void *args)
 {
-    struct vkGetPhysicalDeviceExternalFencePropertiesKHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo;
+        VkExternalFenceProperties *pExternalFenceProperties;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties);

@@ -21863,7 +24216,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceExternalSemaphoreProperties(void *arg

static NTSTATUS thunk32_vkGetPhysicalDeviceExternalSemaphoreProperties(void *args)
 {
-    struct vkGetPhysicalDeviceExternalSemaphoreProperties_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo;
+        VkExternalSemaphoreProperties *pExternalSemaphoreProperties;
+    } *params = args;
     VkPhysicalDeviceExternalSemaphoreInfo pExternalSemaphoreInfo_host;
     struct conversion_context ctx;

@@ -21894,7 +24252,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(void *

static NTSTATUS thunk32_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(void *args)
 {
-    struct vkGetPhysicalDeviceExternalSemaphorePropertiesKHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo;
+        VkExternalSemaphoreProperties *pExternalSemaphoreProperties;
+    } *params = args;
     VkPhysicalDeviceExternalSemaphoreInfo pExternalSemaphoreInfo_host;
     struct conversion_context ctx;

@@ -21925,7 +24288,11 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFeatures(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceFeatures(void *args)
 {
-    struct vkGetPhysicalDeviceFeatures_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkPhysicalDeviceFeatures *pFeatures;
+    } *params = args;

TRACE("%p, %p\n", params->physicalDevice, params->pFeatures);

@@ -21951,7 +24318,11 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFeatures2(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceFeatures2(void *args)
 {
-    struct vkGetPhysicalDeviceFeatures2_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkPhysicalDeviceFeatures2 *pFeatures;
+    } *params = args;

TRACE("%p, %p\n", params->physicalDevice, params->pFeatures);

@@ -21977,7 +24348,11 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFeatures2KHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceFeatures2KHR(void *args)
 {
-    struct vkGetPhysicalDeviceFeatures2KHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkPhysicalDeviceFeatures2 *pFeatures;
+    } *params = args;

TRACE("%p, %p\n", params->physicalDevice, params->pFeatures);

@@ -22003,7 +24378,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFormatProperties(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties(void *args)
 {
-    struct vkGetPhysicalDeviceFormatProperties_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkFormat format;
+        VkFormatProperties *pFormatProperties;
+    } *params = args;

TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties);

@@ -22029,7 +24409,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFormatProperties2(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties2(void *args)
 {
-    struct vkGetPhysicalDeviceFormatProperties2_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkFormat format;
+        VkFormatProperties2 *pFormatProperties;
+    } *params = args;

TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties);

@@ -22055,7 +24440,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFormatProperties2KHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties2KHR(void *args)
 {
-    struct vkGetPhysicalDeviceFormatProperties2KHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkFormat format;
+        VkFormatProperties2 *pFormatProperties;
+    } *params = args;

TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties);

@@ -22081,7 +24471,13 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFragmentShadingRatesKHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceFragmentShadingRatesKHR(void *args)
 {
-    struct vkGetPhysicalDeviceFragmentShadingRatesKHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t *pFragmentShadingRateCount;
+        VkPhysicalDeviceFragmentShadingRateKHR *pFragmentShadingRates;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pFragmentShadingRateCount, params->pFragmentShadingRates);

@@ -22107,7 +24503,17 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceImageFormatProperties(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties(void *args)
 {
-    struct vkGetPhysicalDeviceImageFormatProperties_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkFormat format;
+        VkImageType type;
+        VkImageTiling tiling;
+        VkImageUsageFlags usage;
+        VkImageCreateFlags flags;
+        VkImageFormatProperties *pImageFormatProperties;
+        VkResult result;
+    } *params = args;
     VkImageFormatProperties_host pImageFormatProperties_host;

TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p\n", params->physicalDevice, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties);
@@ -22135,7 +24541,13 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceImageFormatProperties2(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties2(void *args)
 {
-    struct vkGetPhysicalDeviceImageFormatProperties2_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo;
+        VkImageFormatProperties2 *pImageFormatProperties;
+        VkResult result;
+    } *params = args;
     VkImageFormatProperties2_host pImageFormatProperties_host;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties);
@@ -22164,7 +24576,13 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceImageFormatProperties2KHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties2KHR(void *args)
 {
-    struct vkGetPhysicalDeviceImageFormatProperties2KHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo;
+        VkImageFormatProperties2 *pImageFormatProperties;
+        VkResult result;
+    } *params = args;
     VkImageFormatProperties2_host pImageFormatProperties_host;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties);
@@ -22193,7 +24611,11 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceMemoryProperties(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties(void *args)
 {
-    struct vkGetPhysicalDeviceMemoryProperties_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkPhysicalDeviceMemoryProperties *pMemoryProperties;
+    } *params = args;
     VkPhysicalDeviceMemoryProperties_host pMemoryProperties_host;

TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties);
@@ -22221,7 +24643,11 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceMemoryProperties2(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties2(void *args)
 {
-    struct vkGetPhysicalDeviceMemoryProperties2_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkPhysicalDeviceMemoryProperties2 *pMemoryProperties;
+    } *params = args;
     VkPhysicalDeviceMemoryProperties2_host pMemoryProperties_host;
     struct conversion_context ctx;

@@ -22253,7 +24679,11 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceMemoryProperties2KHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties2KHR(void *args)
 {
-    struct vkGetPhysicalDeviceMemoryProperties2KHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkPhysicalDeviceMemoryProperties2 *pMemoryProperties;
+    } *params = args;
     VkPhysicalDeviceMemoryProperties2_host pMemoryProperties_host;
     struct conversion_context ctx;

@@ -22285,7 +24715,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceMultisamplePropertiesEXT(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceMultisamplePropertiesEXT(void *args)
 {
-    struct vkGetPhysicalDeviceMultisamplePropertiesEXT_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkSampleCountFlagBits samples;
+        VkMultisamplePropertiesEXT *pMultisampleProperties;
+    } *params = args;

TRACE("%p, %#x, %p\n", params->physicalDevice, params->samples, params->pMultisampleProperties);

@@ -22311,7 +24746,14 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceOpticalFlowImageFormatsNV(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceOpticalFlowImageFormatsNV(void *args)
 {
-    struct vkGetPhysicalDeviceOpticalFlowImageFormatsNV_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkOpticalFlowImageFormatInfoNV *pOpticalFlowImageFormatInfo;
+        uint32_t *pFormatCount;
+        VkOpticalFlowImageFormatPropertiesNV *pImageFormatProperties;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pOpticalFlowImageFormatInfo, params->pFormatCount, params->pImageFormatProperties);

@@ -22337,7 +24779,14 @@ static NTSTATUS thunk64_vkGetPhysicalDevicePresentRectanglesKHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDevicePresentRectanglesKHR(void *args)
 {
-    struct vkGetPhysicalDevicePresentRectanglesKHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkSurfaceKHR DECLSPEC_ALIGN(8) surface;
+        uint32_t *pRectCount;
+        VkRect2D *pRects;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pRectCount, params->pRects);

@@ -22363,7 +24812,11 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceProperties(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceProperties(void *args)
 {
-    struct vkGetPhysicalDeviceProperties_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkPhysicalDeviceProperties *pProperties;
+    } *params = args;
     VkPhysicalDeviceProperties_host pProperties_host;

TRACE("%p, %p\n", params->physicalDevice, params->pProperties);
@@ -22391,7 +24844,11 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceProperties2(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceProperties2(void *args)
 {
-    struct vkGetPhysicalDeviceProperties2_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkPhysicalDeviceProperties2 *pProperties;
+    } *params = args;
     VkPhysicalDeviceProperties2_host pProperties_host;
     struct conversion_context ctx;

@@ -22423,7 +24880,11 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceProperties2KHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceProperties2KHR(void *args)
 {
-    struct vkGetPhysicalDeviceProperties2KHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkPhysicalDeviceProperties2 *pProperties;
+    } *params = args;
     VkPhysicalDeviceProperties2_host pProperties_host;
     struct conversion_context ctx;

@@ -22455,7 +24916,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(

static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(void *args)
 {
-    struct vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkQueryPoolPerformanceCreateInfoKHR *pPerformanceQueryCreateInfo;
+        uint32_t *pNumPasses;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pPerformanceQueryCreateInfo, params->pNumPasses);

@@ -22481,7 +24947,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyProperties(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyProperties(void *args)
 {
-    struct vkGetPhysicalDeviceQueueFamilyProperties_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t *pQueueFamilyPropertyCount;
+        VkQueueFamilyProperties *pQueueFamilyProperties;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties);

@@ -22507,7 +24978,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyProperties2(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyProperties2(void *args)
 {
-    struct vkGetPhysicalDeviceQueueFamilyProperties2_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t *pQueueFamilyPropertyCount;
+        VkQueueFamilyProperties2 *pQueueFamilyProperties;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties);

@@ -22533,7 +25009,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyProperties2KHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyProperties2KHR(void *args)
 {
-    struct vkGetPhysicalDeviceQueueFamilyProperties2KHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t *pQueueFamilyPropertyCount;
+        VkQueueFamilyProperties2 *pQueueFamilyProperties;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties);

@@ -22559,7 +25040,17 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSparseImageFormatProperties(void *arg

static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties(void *args)
 {
-    struct vkGetPhysicalDeviceSparseImageFormatProperties_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkFormat format;
+        VkImageType type;
+        VkSampleCountFlagBits samples;
+        VkImageUsageFlags usage;
+        VkImageTiling tiling;
+        uint32_t *pPropertyCount;
+        VkSparseImageFormatProperties *pProperties;
+    } *params = args;

TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p, %p\n", params->physicalDevice, params->format, params->type, params->samples, params->usage, params->tiling, params->pPropertyCount, params->pProperties);

@@ -22585,7 +25076,13 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSparseImageFormatProperties2(void *ar

static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2(void *args)
 {
-    struct vkGetPhysicalDeviceSparseImageFormatProperties2_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkPhysicalDeviceSparseImageFormatInfo2 *pFormatInfo;
+        uint32_t *pPropertyCount;
+        VkSparseImageFormatProperties2 *pProperties;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties);

@@ -22611,7 +25108,13 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(void

static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(void *args)
 {
-    struct vkGetPhysicalDeviceSparseImageFormatProperties2KHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkPhysicalDeviceSparseImageFormatInfo2 *pFormatInfo;
+        uint32_t *pPropertyCount;
+        VkSparseImageFormatProperties2 *pProperties;
+    } *params = args;

TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties);

@@ -22637,7 +25140,13 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombi

static NTSTATUS thunk32_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(void *args)
 {
-    struct vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t *pCombinationCount;
+        VkFramebufferMixedSamplesCombinationNV *pCombinations;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pCombinationCount, params->pCombinations);

@@ -22663,7 +25172,13 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args)
 {
-    struct vkGetPhysicalDeviceSurfaceCapabilities2KHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo;
+        VkSurfaceCapabilities2KHR *pSurfaceCapabilities;
+        VkResult result;
+    } *params = args;
     VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceCapabilities);
@@ -22691,7 +25206,13 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(void *args)
 {
-    struct vkGetPhysicalDeviceSurfaceCapabilitiesKHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkSurfaceKHR DECLSPEC_ALIGN(8) surface;
+        VkSurfaceCapabilitiesKHR *pSurfaceCapabilities;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pSurfaceCapabilities);

@@ -22719,7 +25240,14 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args)
 {
-    struct vkGetPhysicalDeviceSurfaceFormats2KHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo;
+        uint32_t *pSurfaceFormatCount;
+        VkSurfaceFormat2KHR *pSurfaceFormats;
+        VkResult result;
+    } *params = args;
     VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host;

TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceFormatCount, params->pSurfaceFormats);
@@ -22747,7 +25275,14 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args)
 {
-    struct vkGetPhysicalDeviceSurfaceFormatsKHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkSurfaceKHR DECLSPEC_ALIGN(8) surface;
+        uint32_t *pSurfaceFormatCount;
+        VkSurfaceFormatKHR *pSurfaceFormats;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pSurfaceFormatCount, params->pSurfaceFormats);

@@ -22773,7 +25308,14 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args)
 {
-    struct vkGetPhysicalDeviceSurfacePresentModesKHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        VkSurfaceKHR DECLSPEC_ALIGN(8) surface;
+        uint32_t *pPresentModeCount;
+        VkPresentModeKHR *pPresentModes;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pPresentModeCount, params->pPresentModes);

@@ -22799,7 +25341,14 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceSupportKHR(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceSupportKHR(void *args)
 {
-    struct vkGetPhysicalDeviceSurfaceSupportKHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t queueFamilyIndex;
+        VkSurfaceKHR DECLSPEC_ALIGN(8) surface;
+        VkBool32 *pSupported;
+        VkResult result;
+    } *params = args;

TRACE("%p, %u, 0x%s, %p\n", params->physicalDevice, params->queueFamilyIndex, wine_dbgstr_longlong(params->surface), params->pSupported);

@@ -22825,7 +25374,13 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceToolProperties(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceToolProperties(void *args)
 {
-    struct vkGetPhysicalDeviceToolProperties_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t *pToolCount;
+        VkPhysicalDeviceToolProperties *pToolProperties;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties);

@@ -22851,7 +25406,13 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceToolPropertiesEXT(void *args)

static NTSTATUS thunk32_vkGetPhysicalDeviceToolPropertiesEXT(void *args)
 {
-    struct vkGetPhysicalDeviceToolPropertiesEXT_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t *pToolCount;
+        VkPhysicalDeviceToolProperties *pToolProperties;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties);

@@ -22877,7 +25438,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceWin32PresentationSupportKHR(void *arg

static NTSTATUS thunk32_vkGetPhysicalDeviceWin32PresentationSupportKHR(void *args)
 {
-    struct vkGetPhysicalDeviceWin32PresentationSupportKHR_params *params = args;
+    struct
+    {
+        VkPhysicalDevice physicalDevice;
+        uint32_t queueFamilyIndex;
+        VkBool32 result;
+    } *params = args;

TRACE("%p, %u\n", params->physicalDevice, params->queueFamilyIndex);

@@ -22903,7 +25469,14 @@ static NTSTATUS thunk64_vkGetPipelineCacheData(void *args)

static NTSTATUS thunk32_vkGetPipelineCacheData(void *args)
 {
-    struct vkGetPipelineCacheData_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache;
+        size_t *pDataSize;
+        void *pData;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pDataSize, params->pData);

@@ -22929,7 +25502,14 @@ static NTSTATUS thunk64_vkGetPipelineExecutableInternalRepresentationsKHR(void *

static NTSTATUS thunk32_vkGetPipelineExecutableInternalRepresentationsKHR(void *args)
 {
-    struct vkGetPipelineExecutableInternalRepresentationsKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkPipelineExecutableInfoKHR *pExecutableInfo;
+        uint32_t *pInternalRepresentationCount;
+        VkPipelineExecutableInternalRepresentationKHR *pInternalRepresentations;
+        VkResult result;
+    } *params = args;
     VkPipelineExecutableInfoKHR_host pExecutableInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pInternalRepresentationCount, params->pInternalRepresentations);
@@ -22957,7 +25537,14 @@ static NTSTATUS thunk64_vkGetPipelineExecutablePropertiesKHR(void *args)

static NTSTATUS thunk32_vkGetPipelineExecutablePropertiesKHR(void *args)
 {
-    struct vkGetPipelineExecutablePropertiesKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkPipelineInfoKHR *pPipelineInfo;
+        uint32_t *pExecutableCount;
+        VkPipelineExecutablePropertiesKHR *pProperties;
+        VkResult result;
+    } *params = args;
     VkPipelineInfoKHR_host pPipelineInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pPipelineInfo, params->pExecutableCount, params->pProperties);
@@ -22985,7 +25572,14 @@ static NTSTATUS thunk64_vkGetPipelineExecutableStatisticsKHR(void *args)

static NTSTATUS thunk32_vkGetPipelineExecutableStatisticsKHR(void *args)
 {
-    struct vkGetPipelineExecutableStatisticsKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkPipelineExecutableInfoKHR *pExecutableInfo;
+        uint32_t *pStatisticCount;
+        VkPipelineExecutableStatisticKHR *pStatistics;
+        VkResult result;
+    } *params = args;
     VkPipelineExecutableInfoKHR_host pExecutableInfo_host;
     VkPipelineExecutableStatisticKHR_host *pStatistics_host;
     struct conversion_context ctx;
@@ -23019,7 +25613,13 @@ static NTSTATUS thunk64_vkGetPipelinePropertiesEXT(void *args)

static NTSTATUS thunk32_vkGetPipelinePropertiesEXT(void *args)
 {
-    struct vkGetPipelinePropertiesEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkPipelineInfoEXT *pPipelineInfo;
+        VkBaseOutStructure *pPipelineProperties;
+        VkResult result;
+    } *params = args;
     VkPipelineInfoEXT_host pPipelineInfo_host;

TRACE("%p, %p, %p\n", params->device, params->pPipelineInfo, params->pPipelineProperties);
@@ -23047,7 +25647,14 @@ static NTSTATUS thunk64_vkGetPrivateData(void *args)

static NTSTATUS thunk32_vkGetPrivateData(void *args)
 {
-    struct vkGetPrivateData_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkObjectType objectType;
+        uint64_t DECLSPEC_ALIGN(8) objectHandle;
+        VkPrivateDataSlot DECLSPEC_ALIGN(8) privateDataSlot;
+        uint64_t *pData;
+    } *params = args;

TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData);

@@ -23073,7 +25680,14 @@ static NTSTATUS thunk64_vkGetPrivateDataEXT(void *args)

static NTSTATUS thunk32_vkGetPrivateDataEXT(void *args)
 {
-    struct vkGetPrivateDataEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkObjectType objectType;
+        uint64_t DECLSPEC_ALIGN(8) objectHandle;
+        VkPrivateDataSlot DECLSPEC_ALIGN(8) privateDataSlot;
+        uint64_t *pData;
+    } *params = args;

TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData);

@@ -23099,7 +25713,18 @@ static NTSTATUS thunk64_vkGetQueryPoolResults(void *args)

static NTSTATUS thunk32_vkGetQueryPoolResults(void *args)
 {
-    struct vkGetQueryPoolResults_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t firstQuery;
+        uint32_t queryCount;
+        size_t dataSize;
+        void *pData;
+        VkDeviceSize DECLSPEC_ALIGN(8) stride;
+        VkQueryResultFlags flags;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %u, %u, 0x%s, %p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride), params->flags);

@@ -23125,7 +25750,12 @@ static NTSTATUS thunk64_vkGetQueueCheckpointData2NV(void *args)

static NTSTATUS thunk32_vkGetQueueCheckpointData2NV(void *args)
 {
-    struct vkGetQueueCheckpointData2NV_params *params = args;
+    struct
+    {
+        VkQueue queue;
+        uint32_t *pCheckpointDataCount;
+        VkCheckpointData2NV *pCheckpointData;
+    } *params = args;

TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData);

@@ -23151,7 +25781,12 @@ static NTSTATUS thunk64_vkGetQueueCheckpointDataNV(void *args)

static NTSTATUS thunk32_vkGetQueueCheckpointDataNV(void *args)
 {
-    struct vkGetQueueCheckpointDataNV_params *params = args;
+    struct
+    {
+        VkQueue queue;
+        uint32_t *pCheckpointDataCount;
+        VkCheckpointDataNV *pCheckpointData;
+    } *params = args;

TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData);

@@ -23177,7 +25812,16 @@ static NTSTATUS thunk64_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(void *

static NTSTATUS thunk32_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(void *args)
 {
-    struct vkGetRayTracingCaptureReplayShaderGroupHandlesKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipeline DECLSPEC_ALIGN(8) pipeline;
+        uint32_t firstGroup;
+        uint32_t groupCount;
+        size_t dataSize;
+        void *pData;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData);

@@ -23203,7 +25847,16 @@ static NTSTATUS thunk64_vkGetRayTracingShaderGroupHandlesKHR(void *args)

static NTSTATUS thunk32_vkGetRayTracingShaderGroupHandlesKHR(void *args)
 {
-    struct vkGetRayTracingShaderGroupHandlesKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipeline DECLSPEC_ALIGN(8) pipeline;
+        uint32_t firstGroup;
+        uint32_t groupCount;
+        size_t dataSize;
+        void *pData;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData);

@@ -23229,7 +25882,16 @@ static NTSTATUS thunk64_vkGetRayTracingShaderGroupHandlesNV(void *args)

static NTSTATUS thunk32_vkGetRayTracingShaderGroupHandlesNV(void *args)
 {
-    struct vkGetRayTracingShaderGroupHandlesNV_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipeline DECLSPEC_ALIGN(8) pipeline;
+        uint32_t firstGroup;
+        uint32_t groupCount;
+        size_t dataSize;
+        void *pData;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData);

@@ -23255,7 +25917,14 @@ static NTSTATUS thunk64_vkGetRayTracingShaderGroupStackSizeKHR(void *args)

static NTSTATUS thunk32_vkGetRayTracingShaderGroupStackSizeKHR(void *args)
 {
-    struct vkGetRayTracingShaderGroupStackSizeKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipeline DECLSPEC_ALIGN(8) pipeline;
+        uint32_t group;
+        VkShaderGroupShaderKHR groupShader;
+        VkDeviceSize result;
+    } *params = args;

TRACE("%p, 0x%s, %u, %#x\n", params->device, wine_dbgstr_longlong(params->pipeline), params->group, params->groupShader);

@@ -23281,7 +25950,12 @@ static NTSTATUS thunk64_vkGetRenderAreaGranularity(void *args)

static NTSTATUS thunk32_vkGetRenderAreaGranularity(void *args)
 {
-    struct vkGetRenderAreaGranularity_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkRenderPass DECLSPEC_ALIGN(8) renderPass;
+        VkExtent2D *pGranularity;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pGranularity);

@@ -23307,7 +25981,13 @@ static NTSTATUS thunk64_vkGetSemaphoreCounterValue(void *args)

static NTSTATUS thunk32_vkGetSemaphoreCounterValue(void *args)
 {
-    struct vkGetSemaphoreCounterValue_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkSemaphore DECLSPEC_ALIGN(8) semaphore;
+        uint64_t *pValue;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue);

@@ -23333,7 +26013,13 @@ static NTSTATUS thunk64_vkGetSemaphoreCounterValueKHR(void *args)

static NTSTATUS thunk32_vkGetSemaphoreCounterValueKHR(void *args)
 {
-    struct vkGetSemaphoreCounterValueKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkSemaphore DECLSPEC_ALIGN(8) semaphore;
+        uint64_t *pValue;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue);

@@ -23359,7 +26045,16 @@ static NTSTATUS thunk64_vkGetShaderInfoAMD(void *args)

static NTSTATUS thunk32_vkGetShaderInfoAMD(void *args)
 {
-    struct vkGetShaderInfoAMD_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipeline DECLSPEC_ALIGN(8) pipeline;
+        VkShaderStageFlagBits shaderStage;
+        VkShaderInfoTypeAMD infoType;
+        size_t *pInfoSize;
+        void *pInfo;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %#x, %#x, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shaderStage, params->infoType, params->pInfoSize, params->pInfo);

@@ -23385,7 +26080,12 @@ static NTSTATUS thunk64_vkGetShaderModuleCreateInfoIdentifierEXT(void *args)

static NTSTATUS thunk32_vkGetShaderModuleCreateInfoIdentifierEXT(void *args)
 {
-    struct vkGetShaderModuleCreateInfoIdentifierEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkShaderModuleCreateInfo *pCreateInfo;
+        VkShaderModuleIdentifierEXT *pIdentifier;
+    } *params = args;
     VkShaderModuleCreateInfo pCreateInfo_host;
     struct conversion_context ctx;

@@ -23416,7 +26116,12 @@ static NTSTATUS thunk64_vkGetShaderModuleIdentifierEXT(void *args)

static NTSTATUS thunk32_vkGetShaderModuleIdentifierEXT(void *args)
 {
-    struct vkGetShaderModuleIdentifierEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkShaderModule DECLSPEC_ALIGN(8) shaderModule;
+        VkShaderModuleIdentifierEXT *pIdentifier;
+    } *params = args;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pIdentifier);

@@ -23442,7 +26147,14 @@ static NTSTATUS thunk64_vkGetSwapchainImagesKHR(void *args)

static NTSTATUS thunk32_vkGetSwapchainImagesKHR(void *args)
 {
-    struct vkGetSwapchainImagesKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkSwapchainKHR DECLSPEC_ALIGN(8) swapchain;
+        uint32_t *pSwapchainImageCount;
+        VkImage *pSwapchainImages;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pSwapchainImageCount, params->pSwapchainImages);

@@ -23468,7 +26180,14 @@ static NTSTATUS thunk64_vkGetValidationCacheDataEXT(void *args)

static NTSTATUS thunk32_vkGetValidationCacheDataEXT(void *args)
 {
-    struct vkGetValidationCacheDataEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkValidationCacheEXT DECLSPEC_ALIGN(8) validationCache;
+        size_t *pDataSize;
+        void *pData;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pDataSize, params->pData);

@@ -23494,7 +26213,12 @@ static NTSTATUS thunk64_vkInitializePerformanceApiINTEL(void *args)

static NTSTATUS thunk32_vkInitializePerformanceApiINTEL(void *args)
 {
-    struct vkInitializePerformanceApiINTEL_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkInitializePerformanceApiInfoINTEL *pInitializeInfo;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p\n", params->device, params->pInitializeInfo);

@@ -23520,7 +26244,13 @@ static NTSTATUS thunk64_vkInvalidateMappedMemoryRanges(void *args)

static NTSTATUS thunk32_vkInvalidateMappedMemoryRanges(void *args)
 {
-    struct vkInvalidateMappedMemoryRanges_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t memoryRangeCount;
+        const VkMappedMemoryRange *pMemoryRanges;
+        VkResult result;
+    } *params = args;
     const VkMappedMemoryRange_host *pMemoryRanges_host;
     struct conversion_context ctx;

@@ -23551,7 +26281,16 @@ static NTSTATUS thunk64_vkMapMemory(void *args)

static NTSTATUS thunk32_vkMapMemory(void *args)
 {
-    struct vkMapMemory_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+        VkDeviceSize DECLSPEC_ALIGN(8) offset;
+        VkDeviceSize DECLSPEC_ALIGN(8) size;
+        VkMemoryMapFlags flags;
+        void **ppData;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s, %#x, %p\n", params->device, wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->size), params->flags, params->ppData);

@@ -23577,7 +26316,14 @@ static NTSTATUS thunk64_vkMergePipelineCaches(void *args)

static NTSTATUS thunk32_vkMergePipelineCaches(void *args)
 {
-    struct vkMergePipelineCaches_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPipelineCache DECLSPEC_ALIGN(8) dstCache;
+        uint32_t srcCacheCount;
+        const VkPipelineCache *pSrcCaches;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches);

@@ -23603,7 +26349,14 @@ static NTSTATUS thunk64_vkMergeValidationCachesEXT(void *args)

static NTSTATUS thunk32_vkMergeValidationCachesEXT(void *args)
 {
-    struct vkMergeValidationCachesEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkValidationCacheEXT DECLSPEC_ALIGN(8) dstCache;
+        uint32_t srcCacheCount;
+        const VkValidationCacheEXT *pSrcCaches;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches);

@@ -23629,7 +26382,11 @@ static NTSTATUS thunk64_vkQueueBeginDebugUtilsLabelEXT(void *args)

static NTSTATUS thunk32_vkQueueBeginDebugUtilsLabelEXT(void *args)
 {
-    struct vkQueueBeginDebugUtilsLabelEXT_params *params = args;
+    struct
+    {
+        VkQueue queue;
+        const VkDebugUtilsLabelEXT *pLabelInfo;
+    } *params = args;

TRACE("%p, %p\n", params->queue, params->pLabelInfo);

@@ -23655,7 +26412,14 @@ static NTSTATUS thunk64_vkQueueBindSparse(void *args)

static NTSTATUS thunk32_vkQueueBindSparse(void *args)
 {
-    struct vkQueueBindSparse_params *params = args;
+    struct
+    {
+        VkQueue queue;
+        uint32_t bindInfoCount;
+        const VkBindSparseInfo *pBindInfo;
+        VkFence DECLSPEC_ALIGN(8) fence;
+        VkResult result;
+    } *params = args;
     const VkBindSparseInfo_host *pBindInfo_host;
     struct conversion_context ctx;

@@ -23686,7 +26450,10 @@ static NTSTATUS thunk64_vkQueueEndDebugUtilsLabelEXT(void *args)

static NTSTATUS thunk32_vkQueueEndDebugUtilsLabelEXT(void *args)
 {
-    struct vkQueueEndDebugUtilsLabelEXT_params *params = args;
+    struct
+    {
+        VkQueue queue;
+    } *params = args;

TRACE("%p\n", params->queue);

@@ -23712,7 +26479,11 @@ static NTSTATUS thunk64_vkQueueInsertDebugUtilsLabelEXT(void *args)

static NTSTATUS thunk32_vkQueueInsertDebugUtilsLabelEXT(void *args)
 {
-    struct vkQueueInsertDebugUtilsLabelEXT_params *params = args;
+    struct
+    {
+        VkQueue queue;
+        const VkDebugUtilsLabelEXT *pLabelInfo;
+    } *params = args;

TRACE("%p, %p\n", params->queue, params->pLabelInfo);

@@ -23738,7 +26509,12 @@ static NTSTATUS thunk64_vkQueuePresentKHR(void *args)

static NTSTATUS thunk32_vkQueuePresentKHR(void *args)
 {
-    struct vkQueuePresentKHR_params *params = args;
+    struct
+    {
+        VkQueue queue;
+        const VkPresentInfoKHR *pPresentInfo;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p\n", params->queue, params->pPresentInfo);

@@ -23764,7 +26540,12 @@ static NTSTATUS thunk64_vkQueueSetPerformanceConfigurationINTEL(void *args)

static NTSTATUS thunk32_vkQueueSetPerformanceConfigurationINTEL(void *args)
 {
-    struct vkQueueSetPerformanceConfigurationINTEL_params *params = args;
+    struct
+    {
+        VkQueue queue;
+        VkPerformanceConfigurationINTEL DECLSPEC_ALIGN(8) configuration;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s\n", params->queue, wine_dbgstr_longlong(params->configuration));

@@ -23795,7 +26576,14 @@ static NTSTATUS thunk64_vkQueueSubmit(void *args)

static NTSTATUS thunk32_vkQueueSubmit(void *args)
 {
-    struct vkQueueSubmit_params *params = args;
+    struct
+    {
+        VkQueue queue;
+        uint32_t submitCount;
+        const VkSubmitInfo *pSubmits;
+        VkFence DECLSPEC_ALIGN(8) fence;
+        VkResult result;
+    } *params = args;
     const VkSubmitInfo *pSubmits_host;
     struct conversion_context ctx;

@@ -23831,7 +26619,14 @@ static NTSTATUS thunk64_vkQueueSubmit2(void *args)

static NTSTATUS thunk32_vkQueueSubmit2(void *args)
 {
-    struct vkQueueSubmit2_params *params = args;
+    struct
+    {
+        VkQueue queue;
+        uint32_t submitCount;
+        const VkSubmitInfo2 *pSubmits;
+        VkFence DECLSPEC_ALIGN(8) fence;
+        VkResult result;
+    } *params = args;
     const VkSubmitInfo2_host *pSubmits_host;
     struct conversion_context ctx;

@@ -23867,7 +26662,14 @@ static NTSTATUS thunk64_vkQueueSubmit2KHR(void *args)

static NTSTATUS thunk32_vkQueueSubmit2KHR(void *args)
 {
-    struct vkQueueSubmit2KHR_params *params = args;
+    struct
+    {
+        VkQueue queue;
+        uint32_t submitCount;
+        const VkSubmitInfo2 *pSubmits;
+        VkFence DECLSPEC_ALIGN(8) fence;
+        VkResult result;
+    } *params = args;
     const VkSubmitInfo2_host *pSubmits_host;
     struct conversion_context ctx;

@@ -23898,7 +26700,11 @@ static NTSTATUS thunk64_vkQueueWaitIdle(void *args)

static NTSTATUS thunk32_vkQueueWaitIdle(void *args)
 {
-    struct vkQueueWaitIdle_params *params = args;
+    struct
+    {
+        VkQueue queue;
+        VkResult result;
+    } *params = args;

TRACE("%p\n", params->queue);

@@ -23924,7 +26730,12 @@ static NTSTATUS thunk64_vkReleasePerformanceConfigurationINTEL(void *args)

static NTSTATUS thunk32_vkReleasePerformanceConfigurationINTEL(void *args)
 {
-    struct vkReleasePerformanceConfigurationINTEL_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkPerformanceConfigurationINTEL DECLSPEC_ALIGN(8) configuration;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->configuration));

@@ -23950,7 +26761,10 @@ static NTSTATUS thunk64_vkReleaseProfilingLockKHR(void *args)

static NTSTATUS thunk32_vkReleaseProfilingLockKHR(void *args)
 {
-    struct vkReleaseProfilingLockKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+    } *params = args;

TRACE("%p\n", params->device);

@@ -23976,7 +26790,12 @@ static NTSTATUS thunk64_vkResetCommandBuffer(void *args)

static NTSTATUS thunk32_vkResetCommandBuffer(void *args)
 {
-    struct vkResetCommandBuffer_params *params = args;
+    struct
+    {
+        VkCommandBuffer commandBuffer;
+        VkCommandBufferResetFlags flags;
+        VkResult result;
+    } *params = args;

TRACE("%p, %#x\n", params->commandBuffer, params->flags);

@@ -24002,7 +26821,13 @@ static NTSTATUS thunk64_vkResetCommandPool(void *args)

static NTSTATUS thunk32_vkResetCommandPool(void *args)
 {
-    struct vkResetCommandPool_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkCommandPool DECLSPEC_ALIGN(8) commandPool;
+        VkCommandPoolResetFlags flags;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags);

@@ -24028,7 +26853,13 @@ static NTSTATUS thunk64_vkResetDescriptorPool(void *args)

static NTSTATUS thunk32_vkResetDescriptorPool(void *args)
 {
-    struct vkResetDescriptorPool_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDescriptorPool DECLSPEC_ALIGN(8) descriptorPool;
+        VkDescriptorPoolResetFlags flags;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->flags);

@@ -24054,7 +26885,12 @@ static NTSTATUS thunk64_vkResetEvent(void *args)

static NTSTATUS thunk32_vkResetEvent(void *args)
 {
-    struct vkResetEvent_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkEvent DECLSPEC_ALIGN(8) event;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event));

@@ -24080,7 +26916,13 @@ static NTSTATUS thunk64_vkResetFences(void *args)

static NTSTATUS thunk32_vkResetFences(void *args)
 {
-    struct vkResetFences_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t fenceCount;
+        const VkFence *pFences;
+        VkResult result;
+    } *params = args;

TRACE("%p, %u, %p\n", params->device, params->fenceCount, params->pFences);

@@ -24106,7 +26948,13 @@ static NTSTATUS thunk64_vkResetQueryPool(void *args)

static NTSTATUS thunk32_vkResetQueryPool(void *args)
 {
-    struct vkResetQueryPool_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t firstQuery;
+        uint32_t queryCount;
+    } *params = args;

TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount);

@@ -24132,7 +26980,13 @@ static NTSTATUS thunk64_vkResetQueryPoolEXT(void *args)

static NTSTATUS thunk32_vkResetQueryPoolEXT(void *args)
 {
-    struct vkResetQueryPoolEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkQueryPool DECLSPEC_ALIGN(8) queryPool;
+        uint32_t firstQuery;
+        uint32_t queryCount;
+    } *params = args;

TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount);

@@ -24160,7 +27014,12 @@ static NTSTATUS thunk64_vkSetDebugUtilsObjectNameEXT(void *args)

static NTSTATUS thunk32_vkSetDebugUtilsObjectNameEXT(void *args)
 {
-    struct vkSetDebugUtilsObjectNameEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDebugUtilsObjectNameInfoEXT *pNameInfo;
+        VkResult result;
+    } *params = args;
     VkDebugUtilsObjectNameInfoEXT_host pNameInfo_host;

TRACE("%p, %p\n", params->device, params->pNameInfo);
@@ -24190,7 +27049,12 @@ static NTSTATUS thunk64_vkSetDebugUtilsObjectTagEXT(void *args)

static NTSTATUS thunk32_vkSetDebugUtilsObjectTagEXT(void *args)
 {
-    struct vkSetDebugUtilsObjectTagEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkDebugUtilsObjectTagInfoEXT *pTagInfo;
+        VkResult result;
+    } *params = args;
     VkDebugUtilsObjectTagInfoEXT_host pTagInfo_host;

TRACE("%p, %p\n", params->device, params->pTagInfo);
@@ -24218,7 +27082,12 @@ static NTSTATUS thunk64_vkSetDeviceMemoryPriorityEXT(void *args)

static NTSTATUS thunk32_vkSetDeviceMemoryPriorityEXT(void *args)
 {
-    struct vkSetDeviceMemoryPriorityEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+        float priority;
+    } *params = args;

TRACE("%p, 0x%s, %f\n", params->device, wine_dbgstr_longlong(params->memory), params->priority);

@@ -24244,7 +27113,12 @@ static NTSTATUS thunk64_vkSetEvent(void *args)

static NTSTATUS thunk32_vkSetEvent(void *args)
 {
-    struct vkSetEvent_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkEvent DECLSPEC_ALIGN(8) event;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event));

@@ -24270,7 +27144,15 @@ static NTSTATUS thunk64_vkSetPrivateData(void *args)

static NTSTATUS thunk32_vkSetPrivateData(void *args)
 {
-    struct vkSetPrivateData_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkObjectType objectType;
+        uint64_t DECLSPEC_ALIGN(8) objectHandle;
+        VkPrivateDataSlot DECLSPEC_ALIGN(8) privateDataSlot;
+        uint64_t DECLSPEC_ALIGN(8) data;
+        VkResult result;
+    } *params = args;

TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data));

@@ -24296,7 +27178,15 @@ static NTSTATUS thunk64_vkSetPrivateDataEXT(void *args)

static NTSTATUS thunk32_vkSetPrivateDataEXT(void *args)
 {
-    struct vkSetPrivateDataEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkObjectType objectType;
+        uint64_t DECLSPEC_ALIGN(8) objectHandle;
+        VkPrivateDataSlot DECLSPEC_ALIGN(8) privateDataSlot;
+        uint64_t DECLSPEC_ALIGN(8) data;
+        VkResult result;
+    } *params = args;

TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data));

@@ -24322,7 +27212,12 @@ static NTSTATUS thunk64_vkSignalSemaphore(void *args)

static NTSTATUS thunk32_vkSignalSemaphore(void *args)
 {
-    struct vkSignalSemaphore_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkSemaphoreSignalInfo *pSignalInfo;
+        VkResult result;
+    } *params = args;
     VkSemaphoreSignalInfo_host pSignalInfo_host;

TRACE("%p, %p\n", params->device, params->pSignalInfo);
@@ -24350,7 +27245,12 @@ static NTSTATUS thunk64_vkSignalSemaphoreKHR(void *args)

static NTSTATUS thunk32_vkSignalSemaphoreKHR(void *args)
 {
-    struct vkSignalSemaphoreKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkSemaphoreSignalInfo *pSignalInfo;
+        VkResult result;
+    } *params = args;
     VkSemaphoreSignalInfo_host pSignalInfo_host;

TRACE("%p, %p\n", params->device, params->pSignalInfo);
@@ -24383,7 +27283,13 @@ static NTSTATUS thunk64_vkSubmitDebugUtilsMessageEXT(void *args)

static NTSTATUS thunk32_vkSubmitDebugUtilsMessageEXT(void *args)
 {
-    struct vkSubmitDebugUtilsMessageEXT_params *params = args;
+    struct
+    {
+        VkInstance instance;
+        VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity;
+        VkDebugUtilsMessageTypeFlagsEXT messageTypes;
+        const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData;
+    } *params = args;
     VkDebugUtilsMessengerCallbackDataEXT_host pCallbackData_host;
     struct conversion_context ctx;

@@ -24414,7 +27320,12 @@ static NTSTATUS thunk64_vkTrimCommandPool(void *args)

static NTSTATUS thunk32_vkTrimCommandPool(void *args)
 {
-    struct vkTrimCommandPool_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkCommandPool DECLSPEC_ALIGN(8) commandPool;
+        VkCommandPoolTrimFlags flags;
+    } *params = args;

TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags);

@@ -24440,7 +27351,12 @@ static NTSTATUS thunk64_vkTrimCommandPoolKHR(void *args)

static NTSTATUS thunk32_vkTrimCommandPoolKHR(void *args)
 {
-    struct vkTrimCommandPoolKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkCommandPool DECLSPEC_ALIGN(8) commandPool;
+        VkCommandPoolTrimFlags flags;
+    } *params = args;

TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags);

@@ -24466,7 +27382,10 @@ static NTSTATUS thunk64_vkUninitializePerformanceApiINTEL(void *args)

static NTSTATUS thunk32_vkUninitializePerformanceApiINTEL(void *args)
 {
-    struct vkUninitializePerformanceApiINTEL_params *params = args;
+    struct
+    {
+        VkDevice device;
+    } *params = args;

TRACE("%p\n", params->device);

@@ -24492,7 +27411,11 @@ static NTSTATUS thunk64_vkUnmapMemory(void *args)

static NTSTATUS thunk32_vkUnmapMemory(void *args)
 {
-    struct vkUnmapMemory_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+    } *params = args;

TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->memory));

@@ -24518,7 +27441,13 @@ static NTSTATUS thunk64_vkUpdateDescriptorSetWithTemplate(void *args)

static NTSTATUS thunk32_vkUpdateDescriptorSetWithTemplate(void *args)
 {
-    struct vkUpdateDescriptorSetWithTemplate_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDescriptorSet DECLSPEC_ALIGN(8) descriptorSet;
+        VkDescriptorUpdateTemplate DECLSPEC_ALIGN(8) descriptorUpdateTemplate;
+        const void *pData;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData);

@@ -24544,7 +27473,13 @@ static NTSTATUS thunk64_vkUpdateDescriptorSetWithTemplateKHR(void *args)

static NTSTATUS thunk32_vkUpdateDescriptorSetWithTemplateKHR(void *args)
 {
-    struct vkUpdateDescriptorSetWithTemplateKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkDescriptorSet DECLSPEC_ALIGN(8) descriptorSet;
+        VkDescriptorUpdateTemplate DECLSPEC_ALIGN(8) descriptorUpdateTemplate;
+        const void *pData;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData);

@@ -24570,7 +27505,14 @@ static NTSTATUS thunk64_vkUpdateDescriptorSets(void *args)

static NTSTATUS thunk32_vkUpdateDescriptorSets(void *args)
 {
-    struct vkUpdateDescriptorSets_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t descriptorWriteCount;
+        const VkWriteDescriptorSet *pDescriptorWrites;
+        uint32_t descriptorCopyCount;
+        const VkCopyDescriptorSet *pDescriptorCopies;
+    } *params = args;
     const VkWriteDescriptorSet_host *pDescriptorWrites_host;
     const VkCopyDescriptorSet_host *pDescriptorCopies_host;
     struct conversion_context ctx;
@@ -24603,7 +27545,15 @@ static NTSTATUS thunk64_vkWaitForFences(void *args)

static NTSTATUS thunk32_vkWaitForFences(void *args)
 {
-    struct vkWaitForFences_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t fenceCount;
+        const VkFence *pFences;
+        VkBool32 waitAll;
+        uint64_t DECLSPEC_ALIGN(8) timeout;
+        VkResult result;
+    } *params = args;

TRACE("%p, %u, %p, %u, 0x%s\n", params->device, params->fenceCount, params->pFences, params->waitAll, wine_dbgstr_longlong(params->timeout));

@@ -24629,7 +27579,14 @@ static NTSTATUS thunk64_vkWaitForPresentKHR(void *args)

static NTSTATUS thunk32_vkWaitForPresentKHR(void *args)
 {
-    struct vkWaitForPresentKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        VkSwapchainKHR DECLSPEC_ALIGN(8) swapchain;
+        uint64_t DECLSPEC_ALIGN(8) presentId;
+        uint64_t DECLSPEC_ALIGN(8) timeout;
+        VkResult result;
+    } *params = args;

TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->presentId), wine_dbgstr_longlong(params->timeout));

@@ -24655,7 +27612,13 @@ static NTSTATUS thunk64_vkWaitSemaphores(void *args)

static NTSTATUS thunk32_vkWaitSemaphores(void *args)
 {
-    struct vkWaitSemaphores_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkSemaphoreWaitInfo *pWaitInfo;
+        uint64_t DECLSPEC_ALIGN(8) timeout;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout));

@@ -24681,7 +27644,13 @@ static NTSTATUS thunk64_vkWaitSemaphoresKHR(void *args)

static NTSTATUS thunk32_vkWaitSemaphoresKHR(void *args)
 {
-    struct vkWaitSemaphoresKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        const VkSemaphoreWaitInfo *pWaitInfo;
+        uint64_t DECLSPEC_ALIGN(8) timeout;
+        VkResult result;
+    } *params = args;

TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout));

@@ -24707,7 +27676,17 @@ static NTSTATUS thunk64_vkWriteAccelerationStructuresPropertiesKHR(void *args)

static NTSTATUS thunk32_vkWriteAccelerationStructuresPropertiesKHR(void *args)
 {
-    struct vkWriteAccelerationStructuresPropertiesKHR_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t accelerationStructureCount;
+        const VkAccelerationStructureKHR *pAccelerationStructures;
+        VkQueryType queryType;
+        size_t dataSize;
+        void *pData;
+        size_t stride;
+        VkResult result;
+    } *params = args;

TRACE("%p, %u, %p, %#x, 0x%s, %p, 0x%s\n", params->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride));

@@ -24733,7 +27712,17 @@ static NTSTATUS thunk64_vkWriteMicromapsPropertiesEXT(void *args)

static NTSTATUS thunk32_vkWriteMicromapsPropertiesEXT(void *args)
 {
-    struct vkWriteMicromapsPropertiesEXT_params *params = args;
+    struct
+    {
+        VkDevice device;
+        uint32_t micromapCount;
+        const VkMicromapEXT *pMicromaps;
+        VkQueryType queryType;
+        size_t dataSize;
+        void *pData;
+        size_t stride;
+        VkResult result;
+    } *params = args;

TRACE("%p, %u, %p, %#x, 0x%s, %p, 0x%s\n", params->device, params->micromapCount, params->pMicromaps, params->queryType, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride));

[PATCH 6/8] winevulkan: Fix host aliases declaration.

[Jacek Caban]

From: Jacek Caban

---
 dlls/winevulkan/make_vulkan     |  18 ++--
 dlls/winevulkan/vulkan_thunks.h | 151 ++++++++++++++++++--------------
 2 files changed, 98 insertions(+), 71 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index d8b16fe8cf1..3ae869614f2 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -1871,17 +1871,19 @@ class VkStruct(Sequence):
             postfix (str, optional): text to append to end of struct name, useful for struct renaming.
         """

-        # Only define alias structs when doing conversions
-        if self.is_alias() and not conv:
+        if self.is_alias():
             return ""

+        if postfix:
+            suffix = postfix
+        else:
+            suffix = ""
+
         if self.union:
             text = "typedef union {0}".format(self.name)
         else:
             text = "typedef struct {0}".format(self.name)
-
-        if postfix is not None:
-            text += postfix
+        text += suffix

text += "\n{\n"

@@ -1899,7 +1901,7 @@ class VkStruct(Sequence):
             text += "}} {0};\n".format(self.name)

for aliasee in self.aliased_by:
-            text += "typedef {0} {1};\n".format(self.name, aliasee.name)
+            text += "typedef {0}{2} {1}{2};\n".format(self.name, aliasee.name, suffix)

return text

@@ -2582,10 +2584,14 @@ class VkGenerator(object):
         f.write("#define WINE_VK_VERSION VK_API_VERSION_{0}_{1}\n\n".format(WINE_VK_VERSION[0], WINE_VK_VERSION[1]))

for struct in self.host_structs:
+            if struct.is_alias():
+                continue
             f.write("#if defined(USE_STRUCT_CONVERSION)\n")
             f.write(struct.definition(align=False, conv=True, postfix="_host"))
             f.write("#else\n")
             f.write("typedef {0} {0}_host;\n".format(struct.name))
+            for aliasee in struct.aliased_by:
+                f.write("typedef {0}_host {1}_host;\n".format(struct.name, aliasee.name))
             f.write("#endif\n\n")
         f.write("\n")

diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h
index 4fa37c918f0..85234b68f51 100644
--- a/dlls/winevulkan/vulkan_thunks.h
+++ b/dlls/winevulkan/vulkan_thunks.h
@@ -87,9 +87,10 @@ typedef struct VkMemoryDedicatedAllocateInfo_host
     VkImage image;
     VkBuffer buffer;
 } VkMemoryDedicatedAllocateInfo_host;
-typedef VkMemoryDedicatedAllocateInfo VkMemoryDedicatedAllocateInfoKHR;
+typedef VkMemoryDedicatedAllocateInfo_host VkMemoryDedicatedAllocateInfoKHR_host;
 #else
 typedef VkMemoryDedicatedAllocateInfo VkMemoryDedicatedAllocateInfo_host;
+typedef VkMemoryDedicatedAllocateInfo_host VkMemoryDedicatedAllocateInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -99,9 +100,10 @@ typedef struct VkMemoryOpaqueCaptureAddressAllocateInfo_host
     const void *pNext;
     uint64_t opaqueCaptureAddress;
 } VkMemoryOpaqueCaptureAddressAllocateInfo_host;
-typedef VkMemoryOpaqueCaptureAddressAllocateInfo VkMemoryOpaqueCaptureAddressAllocateInfoKHR;
+typedef VkMemoryOpaqueCaptureAddressAllocateInfo_host VkMemoryOpaqueCaptureAddressAllocateInfoKHR_host;
 #else
 typedef VkMemoryOpaqueCaptureAddressAllocateInfo VkMemoryOpaqueCaptureAddressAllocateInfo_host;
+typedef VkMemoryOpaqueCaptureAddressAllocateInfo_host VkMemoryOpaqueCaptureAddressAllocateInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -168,9 +170,10 @@ typedef struct VkBindBufferMemoryInfo_host
     VkDeviceMemory memory;
     VkDeviceSize memoryOffset;
 } VkBindBufferMemoryInfo_host;
-typedef VkBindBufferMemoryInfo VkBindBufferMemoryInfoKHR;
+typedef VkBindBufferMemoryInfo_host VkBindBufferMemoryInfoKHR_host;
 #else
 typedef VkBindBufferMemoryInfo VkBindBufferMemoryInfo_host;
+typedef VkBindBufferMemoryInfo_host VkBindBufferMemoryInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -194,9 +197,10 @@ typedef struct VkBindImageMemoryInfo_host
     VkDeviceMemory memory;
     VkDeviceSize memoryOffset;
 } VkBindImageMemoryInfo_host;
-typedef VkBindImageMemoryInfo VkBindImageMemoryInfoKHR;
+typedef VkBindImageMemoryInfo_host VkBindImageMemoryInfoKHR_host;
 #else
 typedef VkBindImageMemoryInfo VkBindImageMemoryInfo_host;
+typedef VkBindImageMemoryInfo_host VkBindImageMemoryInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -294,9 +298,10 @@ typedef struct VkRenderingAttachmentInfo_host
     VkAttachmentStoreOp storeOp;
     VkClearValue clearValue;
 } VkRenderingAttachmentInfo_host;
-typedef VkRenderingAttachmentInfo VkRenderingAttachmentInfoKHR;
+typedef VkRenderingAttachmentInfo_host VkRenderingAttachmentInfoKHR_host;
 #else
 typedef VkRenderingAttachmentInfo VkRenderingAttachmentInfo_host;
+typedef VkRenderingAttachmentInfo_host VkRenderingAttachmentInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -338,9 +343,10 @@ typedef struct VkRenderingInfo_host
     const VkRenderingAttachmentInfo_host *pDepthAttachment;
     const VkRenderingAttachmentInfo_host *pStencilAttachment;
 } VkRenderingInfo_host;
-typedef VkRenderingInfo VkRenderingInfoKHR;
+typedef VkRenderingInfo_host VkRenderingInfoKHR_host;
 #else
 typedef VkRenderingInfo VkRenderingInfo_host;
+typedef VkRenderingInfo_host VkRenderingInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -356,9 +362,10 @@ typedef struct VkBlitImageInfo2_host
     const VkImageBlit2 *pRegions;
     VkFilter filter;
 } VkBlitImageInfo2_host;
-typedef VkBlitImageInfo2 VkBlitImageInfo2KHR;
+typedef VkBlitImageInfo2_host VkBlitImageInfo2KHR_host;
 #else
 typedef VkBlitImageInfo2 VkBlitImageInfo2_host;
+typedef VkBlitImageInfo2_host VkBlitImageInfo2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -480,9 +487,10 @@ typedef struct VkBufferCopy2_host
     VkDeviceSize dstOffset;
     VkDeviceSize size;
 } VkBufferCopy2_host;
-typedef VkBufferCopy2 VkBufferCopy2KHR;
+typedef VkBufferCopy2_host VkBufferCopy2KHR_host;
 #else
 typedef VkBufferCopy2 VkBufferCopy2_host;
+typedef VkBufferCopy2_host VkBufferCopy2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -495,9 +503,10 @@ typedef struct VkCopyBufferInfo2_host
     uint32_t regionCount;
     const VkBufferCopy2_host *pRegions;
 } VkCopyBufferInfo2_host;
-typedef VkCopyBufferInfo2 VkCopyBufferInfo2KHR;
+typedef VkCopyBufferInfo2_host VkCopyBufferInfo2KHR_host;
 #else
 typedef VkCopyBufferInfo2 VkCopyBufferInfo2_host;
+typedef VkCopyBufferInfo2_host VkCopyBufferInfo2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -526,9 +535,10 @@ typedef struct VkBufferImageCopy2_host
     VkOffset3D imageOffset;
     VkExtent3D imageExtent;
 } VkBufferImageCopy2_host;
-typedef VkBufferImageCopy2 VkBufferImageCopy2KHR;
+typedef VkBufferImageCopy2_host VkBufferImageCopy2KHR_host;
 #else
 typedef VkBufferImageCopy2 VkBufferImageCopy2_host;
+typedef VkBufferImageCopy2_host VkBufferImageCopy2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -542,9 +552,10 @@ typedef struct VkCopyBufferToImageInfo2_host
     uint32_t regionCount;
     const VkBufferImageCopy2_host *pRegions;
 } VkCopyBufferToImageInfo2_host;
-typedef VkCopyBufferToImageInfo2 VkCopyBufferToImageInfo2KHR;
+typedef VkCopyBufferToImageInfo2_host VkCopyBufferToImageInfo2KHR_host;
 #else
 typedef VkCopyBufferToImageInfo2 VkCopyBufferToImageInfo2_host;
+typedef VkCopyBufferToImageInfo2_host VkCopyBufferToImageInfo2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -559,9 +570,10 @@ typedef struct VkCopyImageInfo2_host
     uint32_t regionCount;
     const VkImageCopy2 *pRegions;
 } VkCopyImageInfo2_host;
-typedef VkCopyImageInfo2 VkCopyImageInfo2KHR;
+typedef VkCopyImageInfo2_host VkCopyImageInfo2KHR_host;
 #else
 typedef VkCopyImageInfo2 VkCopyImageInfo2_host;
+typedef VkCopyImageInfo2_host VkCopyImageInfo2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -575,9 +587,10 @@ typedef struct VkCopyImageToBufferInfo2_host
     uint32_t regionCount;
     const VkBufferImageCopy2_host *pRegions;
 } VkCopyImageToBufferInfo2_host;
-typedef VkCopyImageToBufferInfo2 VkCopyImageToBufferInfo2KHR;
+typedef VkCopyImageToBufferInfo2_host VkCopyImageToBufferInfo2KHR_host;
 #else
 typedef VkCopyImageToBufferInfo2 VkCopyImageToBufferInfo2_host;
+typedef VkCopyImageToBufferInfo2_host VkCopyImageToBufferInfo2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -750,9 +763,10 @@ typedef struct VkBufferMemoryBarrier2_host
     VkDeviceSize offset;
     VkDeviceSize size;
 } VkBufferMemoryBarrier2_host;
-typedef VkBufferMemoryBarrier2 VkBufferMemoryBarrier2KHR;
+typedef VkBufferMemoryBarrier2_host VkBufferMemoryBarrier2KHR_host;
 #else
 typedef VkBufferMemoryBarrier2 VkBufferMemoryBarrier2_host;
+typedef VkBufferMemoryBarrier2_host VkBufferMemoryBarrier2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -771,9 +785,10 @@ typedef struct VkImageMemoryBarrier2_host
     VkImage image;
     VkImageSubresourceRange subresourceRange;
 } VkImageMemoryBarrier2_host;
-typedef VkImageMemoryBarrier2 VkImageMemoryBarrier2KHR;
+typedef VkImageMemoryBarrier2_host VkImageMemoryBarrier2KHR_host;
 #else
 typedef VkImageMemoryBarrier2 VkImageMemoryBarrier2_host;
+typedef VkImageMemoryBarrier2_host VkImageMemoryBarrier2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -789,9 +804,10 @@ typedef struct VkDependencyInfo_host
     uint32_t imageMemoryBarrierCount;
     const VkImageMemoryBarrier2_host *pImageMemoryBarriers;
 } VkDependencyInfo_host;
-typedef VkDependencyInfo VkDependencyInfoKHR;
+typedef VkDependencyInfo_host VkDependencyInfoKHR_host;
 #else
 typedef VkDependencyInfo VkDependencyInfo_host;
+typedef VkDependencyInfo_host VkDependencyInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -846,9 +862,10 @@ typedef struct VkResolveImageInfo2_host
     uint32_t regionCount;
     const VkImageResolve2 *pRegions;
 } VkResolveImageInfo2_host;
-typedef VkResolveImageInfo2 VkResolveImageInfo2KHR;
+typedef VkResolveImageInfo2_host VkResolveImageInfo2KHR_host;
 #else
 typedef VkResolveImageInfo2 VkResolveImageInfo2_host;
+typedef VkResolveImageInfo2_host VkResolveImageInfo2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -921,9 +938,10 @@ typedef struct VkBufferOpaqueCaptureAddressCreateInfo_host
     const void *pNext;
     uint64_t opaqueCaptureAddress;
 } VkBufferOpaqueCaptureAddressCreateInfo_host;
-typedef VkBufferOpaqueCaptureAddressCreateInfo VkBufferOpaqueCaptureAddressCreateInfoKHR;
+typedef VkBufferOpaqueCaptureAddressCreateInfo_host VkBufferOpaqueCaptureAddressCreateInfoKHR_host;
 #else
 typedef VkBufferOpaqueCaptureAddressCreateInfo VkBufferOpaqueCaptureAddressCreateInfo_host;
+typedef VkBufferOpaqueCaptureAddressCreateInfo_host VkBufferOpaqueCaptureAddressCreateInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -974,9 +992,10 @@ typedef struct VkPipelineCreationFeedback_host
     VkPipelineCreationFeedbackFlags flags;
     uint64_t duration;
 } VkPipelineCreationFeedback_host;
-typedef VkPipelineCreationFeedback VkPipelineCreationFeedbackEXT;
+typedef VkPipelineCreationFeedback_host VkPipelineCreationFeedbackEXT_host;
 #else
 typedef VkPipelineCreationFeedback VkPipelineCreationFeedback_host;
+typedef VkPipelineCreationFeedback_host VkPipelineCreationFeedbackEXT_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1027,9 +1046,10 @@ typedef struct VkPipelineCreationFeedbackCreateInfo_host
     uint32_t pipelineStageCreationFeedbackCount;
     VkPipelineCreationFeedback_host *pPipelineStageCreationFeedbacks;
 } VkPipelineCreationFeedbackCreateInfo_host;
-typedef VkPipelineCreationFeedbackCreateInfo VkPipelineCreationFeedbackCreateInfoEXT;
+typedef VkPipelineCreationFeedbackCreateInfo_host VkPipelineCreationFeedbackCreateInfoEXT_host;
 #else
 typedef VkPipelineCreationFeedbackCreateInfo VkPipelineCreationFeedbackCreateInfo_host;
+typedef VkPipelineCreationFeedbackCreateInfo_host VkPipelineCreationFeedbackCreateInfoEXT_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1085,9 +1105,10 @@ typedef struct VkDescriptorUpdateTemplateCreateInfo_host
     VkPipelineLayout pipelineLayout;
     uint32_t set;
 } VkDescriptorUpdateTemplateCreateInfo_host;
-typedef VkDescriptorUpdateTemplateCreateInfo VkDescriptorUpdateTemplateCreateInfoKHR;
+typedef VkDescriptorUpdateTemplateCreateInfo_host VkDescriptorUpdateTemplateCreateInfoKHR_host;
 #else
 typedef VkDescriptorUpdateTemplateCreateInfo VkDescriptorUpdateTemplateCreateInfo_host;
+typedef VkDescriptorUpdateTemplateCreateInfo_host VkDescriptorUpdateTemplateCreateInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1180,9 +1201,10 @@ typedef struct VkSamplerYcbcrConversionInfo_host
     const void *pNext;
     VkSamplerYcbcrConversion conversion;
 } VkSamplerYcbcrConversionInfo_host;
-typedef VkSamplerYcbcrConversionInfo VkSamplerYcbcrConversionInfoKHR;
+typedef VkSamplerYcbcrConversionInfo_host VkSamplerYcbcrConversionInfoKHR_host;
 #else
 typedef VkSamplerYcbcrConversionInfo VkSamplerYcbcrConversionInfo_host;
+typedef VkSamplerYcbcrConversionInfo_host VkSamplerYcbcrConversionInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1305,9 +1327,10 @@ typedef struct VkSemaphoreTypeCreateInfo_host
     VkSemaphoreType semaphoreType;
     uint64_t initialValue;
 } VkSemaphoreTypeCreateInfo_host;
-typedef VkSemaphoreTypeCreateInfo VkSemaphoreTypeCreateInfoKHR;
+typedef VkSemaphoreTypeCreateInfo_host VkSemaphoreTypeCreateInfoKHR_host;
 #else
 typedef VkSemaphoreTypeCreateInfo VkSemaphoreTypeCreateInfo_host;
+typedef VkSemaphoreTypeCreateInfo_host VkSemaphoreTypeCreateInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1424,17 +1447,6 @@ typedef struct VkMemoryRequirements_host
 typedef VkMemoryRequirements VkMemoryRequirements_host;
 #endif

-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkMemoryRequirements2KHR_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkMemoryRequirements_host memoryRequirements;
-} VkMemoryRequirements2KHR_host;
-#else
-typedef VkMemoryRequirements2KHR VkMemoryRequirements2KHR_host;
-#endif
-
 #if defined(USE_STRUCT_CONVERSION)
 typedef struct VkBufferDeviceAddressInfo_host
 {
@@ -1442,10 +1454,12 @@ typedef struct VkBufferDeviceAddressInfo_host
     const void *pNext;
     VkBuffer buffer;
 } VkBufferDeviceAddressInfo_host;
-typedef VkBufferDeviceAddressInfo VkBufferDeviceAddressInfoKHR;
-typedef VkBufferDeviceAddressInfo VkBufferDeviceAddressInfoEXT;
+typedef VkBufferDeviceAddressInfo_host VkBufferDeviceAddressInfoKHR_host;
+typedef VkBufferDeviceAddressInfo_host VkBufferDeviceAddressInfoEXT_host;
 #else
 typedef VkBufferDeviceAddressInfo VkBufferDeviceAddressInfo_host;
+typedef VkBufferDeviceAddressInfo_host VkBufferDeviceAddressInfoKHR_host;
+typedef VkBufferDeviceAddressInfo_host VkBufferDeviceAddressInfoEXT_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1455,9 +1469,10 @@ typedef struct VkBufferMemoryRequirementsInfo2_host
     const void *pNext;
     VkBuffer buffer;
 } VkBufferMemoryRequirementsInfo2_host;
-typedef VkBufferMemoryRequirementsInfo2 VkBufferMemoryRequirementsInfo2KHR;
+typedef VkBufferMemoryRequirementsInfo2_host VkBufferMemoryRequirementsInfo2KHR_host;
 #else
 typedef VkBufferMemoryRequirementsInfo2 VkBufferMemoryRequirementsInfo2_host;
+typedef VkBufferMemoryRequirementsInfo2_host VkBufferMemoryRequirementsInfo2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1467,9 +1482,10 @@ typedef struct VkMemoryRequirements2_host
     void *pNext;
     VkMemoryRequirements_host memoryRequirements;
 } VkMemoryRequirements2_host;
-typedef VkMemoryRequirements2 VkMemoryRequirements2KHR;
+typedef VkMemoryRequirements2_host VkMemoryRequirements2KHR_host;
 #else
 typedef VkMemoryRequirements2 VkMemoryRequirements2_host;
+typedef VkMemoryRequirements2_host VkMemoryRequirements2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1491,9 +1507,10 @@ typedef struct VkDeviceBufferMemoryRequirements_host
     const void *pNext;
     const VkBufferCreateInfo_host *pCreateInfo;
 } VkDeviceBufferMemoryRequirements_host;
-typedef VkDeviceBufferMemoryRequirements VkDeviceBufferMemoryRequirementsKHR;
+typedef VkDeviceBufferMemoryRequirements_host VkDeviceBufferMemoryRequirementsKHR_host;
 #else
 typedef VkDeviceBufferMemoryRequirements VkDeviceBufferMemoryRequirements_host;
+typedef VkDeviceBufferMemoryRequirements_host VkDeviceBufferMemoryRequirementsKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1565,9 +1582,10 @@ typedef struct VkSparseImageMemoryRequirements2_host
     void *pNext;
     VkSparseImageMemoryRequirements_host memoryRequirements;
 } VkSparseImageMemoryRequirements2_host;
-typedef VkSparseImageMemoryRequirements2 VkSparseImageMemoryRequirements2KHR;
+typedef VkSparseImageMemoryRequirements2_host VkSparseImageMemoryRequirements2KHR_host;
 #else
 typedef VkSparseImageMemoryRequirements2 VkSparseImageMemoryRequirements2_host;
+typedef VkSparseImageMemoryRequirements2_host VkSparseImageMemoryRequirements2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1577,9 +1595,10 @@ typedef struct VkDeviceMemoryOpaqueCaptureAddressInfo_host
     const void *pNext;
     VkDeviceMemory memory;
 } VkDeviceMemoryOpaqueCaptureAddressInfo_host;
-typedef VkDeviceMemoryOpaqueCaptureAddressInfo VkDeviceMemoryOpaqueCaptureAddressInfoKHR;
+typedef VkDeviceMemoryOpaqueCaptureAddressInfo_host VkDeviceMemoryOpaqueCaptureAddressInfoKHR_host;
 #else
 typedef VkDeviceMemoryOpaqueCaptureAddressInfo VkDeviceMemoryOpaqueCaptureAddressInfo_host;
+typedef VkDeviceMemoryOpaqueCaptureAddressInfo_host VkDeviceMemoryOpaqueCaptureAddressInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1603,9 +1622,10 @@ typedef struct VkImageMemoryRequirementsInfo2_host
     const void *pNext;
     VkImage image;
 } VkImageMemoryRequirementsInfo2_host;
-typedef VkImageMemoryRequirementsInfo2 VkImageMemoryRequirementsInfo2KHR;
+typedef VkImageMemoryRequirementsInfo2_host VkImageMemoryRequirementsInfo2KHR_host;
 #else
 typedef VkImageMemoryRequirementsInfo2 VkImageMemoryRequirementsInfo2_host;
+typedef VkImageMemoryRequirementsInfo2_host VkImageMemoryRequirementsInfo2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1615,9 +1635,10 @@ typedef struct VkImageSparseMemoryRequirementsInfo2_host
     const void *pNext;
     VkImage image;
 } VkImageSparseMemoryRequirementsInfo2_host;
-typedef VkImageSparseMemoryRequirementsInfo2 VkImageSparseMemoryRequirementsInfo2KHR;
+typedef VkImageSparseMemoryRequirementsInfo2_host VkImageSparseMemoryRequirementsInfo2KHR_host;
 #else
 typedef VkImageSparseMemoryRequirementsInfo2 VkImageSparseMemoryRequirementsInfo2_host;
+typedef VkImageSparseMemoryRequirementsInfo2_host VkImageSparseMemoryRequirementsInfo2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1712,9 +1733,10 @@ typedef struct VkImageFormatProperties2_host
     void *pNext;
     VkImageFormatProperties_host imageFormatProperties;
 } VkImageFormatProperties2_host;
-typedef VkImageFormatProperties2 VkImageFormatProperties2KHR;
+typedef VkImageFormatProperties2_host VkImageFormatProperties2KHR_host;
 #else
 typedef VkImageFormatProperties2 VkImageFormatProperties2_host;
+typedef VkImageFormatProperties2_host VkImageFormatProperties2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1758,9 +1780,10 @@ typedef struct VkPhysicalDeviceMemoryProperties2_host
     void *pNext;
     VkPhysicalDeviceMemoryProperties_host memoryProperties;
 } VkPhysicalDeviceMemoryProperties2_host;
-typedef VkPhysicalDeviceMemoryProperties2 VkPhysicalDeviceMemoryProperties2KHR;
+typedef VkPhysicalDeviceMemoryProperties2_host VkPhysicalDeviceMemoryProperties2KHR_host;
 #else
 typedef VkPhysicalDeviceMemoryProperties2 VkPhysicalDeviceMemoryProperties2_host;
+typedef VkPhysicalDeviceMemoryProperties2_host VkPhysicalDeviceMemoryProperties2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1902,9 +1925,10 @@ typedef struct VkPhysicalDeviceMaintenance3Properties_host
     uint32_t maxPerSetDescriptors;
     VkDeviceSize maxMemoryAllocationSize;
 } VkPhysicalDeviceMaintenance3Properties_host;
-typedef VkPhysicalDeviceMaintenance3Properties VkPhysicalDeviceMaintenance3PropertiesKHR;
+typedef VkPhysicalDeviceMaintenance3Properties_host VkPhysicalDeviceMaintenance3PropertiesKHR_host;
 #else
 typedef VkPhysicalDeviceMaintenance3Properties VkPhysicalDeviceMaintenance3Properties_host;
+typedef VkPhysicalDeviceMaintenance3Properties_host VkPhysicalDeviceMaintenance3PropertiesKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1914,9 +1938,10 @@ typedef struct VkPhysicalDeviceMaintenance4Properties_host
     void *pNext;
     VkDeviceSize maxBufferSize;
 } VkPhysicalDeviceMaintenance4Properties_host;
-typedef VkPhysicalDeviceMaintenance4Properties VkPhysicalDeviceMaintenance4PropertiesKHR;
+typedef VkPhysicalDeviceMaintenance4Properties_host VkPhysicalDeviceMaintenance4PropertiesKHR_host;
 #else
 typedef VkPhysicalDeviceMaintenance4Properties VkPhysicalDeviceMaintenance4Properties_host;
+typedef VkPhysicalDeviceMaintenance4Properties_host VkPhysicalDeviceMaintenance4PropertiesKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -1937,9 +1962,10 @@ typedef struct VkPhysicalDeviceTimelineSemaphoreProperties_host
     void *pNext;
     uint64_t maxTimelineSemaphoreValueDifference;
 } VkPhysicalDeviceTimelineSemaphoreProperties_host;
-typedef VkPhysicalDeviceTimelineSemaphoreProperties VkPhysicalDeviceTimelineSemaphorePropertiesKHR;
+typedef VkPhysicalDeviceTimelineSemaphoreProperties_host VkPhysicalDeviceTimelineSemaphorePropertiesKHR_host;
 #else
 typedef VkPhysicalDeviceTimelineSemaphoreProperties VkPhysicalDeviceTimelineSemaphoreProperties_host;
+typedef VkPhysicalDeviceTimelineSemaphoreProperties_host VkPhysicalDeviceTimelineSemaphorePropertiesKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -2020,9 +2046,10 @@ typedef struct VkPhysicalDeviceTexelBufferAlignmentProperties_host
     VkDeviceSize uniformTexelBufferOffsetAlignmentBytes;
     VkBool32 uniformTexelBufferOffsetSingleTexelAlignment;
 } VkPhysicalDeviceTexelBufferAlignmentProperties_host;
-typedef VkPhysicalDeviceTexelBufferAlignmentProperties VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT;
+typedef VkPhysicalDeviceTexelBufferAlignmentProperties_host VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT_host;
 #else
 typedef VkPhysicalDeviceTexelBufferAlignmentProperties VkPhysicalDeviceTexelBufferAlignmentProperties_host;
+typedef VkPhysicalDeviceTexelBufferAlignmentProperties_host VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -2199,9 +2226,10 @@ typedef struct VkPhysicalDeviceProperties2_host
     void *pNext;
     VkPhysicalDeviceProperties_host properties;
 } VkPhysicalDeviceProperties2_host;
-typedef VkPhysicalDeviceProperties2 VkPhysicalDeviceProperties2KHR;
+typedef VkPhysicalDeviceProperties2_host VkPhysicalDeviceProperties2KHR_host;
 #else
 typedef VkPhysicalDeviceProperties2 VkPhysicalDeviceProperties2_host;
+typedef VkPhysicalDeviceProperties2_host VkPhysicalDeviceProperties2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -2234,9 +2262,10 @@ typedef struct VkPipelineInfoKHR_host
     const void *pNext;
     VkPipeline pipeline;
 } VkPipelineInfoKHR_host;
-typedef VkPipelineInfoKHR VkPipelineInfoEXT;
+typedef VkPipelineInfoKHR_host VkPipelineInfoEXT_host;
 #else
 typedef VkPipelineInfoKHR VkPipelineInfoKHR_host;
+typedef VkPipelineInfoKHR_host VkPipelineInfoEXT_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -2253,17 +2282,6 @@ typedef struct VkPipelineExecutableStatisticKHR_host
 typedef VkPipelineExecutableStatisticKHR VkPipelineExecutableStatisticKHR_host;
 #endif

-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPipelineInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipeline pipeline;
-} VkPipelineInfoEXT_host;
-#else
-typedef VkPipelineInfoEXT VkPipelineInfoEXT_host;
-#endif
-
 #if defined(USE_STRUCT_CONVERSION)
 typedef struct VkSparseMemoryBind_host
 {
@@ -2354,9 +2372,10 @@ typedef struct VkSemaphoreSubmitInfo_host
     VkPipelineStageFlags2 stageMask;
     uint32_t deviceIndex;
 } VkSemaphoreSubmitInfo_host;
-typedef VkSemaphoreSubmitInfo VkSemaphoreSubmitInfoKHR;
+typedef VkSemaphoreSubmitInfo_host VkSemaphoreSubmitInfoKHR_host;
 #else
 typedef VkSemaphoreSubmitInfo VkSemaphoreSubmitInfo_host;
+typedef VkSemaphoreSubmitInfo_host VkSemaphoreSubmitInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -2372,9 +2391,10 @@ typedef struct VkSubmitInfo2_host
     uint32_t signalSemaphoreInfoCount;
     const VkSemaphoreSubmitInfo_host *pSignalSemaphoreInfos;
 } VkSubmitInfo2_host;
-typedef VkSubmitInfo2 VkSubmitInfo2KHR;
+typedef VkSubmitInfo2_host VkSubmitInfo2KHR_host;
 #else
 typedef VkSubmitInfo2 VkSubmitInfo2_host;
+typedef VkSubmitInfo2_host VkSubmitInfo2KHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)
@@ -2400,9 +2420,10 @@ typedef struct VkSemaphoreSignalInfo_host
     VkSemaphore semaphore;
     uint64_t value;
 } VkSemaphoreSignalInfo_host;
-typedef VkSemaphoreSignalInfo VkSemaphoreSignalInfoKHR;
+typedef VkSemaphoreSignalInfo_host VkSemaphoreSignalInfoKHR_host;
 #else
 typedef VkSemaphoreSignalInfo VkSemaphoreSignalInfo_host;
+typedef VkSemaphoreSignalInfo_host VkSemaphoreSignalInfoKHR_host;
 #endif

#if defined(USE_STRUCT_CONVERSION)

[PATCH 7/8] winevulkan: Use local structs declarations for 32-bit conversion functions.

[Jacek Caban]

From: Jacek Caban

---
 dlls/winevulkan/make_vulkan     |   52 +-
 dlls/winevulkan/vulkan_thunks.c | 2638 ++++++++++++++++++++++++++-----
 2 files changed, 2252 insertions(+), 438 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 3ae869614f2..5ab4e44778a 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -864,7 +864,7 @@ class VkFunction(object):
             thunk += "    struct\n"
             thunk += "    {\n"
             for p in self.params:
-                thunk += "        {0};\n".format(p.definition(is_member=True))
+                thunk += "        {0};\n".format(p.definition(is_thunk=True, is_member=True))
             if self.extra_param:
                 thunk += "        void *{0};\n".format(self.extra_param)
             if self.type != "void":
@@ -1386,7 +1386,7 @@ class VkMember(VkVariable):
         else:
             return "{0}{1} = {2}{1};\n".format(output, self.name, input)

-    def definition(self, align=False, conv=False):
+    def definition(self, align=False, conv=False, postfix=""):
         """ Generate prototype for given function.

Args:
@@ -1401,16 +1401,20 @@ class VkMember(VkVariable):
         if self.is_struct_forward_declaration():
             text += "struct "

-        if conv and self.is_struct():
-            text += "{0}_host".format(self.type)
-        else:
-            text += self.type
+        text += self.type
+        if conv and self.needs_host_type():
+            text += "32"
+        elif postfix and self.needs_host_type():
+            text += postfix

if self.is_pointer():
             text += " {0}{1}".format(self.pointer, self.name)
         else:
             if align and self.needs_alignment():
-                text += " WINE_VK_ALIGN(8) " + self.name
+                if conv:
+                    text += " DECLSPEC_ALIGN(8) " + self.name
+                else:
+                    text += " WINE_VK_ALIGN(8) " + self.name
             else:
                 text += " " + self.name

@@ -1612,7 +1616,7 @@ class VkParam(VkVariable):
         proto += self.type
         name = self.name
         if is_thunk and self.needs_host_type():
-            proto += "_host"
+            proto += "32" if is_member else "_host"

if is_member and self.needs_alignment():
             proto += " DECLSPEC_ALIGN(8)"
@@ -1876,6 +1880,8 @@ class VkStruct(Sequence):

if postfix:
             suffix = postfix
+        elif conv:
+            suffix = "32"
         else:
             suffix = ""

@@ -1889,16 +1895,11 @@ class VkStruct(Sequence):

for m in self:
             if align and m.needs_alignment():
-                text += "    {0};\n".format(m.definition(align=align))
-            elif conv and m.needs_host_type():
-                text += "    {0};\n".format(m.definition(conv=conv))
+                text += "    {0};\n".format(m.definition(align=align, conv=conv, postfix=postfix))
             else:
-                text += "    {0};\n".format(m.definition())
+                text += "    {0};\n".format(m.definition(conv=conv, postfix=postfix))

-        if postfix is not None:
-            text += "}} {0}{1};\n".format(self.name, postfix)
-        else:
-            text += "}} {0};\n".format(self.name)
+        text += "}} {0}{1};\n".format(self.name, suffix)

for aliasee in self.aliased_by:
             text += "typedef {0}{2} {1}{2};\n".format(self.name, aliasee.name, suffix)
@@ -2120,6 +2121,8 @@ class StructConversionFunction(object):
         needs_alloc = self.direction != Direction.OUTPUT and self.operand.needs_alloc(self.conv, self.unwrap)
         host_type = self.type + "_host" if self.operand.needs_host_type() else self.type
         win_type = self.type
+        if self.conv and self.operand.needs_host_type():
+            win_type += "32"
         if self.direction == Direction.OUTPUT and self.const:
             win_type = "const " + win_type

@@ -2188,12 +2191,13 @@ class StructConversionFunction(object):

stype = next(x for x in ext.members if x.name == "sType").values
                 host_type = ext.name + "_host" if self.conv and ext.needs_host_type() else ext.name
+                win_type = ext.name + "32" if self.conv and ext.needs_host_type() else ext.name
                 if self.direction == Direction.INPUT:
-                    in_type = "const " + ext.name
+                    in_type = "const " + win_type
                     out_type = host_type
                 else:
                     in_type = "const " + host_type
-                    out_type = ext.name
+                    out_type = win_type

body += "        case {0}:\n".format(stype)
                 body += "        {\n"
@@ -2289,9 +2293,11 @@ class ArrayConversionFunction(object):
         else:
             host_type = self.type
         win_type = self.type
-        pointer_part = self.array.pointer if self.array.pointer else "*"
+        if self.conv and self.array.needs_host_type():
+            win_type += "32"
         if self.direction == Direction.OUTPUT and self.array.is_const():
             win_type = "const " + win_type
+        pointer_part = self.array.pointer if self.array.pointer else "*"

if self.direction == Direction.OUTPUT:
             params = ["const {0} {1}in".format(host_type, pointer_part),
@@ -2440,6 +2446,12 @@ class VkGenerator(object):

f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n")

+        f.write("#if defined(USE_STRUCT_CONVERSION)\n\n")
+        for struct in self.host_structs:
+            f.write(struct.definition(conv=True, align=True))
+            f.write("\n")
+        f.write("#endif /* USE_STRUCT_CONVERSION */\n\n")
+
         f.write("static uint64_t wine_vk_unwrap_handle(uint32_t type, uint64_t handle)\n")
         f.write("{\n")
         f.write("    switch(type)\n")
@@ -2587,7 +2599,7 @@ class VkGenerator(object):
             if struct.is_alias():
                 continue
             f.write("#if defined(USE_STRUCT_CONVERSION)\n")
-            f.write(struct.definition(align=False, conv=True, postfix="_host"))
+            f.write(struct.definition(align=False, postfix="_host"))
             f.write("#else\n")
             f.write("typedef {0} {0}_host;\n".format(struct.name))
             for aliasee in struct.aliased_by:
diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c
index 8b6f66ef649..a6266b73c25 100644
--- a/dlls/winevulkan/vulkan_thunks.c
+++ b/dlls/winevulkan/vulkan_thunks.c
@@ -21,6 +21,1808 @@

WINE_DEFAULT_DEBUG_CHANNEL(vulkan);

+#if defined(USE_STRUCT_CONVERSION)
+
+typedef struct VkAcquireNextImageInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkSwapchainKHR DECLSPEC_ALIGN(8) swapchain;
+    uint64_t DECLSPEC_ALIGN(8) timeout;
+    VkSemaphore DECLSPEC_ALIGN(8) semaphore;
+    VkFence DECLSPEC_ALIGN(8) fence;
+    uint32_t deviceMask;
+} VkAcquireNextImageInfoKHR32;
+
+typedef struct VkAcquireProfilingLockInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkAcquireProfilingLockFlagsKHR flags;
+    uint64_t DECLSPEC_ALIGN(8) timeout;
+} VkAcquireProfilingLockInfoKHR32;
+
+typedef struct VkCommandBufferAllocateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkCommandPool DECLSPEC_ALIGN(8) commandPool;
+    VkCommandBufferLevel level;
+    uint32_t commandBufferCount;
+} VkCommandBufferAllocateInfo32;
+
+typedef struct VkDescriptorSetAllocateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDescriptorPool DECLSPEC_ALIGN(8) descriptorPool;
+    uint32_t descriptorSetCount;
+    const VkDescriptorSetLayout *pSetLayouts;
+} VkDescriptorSetAllocateInfo32;
+
+typedef struct VkDedicatedAllocationMemoryAllocateInfoNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImage DECLSPEC_ALIGN(8) image;
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+} VkDedicatedAllocationMemoryAllocateInfoNV32;
+
+typedef struct VkMemoryDedicatedAllocateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImage DECLSPEC_ALIGN(8) image;
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+} VkMemoryDedicatedAllocateInfo32;
+typedef VkMemoryDedicatedAllocateInfo32 VkMemoryDedicatedAllocateInfoKHR32;
+
+typedef struct VkMemoryOpaqueCaptureAddressAllocateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    uint64_t DECLSPEC_ALIGN(8) opaqueCaptureAddress;
+} VkMemoryOpaqueCaptureAddressAllocateInfo32;
+typedef VkMemoryOpaqueCaptureAddressAllocateInfo32 VkMemoryOpaqueCaptureAddressAllocateInfoKHR32;
+
+typedef struct VkMemoryAllocateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDeviceSize DECLSPEC_ALIGN(8) allocationSize;
+    uint32_t memoryTypeIndex;
+} VkMemoryAllocateInfo32;
+
+typedef struct VkCommandBufferInheritanceInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkRenderPass DECLSPEC_ALIGN(8) renderPass;
+    uint32_t subpass;
+    VkFramebuffer DECLSPEC_ALIGN(8) framebuffer;
+    VkBool32 occlusionQueryEnable;
+    VkQueryControlFlags queryFlags;
+    VkQueryPipelineStatisticFlags pipelineStatistics;
+} VkCommandBufferInheritanceInfo32;
+
+typedef struct VkCommandBufferBeginInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkCommandBufferUsageFlags flags;
+    const VkCommandBufferInheritanceInfo32 *pInheritanceInfo;
+} VkCommandBufferBeginInfo32;
+
+typedef struct VkBindAccelerationStructureMemoryInfoNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkAccelerationStructureNV DECLSPEC_ALIGN(8) accelerationStructure;
+    VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+    VkDeviceSize DECLSPEC_ALIGN(8) memoryOffset;
+    uint32_t deviceIndexCount;
+    const uint32_t *pDeviceIndices;
+} VkBindAccelerationStructureMemoryInfoNV32;
+
+typedef struct VkBindBufferMemoryInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+    VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+    VkDeviceSize DECLSPEC_ALIGN(8) memoryOffset;
+} VkBindBufferMemoryInfo32;
+typedef VkBindBufferMemoryInfo32 VkBindBufferMemoryInfoKHR32;
+
+typedef struct VkBindImageMemorySwapchainInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkSwapchainKHR DECLSPEC_ALIGN(8) swapchain;
+    uint32_t imageIndex;
+} VkBindImageMemorySwapchainInfoKHR32;
+
+typedef struct VkBindImageMemoryInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImage DECLSPEC_ALIGN(8) image;
+    VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+    VkDeviceSize DECLSPEC_ALIGN(8) memoryOffset;
+} VkBindImageMemoryInfo32;
+typedef VkBindImageMemoryInfo32 VkBindImageMemoryInfoKHR32;
+
+typedef struct VkAccelerationStructureGeometryKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkGeometryTypeKHR geometryType;
+    VkAccelerationStructureGeometryDataKHR DECLSPEC_ALIGN(8) geometry;
+    VkGeometryFlagsKHR flags;
+} VkAccelerationStructureGeometryKHR32;
+
+typedef struct VkAccelerationStructureBuildGeometryInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkAccelerationStructureTypeKHR type;
+    VkBuildAccelerationStructureFlagsKHR flags;
+    VkBuildAccelerationStructureModeKHR mode;
+    VkAccelerationStructureKHR DECLSPEC_ALIGN(8) srcAccelerationStructure;
+    VkAccelerationStructureKHR DECLSPEC_ALIGN(8) dstAccelerationStructure;
+    uint32_t geometryCount;
+    const VkAccelerationStructureGeometryKHR32 *pGeometries;
+    const VkAccelerationStructureGeometryKHR32 * const*ppGeometries;
+    VkDeviceOrHostAddressKHR DECLSPEC_ALIGN(8) scratchData;
+} VkAccelerationStructureBuildGeometryInfoKHR32;
+
+typedef struct VkMicromapBuildInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkMicromapTypeEXT type;
+    VkBuildMicromapFlagsEXT flags;
+    VkBuildMicromapModeEXT mode;
+    VkMicromapEXT DECLSPEC_ALIGN(8) dstMicromap;
+    uint32_t usageCountsCount;
+    const VkMicromapUsageEXT *pUsageCounts;
+    const VkMicromapUsageEXT * const*ppUsageCounts;
+    VkDeviceOrHostAddressConstKHR DECLSPEC_ALIGN(8) data;
+    VkDeviceOrHostAddressKHR DECLSPEC_ALIGN(8) scratchData;
+    VkDeviceOrHostAddressConstKHR DECLSPEC_ALIGN(8) triangleArray;
+    VkDeviceSize DECLSPEC_ALIGN(8) triangleArrayStride;
+} VkMicromapBuildInfoEXT32;
+
+typedef struct VkConditionalRenderingBeginInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+    VkDeviceSize DECLSPEC_ALIGN(8) offset;
+    VkConditionalRenderingFlagsEXT flags;
+} VkConditionalRenderingBeginInfoEXT32;
+
+typedef struct VkRenderPassBeginInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkRenderPass DECLSPEC_ALIGN(8) renderPass;
+    VkFramebuffer DECLSPEC_ALIGN(8) framebuffer;
+    VkRect2D renderArea;
+    uint32_t clearValueCount;
+    const VkClearValue *pClearValues;
+} VkRenderPassBeginInfo32;
+
+typedef struct VkRenderingAttachmentInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImageView DECLSPEC_ALIGN(8) imageView;
+    VkImageLayout imageLayout;
+    VkResolveModeFlagBits resolveMode;
+    VkImageView DECLSPEC_ALIGN(8) resolveImageView;
+    VkImageLayout resolveImageLayout;
+    VkAttachmentLoadOp loadOp;
+    VkAttachmentStoreOp storeOp;
+    VkClearValue clearValue;
+} VkRenderingAttachmentInfo32;
+typedef VkRenderingAttachmentInfo32 VkRenderingAttachmentInfoKHR32;
+
+typedef struct VkRenderingFragmentShadingRateAttachmentInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImageView DECLSPEC_ALIGN(8) imageView;
+    VkImageLayout imageLayout;
+    VkExtent2D shadingRateAttachmentTexelSize;
+} VkRenderingFragmentShadingRateAttachmentInfoKHR32;
+
+typedef struct VkRenderingFragmentDensityMapAttachmentInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImageView DECLSPEC_ALIGN(8) imageView;
+    VkImageLayout imageLayout;
+} VkRenderingFragmentDensityMapAttachmentInfoEXT32;
+
+typedef struct VkRenderingInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkRenderingFlags flags;
+    VkRect2D renderArea;
+    uint32_t layerCount;
+    uint32_t viewMask;
+    uint32_t colorAttachmentCount;
+    const VkRenderingAttachmentInfo32 *pColorAttachments;
+    const VkRenderingAttachmentInfo32 *pDepthAttachment;
+    const VkRenderingAttachmentInfo32 *pStencilAttachment;
+} VkRenderingInfo32;
+typedef VkRenderingInfo32 VkRenderingInfoKHR32;
+
+typedef struct VkBlitImageInfo232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImage DECLSPEC_ALIGN(8) srcImage;
+    VkImageLayout srcImageLayout;
+    VkImage DECLSPEC_ALIGN(8) dstImage;
+    VkImageLayout dstImageLayout;
+    uint32_t regionCount;
+    const VkImageBlit2 *pRegions;
+    VkFilter filter;
+} VkBlitImageInfo232;
+typedef VkBlitImageInfo232 VkBlitImageInfo2KHR32;
+
+typedef struct VkGeometryTrianglesNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkBuffer DECLSPEC_ALIGN(8) vertexData;
+    VkDeviceSize DECLSPEC_ALIGN(8) vertexOffset;
+    uint32_t vertexCount;
+    VkDeviceSize DECLSPEC_ALIGN(8) vertexStride;
+    VkFormat vertexFormat;
+    VkBuffer DECLSPEC_ALIGN(8) indexData;
+    VkDeviceSize DECLSPEC_ALIGN(8) indexOffset;
+    uint32_t indexCount;
+    VkIndexType indexType;
+    VkBuffer DECLSPEC_ALIGN(8) transformData;
+    VkDeviceSize DECLSPEC_ALIGN(8) transformOffset;
+} VkGeometryTrianglesNV32;
+
+typedef struct VkGeometryAABBNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkBuffer DECLSPEC_ALIGN(8) aabbData;
+    uint32_t numAABBs;
+    uint32_t stride;
+    VkDeviceSize DECLSPEC_ALIGN(8) offset;
+} VkGeometryAABBNV32;
+
+typedef struct VkGeometryDataNV32
+{
+    VkGeometryTrianglesNV32 DECLSPEC_ALIGN(8) triangles;
+    VkGeometryAABBNV32 DECLSPEC_ALIGN(8) aabbs;
+} VkGeometryDataNV32;
+
+typedef struct VkGeometryNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkGeometryTypeKHR geometryType;
+    VkGeometryDataNV32 DECLSPEC_ALIGN(8) geometry;
+    VkGeometryFlagsKHR flags;
+} VkGeometryNV32;
+
+typedef struct VkAccelerationStructureInfoNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkAccelerationStructureTypeNV type;
+    VkBuildAccelerationStructureFlagsNV flags;
+    uint32_t instanceCount;
+    uint32_t geometryCount;
+    const VkGeometryNV32 *pGeometries;
+} VkAccelerationStructureInfoNV32;
+
+typedef struct VkCopyAccelerationStructureInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkAccelerationStructureKHR DECLSPEC_ALIGN(8) src;
+    VkAccelerationStructureKHR DECLSPEC_ALIGN(8) dst;
+    VkCopyAccelerationStructureModeKHR mode;
+} VkCopyAccelerationStructureInfoKHR32;
+
+typedef struct VkCopyAccelerationStructureToMemoryInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkAccelerationStructureKHR DECLSPEC_ALIGN(8) src;
+    VkDeviceOrHostAddressKHR DECLSPEC_ALIGN(8) dst;
+    VkCopyAccelerationStructureModeKHR mode;
+} VkCopyAccelerationStructureToMemoryInfoKHR32;
+
+typedef struct VkBufferCopy32
+{
+    VkDeviceSize DECLSPEC_ALIGN(8) srcOffset;
+    VkDeviceSize DECLSPEC_ALIGN(8) dstOffset;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+} VkBufferCopy32;
+
+typedef struct VkBufferCopy232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDeviceSize DECLSPEC_ALIGN(8) srcOffset;
+    VkDeviceSize DECLSPEC_ALIGN(8) dstOffset;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+} VkBufferCopy232;
+typedef VkBufferCopy232 VkBufferCopy2KHR32;
+
+typedef struct VkCopyBufferInfo232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkBuffer DECLSPEC_ALIGN(8) srcBuffer;
+    VkBuffer DECLSPEC_ALIGN(8) dstBuffer;
+    uint32_t regionCount;
+    const VkBufferCopy232 *pRegions;
+} VkCopyBufferInfo232;
+typedef VkCopyBufferInfo232 VkCopyBufferInfo2KHR32;
+
+typedef struct VkBufferImageCopy32
+{
+    VkDeviceSize DECLSPEC_ALIGN(8) bufferOffset;
+    uint32_t bufferRowLength;
+    uint32_t bufferImageHeight;
+    VkImageSubresourceLayers imageSubresource;
+    VkOffset3D imageOffset;
+    VkExtent3D imageExtent;
+} VkBufferImageCopy32;
+
+typedef struct VkBufferImageCopy232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDeviceSize DECLSPEC_ALIGN(8) bufferOffset;
+    uint32_t bufferRowLength;
+    uint32_t bufferImageHeight;
+    VkImageSubresourceLayers imageSubresource;
+    VkOffset3D imageOffset;
+    VkExtent3D imageExtent;
+} VkBufferImageCopy232;
+typedef VkBufferImageCopy232 VkBufferImageCopy2KHR32;
+
+typedef struct VkCopyBufferToImageInfo232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkBuffer DECLSPEC_ALIGN(8) srcBuffer;
+    VkImage DECLSPEC_ALIGN(8) dstImage;
+    VkImageLayout dstImageLayout;
+    uint32_t regionCount;
+    const VkBufferImageCopy232 *pRegions;
+} VkCopyBufferToImageInfo232;
+typedef VkCopyBufferToImageInfo232 VkCopyBufferToImageInfo2KHR32;
+
+typedef struct VkCopyImageInfo232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImage DECLSPEC_ALIGN(8) srcImage;
+    VkImageLayout srcImageLayout;
+    VkImage DECLSPEC_ALIGN(8) dstImage;
+    VkImageLayout dstImageLayout;
+    uint32_t regionCount;
+    const VkImageCopy2 *pRegions;
+} VkCopyImageInfo232;
+typedef VkCopyImageInfo232 VkCopyImageInfo2KHR32;
+
+typedef struct VkCopyImageToBufferInfo232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImage DECLSPEC_ALIGN(8) srcImage;
+    VkImageLayout srcImageLayout;
+    VkBuffer DECLSPEC_ALIGN(8) dstBuffer;
+    uint32_t regionCount;
+    const VkBufferImageCopy232 *pRegions;
+} VkCopyImageToBufferInfo232;
+typedef VkCopyImageToBufferInfo232 VkCopyImageToBufferInfo2KHR32;
+
+typedef struct VkCopyMemoryToAccelerationStructureInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDeviceOrHostAddressConstKHR DECLSPEC_ALIGN(8) src;
+    VkAccelerationStructureKHR DECLSPEC_ALIGN(8) dst;
+    VkCopyAccelerationStructureModeKHR mode;
+} VkCopyMemoryToAccelerationStructureInfoKHR32;
+
+typedef struct VkCopyMemoryToMicromapInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDeviceOrHostAddressConstKHR DECLSPEC_ALIGN(8) src;
+    VkMicromapEXT DECLSPEC_ALIGN(8) dst;
+    VkCopyMicromapModeEXT mode;
+} VkCopyMemoryToMicromapInfoEXT32;
+
+typedef struct VkCopyMicromapInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkMicromapEXT DECLSPEC_ALIGN(8) src;
+    VkMicromapEXT DECLSPEC_ALIGN(8) dst;
+    VkCopyMicromapModeEXT mode;
+} VkCopyMicromapInfoEXT32;
+
+typedef struct VkCopyMicromapToMemoryInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkMicromapEXT DECLSPEC_ALIGN(8) src;
+    VkDeviceOrHostAddressKHR DECLSPEC_ALIGN(8) dst;
+    VkCopyMicromapModeEXT mode;
+} VkCopyMicromapToMemoryInfoEXT32;
+
+typedef struct VkCuLaunchInfoNVX32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkCuFunctionNVX DECLSPEC_ALIGN(8) function;
+    uint32_t gridDimX;
+    uint32_t gridDimY;
+    uint32_t gridDimZ;
+    uint32_t blockDimX;
+    uint32_t blockDimY;
+    uint32_t blockDimZ;
+    uint32_t sharedMemBytes;
+    size_t paramCount;
+    const void * const *pParams;
+    size_t extraCount;
+    const void * const *pExtras;
+} VkCuLaunchInfoNVX32;
+
+typedef struct VkDecompressMemoryRegionNV32
+{
+    VkDeviceAddress DECLSPEC_ALIGN(8) srcAddress;
+    VkDeviceAddress DECLSPEC_ALIGN(8) dstAddress;
+    VkDeviceSize DECLSPEC_ALIGN(8) compressedSize;
+    VkDeviceSize DECLSPEC_ALIGN(8) decompressedSize;
+    VkMemoryDecompressionMethodFlagsNV decompressionMethod;
+} VkDecompressMemoryRegionNV32;
+
+typedef struct VkIndirectCommandsStreamNV32
+{
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+    VkDeviceSize DECLSPEC_ALIGN(8) offset;
+} VkIndirectCommandsStreamNV32;
+
+typedef struct VkGeneratedCommandsInfoNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPipelineBindPoint pipelineBindPoint;
+    VkPipeline DECLSPEC_ALIGN(8) pipeline;
+    VkIndirectCommandsLayoutNV DECLSPEC_ALIGN(8) indirectCommandsLayout;
+    uint32_t streamCount;
+    const VkIndirectCommandsStreamNV32 *pStreams;
+    uint32_t sequencesCount;
+    VkBuffer DECLSPEC_ALIGN(8) preprocessBuffer;
+    VkDeviceSize DECLSPEC_ALIGN(8) preprocessOffset;
+    VkDeviceSize DECLSPEC_ALIGN(8) preprocessSize;
+    VkBuffer DECLSPEC_ALIGN(8) sequencesCountBuffer;
+    VkDeviceSize DECLSPEC_ALIGN(8) sequencesCountOffset;
+    VkBuffer DECLSPEC_ALIGN(8) sequencesIndexBuffer;
+    VkDeviceSize DECLSPEC_ALIGN(8) sequencesIndexOffset;
+} VkGeneratedCommandsInfoNV32;
+
+typedef struct VkBufferMemoryBarrier32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkAccessFlags srcAccessMask;
+    VkAccessFlags dstAccessMask;
+    uint32_t srcQueueFamilyIndex;
+    uint32_t dstQueueFamilyIndex;
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+    VkDeviceSize DECLSPEC_ALIGN(8) offset;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+} VkBufferMemoryBarrier32;
+
+typedef struct VkImageMemoryBarrier32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkAccessFlags srcAccessMask;
+    VkAccessFlags dstAccessMask;
+    VkImageLayout oldLayout;
+    VkImageLayout newLayout;
+    uint32_t srcQueueFamilyIndex;
+    uint32_t dstQueueFamilyIndex;
+    VkImage DECLSPEC_ALIGN(8) image;
+    VkImageSubresourceRange subresourceRange;
+} VkImageMemoryBarrier32;
+
+typedef struct VkBufferMemoryBarrier232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPipelineStageFlags2 srcStageMask;
+    VkAccessFlags2 srcAccessMask;
+    VkPipelineStageFlags2 dstStageMask;
+    VkAccessFlags2 dstAccessMask;
+    uint32_t srcQueueFamilyIndex;
+    uint32_t dstQueueFamilyIndex;
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+    VkDeviceSize DECLSPEC_ALIGN(8) offset;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+} VkBufferMemoryBarrier232;
+typedef VkBufferMemoryBarrier232 VkBufferMemoryBarrier2KHR32;
+
+typedef struct VkImageMemoryBarrier232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPipelineStageFlags2 srcStageMask;
+    VkAccessFlags2 srcAccessMask;
+    VkPipelineStageFlags2 dstStageMask;
+    VkAccessFlags2 dstAccessMask;
+    VkImageLayout oldLayout;
+    VkImageLayout newLayout;
+    uint32_t srcQueueFamilyIndex;
+    uint32_t dstQueueFamilyIndex;
+    VkImage DECLSPEC_ALIGN(8) image;
+    VkImageSubresourceRange subresourceRange;
+} VkImageMemoryBarrier232;
+typedef VkImageMemoryBarrier232 VkImageMemoryBarrier2KHR32;
+
+typedef struct VkDependencyInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDependencyFlags dependencyFlags;
+    uint32_t memoryBarrierCount;
+    const VkMemoryBarrier2 *pMemoryBarriers;
+    uint32_t bufferMemoryBarrierCount;
+    const VkBufferMemoryBarrier232 *pBufferMemoryBarriers;
+    uint32_t imageMemoryBarrierCount;
+    const VkImageMemoryBarrier232 *pImageMemoryBarriers;
+} VkDependencyInfo32;
+typedef VkDependencyInfo32 VkDependencyInfoKHR32;
+
+typedef struct VkDescriptorImageInfo32
+{
+    VkSampler DECLSPEC_ALIGN(8) sampler;
+    VkImageView DECLSPEC_ALIGN(8) imageView;
+    VkImageLayout imageLayout;
+} VkDescriptorImageInfo32;
+
+typedef struct VkDescriptorBufferInfo32
+{
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+    VkDeviceSize DECLSPEC_ALIGN(8) offset;
+    VkDeviceSize DECLSPEC_ALIGN(8) range;
+} VkDescriptorBufferInfo32;
+
+typedef struct VkWriteDescriptorSet32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDescriptorSet DECLSPEC_ALIGN(8) dstSet;
+    uint32_t dstBinding;
+    uint32_t dstArrayElement;
+    uint32_t descriptorCount;
+    VkDescriptorType descriptorType;
+    const VkDescriptorImageInfo32 *pImageInfo;
+    const VkDescriptorBufferInfo32 *pBufferInfo;
+    const VkBufferView *pTexelBufferView;
+} VkWriteDescriptorSet32;
+
+typedef struct VkResolveImageInfo232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImage DECLSPEC_ALIGN(8) srcImage;
+    VkImageLayout srcImageLayout;
+    VkImage DECLSPEC_ALIGN(8) dstImage;
+    VkImageLayout dstImageLayout;
+    uint32_t regionCount;
+    const VkImageResolve2 *pRegions;
+} VkResolveImageInfo232;
+typedef VkResolveImageInfo232 VkResolveImageInfo2KHR32;
+
+typedef struct VkPerformanceMarkerInfoINTEL32
+{
+    VkStructureType sType;
+    const void *pNext;
+    uint64_t DECLSPEC_ALIGN(8) marker;
+} VkPerformanceMarkerInfoINTEL32;
+
+typedef struct VkPerformanceOverrideInfoINTEL32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPerformanceOverrideTypeINTEL type;
+    VkBool32 enable;
+    uint64_t DECLSPEC_ALIGN(8) parameter;
+} VkPerformanceOverrideInfoINTEL32;
+
+typedef struct VkStridedDeviceAddressRegionKHR32
+{
+    VkDeviceAddress DECLSPEC_ALIGN(8) deviceAddress;
+    VkDeviceSize DECLSPEC_ALIGN(8) stride;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+} VkStridedDeviceAddressRegionKHR32;
+
+typedef struct VkAccelerationStructureCreateInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkAccelerationStructureCreateFlagsKHR createFlags;
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+    VkDeviceSize DECLSPEC_ALIGN(8) offset;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+    VkAccelerationStructureTypeKHR type;
+    VkDeviceAddress DECLSPEC_ALIGN(8) deviceAddress;
+} VkAccelerationStructureCreateInfoKHR32;
+
+typedef struct VkAccelerationStructureCreateInfoNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDeviceSize DECLSPEC_ALIGN(8) compactedSize;
+    VkAccelerationStructureInfoNV32 info;
+} VkAccelerationStructureCreateInfoNV32;
+
+typedef struct VkBufferOpaqueCaptureAddressCreateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    uint64_t DECLSPEC_ALIGN(8) opaqueCaptureAddress;
+} VkBufferOpaqueCaptureAddressCreateInfo32;
+typedef VkBufferOpaqueCaptureAddressCreateInfo32 VkBufferOpaqueCaptureAddressCreateInfoKHR32;
+
+typedef struct VkBufferDeviceAddressCreateInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDeviceAddress DECLSPEC_ALIGN(8) deviceAddress;
+} VkBufferDeviceAddressCreateInfoEXT32;
+
+typedef struct VkBufferCreateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkBufferCreateFlags flags;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+    VkBufferUsageFlags usage;
+    VkSharingMode sharingMode;
+    uint32_t queueFamilyIndexCount;
+    const uint32_t *pQueueFamilyIndices;
+} VkBufferCreateInfo32;
+
+typedef struct VkBufferViewCreateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkBufferViewCreateFlags flags;
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+    VkFormat format;
+    VkDeviceSize DECLSPEC_ALIGN(8) offset;
+    VkDeviceSize DECLSPEC_ALIGN(8) range;
+} VkBufferViewCreateInfo32;
+
+typedef struct VkPipelineCreationFeedback32
+{
+    VkPipelineCreationFeedbackFlags flags;
+    uint64_t DECLSPEC_ALIGN(8) duration;
+} VkPipelineCreationFeedback32;
+typedef VkPipelineCreationFeedback32 VkPipelineCreationFeedbackEXT32;
+
+typedef struct VkShaderModuleValidationCacheCreateInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkValidationCacheEXT DECLSPEC_ALIGN(8) validationCache;
+} VkShaderModuleValidationCacheCreateInfoEXT32;
+
+typedef struct VkDebugUtilsObjectNameInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkObjectType objectType;
+    uint64_t DECLSPEC_ALIGN(8) objectHandle;
+    const char *pObjectName;
+} VkDebugUtilsObjectNameInfoEXT32;
+
+typedef struct VkPipelineShaderStageCreateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPipelineShaderStageCreateFlags flags;
+    VkShaderStageFlagBits stage;
+    VkShaderModule DECLSPEC_ALIGN(8) module;
+    const char *pName;
+    const VkSpecializationInfo *pSpecializationInfo;
+} VkPipelineShaderStageCreateInfo32;
+
+typedef struct VkPipelineCreationFeedbackCreateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPipelineCreationFeedback32 *pPipelineCreationFeedback;
+    uint32_t pipelineStageCreationFeedbackCount;
+    VkPipelineCreationFeedback32 *pPipelineStageCreationFeedbacks;
+} VkPipelineCreationFeedbackCreateInfo32;
+typedef VkPipelineCreationFeedbackCreateInfo32 VkPipelineCreationFeedbackCreateInfoEXT32;
+
+typedef struct VkSubpassShadingPipelineCreateInfoHUAWEI32
+{
+    VkStructureType sType;
+    void *pNext;
+    VkRenderPass DECLSPEC_ALIGN(8) renderPass;
+    uint32_t subpass;
+} VkSubpassShadingPipelineCreateInfoHUAWEI32;
+
+typedef struct VkComputePipelineCreateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPipelineCreateFlags flags;
+    VkPipelineShaderStageCreateInfo32 DECLSPEC_ALIGN(8) stage;
+    VkPipelineLayout DECLSPEC_ALIGN(8) layout;
+    VkPipeline DECLSPEC_ALIGN(8) basePipelineHandle;
+    int32_t basePipelineIndex;
+} VkComputePipelineCreateInfo32;
+
+typedef struct VkCuFunctionCreateInfoNVX32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkCuModuleNVX DECLSPEC_ALIGN(8) module;
+    const char *pName;
+} VkCuFunctionCreateInfoNVX32;
+
+typedef struct VkDescriptorUpdateTemplateCreateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDescriptorUpdateTemplateCreateFlags flags;
+    uint32_t descriptorUpdateEntryCount;
+    const VkDescriptorUpdateTemplateEntry *pDescriptorUpdateEntries;
+    VkDescriptorUpdateTemplateType templateType;
+    VkDescriptorSetLayout DECLSPEC_ALIGN(8) descriptorSetLayout;
+    VkPipelineBindPoint pipelineBindPoint;
+    VkPipelineLayout DECLSPEC_ALIGN(8) pipelineLayout;
+    uint32_t set;
+} VkDescriptorUpdateTemplateCreateInfo32;
+typedef VkDescriptorUpdateTemplateCreateInfo32 VkDescriptorUpdateTemplateCreateInfoKHR32;
+
+typedef struct VkFramebufferCreateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkFramebufferCreateFlags flags;
+    VkRenderPass DECLSPEC_ALIGN(8) renderPass;
+    uint32_t attachmentCount;
+    const VkImageView *pAttachments;
+    uint32_t width;
+    uint32_t height;
+    uint32_t layers;
+} VkFramebufferCreateInfo32;
+
+typedef struct VkGraphicsShaderGroupCreateInfoNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    uint32_t stageCount;
+    const VkPipelineShaderStageCreateInfo32 *pStages;
+    const VkPipelineVertexInputStateCreateInfo *pVertexInputState;
+    const VkPipelineTessellationStateCreateInfo *pTessellationState;
+} VkGraphicsShaderGroupCreateInfoNV32;
+
+typedef struct VkGraphicsPipelineShaderGroupsCreateInfoNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    uint32_t groupCount;
+    const VkGraphicsShaderGroupCreateInfoNV32 *pGroups;
+    uint32_t pipelineCount;
+    const VkPipeline *pPipelines;
+} VkGraphicsPipelineShaderGroupsCreateInfoNV32;
+
+typedef struct VkGraphicsPipelineCreateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPipelineCreateFlags flags;
+    uint32_t stageCount;
+    const VkPipelineShaderStageCreateInfo32 *pStages;
+    const VkPipelineVertexInputStateCreateInfo *pVertexInputState;
+    const VkPipelineInputAssemblyStateCreateInfo *pInputAssemblyState;
+    const VkPipelineTessellationStateCreateInfo *pTessellationState;
+    const VkPipelineViewportStateCreateInfo *pViewportState;
+    const VkPipelineRasterizationStateCreateInfo *pRasterizationState;
+    const VkPipelineMultisampleStateCreateInfo *pMultisampleState;
+    const VkPipelineDepthStencilStateCreateInfo *pDepthStencilState;
+    const VkPipelineColorBlendStateCreateInfo *pColorBlendState;
+    const VkPipelineDynamicStateCreateInfo *pDynamicState;
+    VkPipelineLayout DECLSPEC_ALIGN(8) layout;
+    VkRenderPass DECLSPEC_ALIGN(8) renderPass;
+    uint32_t subpass;
+    VkPipeline DECLSPEC_ALIGN(8) basePipelineHandle;
+    int32_t basePipelineIndex;
+} VkGraphicsPipelineCreateInfo32;
+
+typedef struct VkImageSwapchainCreateInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkSwapchainKHR DECLSPEC_ALIGN(8) swapchain;
+} VkImageSwapchainCreateInfoKHR32;
+
+typedef struct VkSamplerYcbcrConversionInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkSamplerYcbcrConversion DECLSPEC_ALIGN(8) conversion;
+} VkSamplerYcbcrConversionInfo32;
+typedef VkSamplerYcbcrConversionInfo32 VkSamplerYcbcrConversionInfoKHR32;
+
+typedef struct VkImageViewCreateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImageViewCreateFlags flags;
+    VkImage DECLSPEC_ALIGN(8) image;
+    VkImageViewType viewType;
+    VkFormat format;
+    VkComponentMapping components;
+    VkImageSubresourceRange subresourceRange;
+} VkImageViewCreateInfo32;
+
+typedef struct VkIndirectCommandsLayoutTokenNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkIndirectCommandsTokenTypeNV tokenType;
+    uint32_t stream;
+    uint32_t offset;
+    uint32_t vertexBindingUnit;
+    VkBool32 vertexDynamicStride;
+    VkPipelineLayout DECLSPEC_ALIGN(8) pushconstantPipelineLayout;
+    VkShaderStageFlags pushconstantShaderStageFlags;
+    uint32_t pushconstantOffset;
+    uint32_t pushconstantSize;
+    VkIndirectStateFlagsNV indirectStateFlags;
+    uint32_t indexTypeCount;
+    const VkIndexType *pIndexTypes;
+    const uint32_t *pIndexTypeValues;
+} VkIndirectCommandsLayoutTokenNV32;
+
+typedef struct VkIndirectCommandsLayoutCreateInfoNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkIndirectCommandsLayoutUsageFlagsNV flags;
+    VkPipelineBindPoint pipelineBindPoint;
+    uint32_t tokenCount;
+    const VkIndirectCommandsLayoutTokenNV32 *pTokens;
+    uint32_t streamCount;
+    const uint32_t *pStreamStrides;
+} VkIndirectCommandsLayoutCreateInfoNV32;
+
+typedef struct VkMicromapCreateInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkMicromapCreateFlagsEXT createFlags;
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+    VkDeviceSize DECLSPEC_ALIGN(8) offset;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+    VkMicromapTypeEXT type;
+    VkDeviceAddress DECLSPEC_ALIGN(8) deviceAddress;
+} VkMicromapCreateInfoEXT32;
+
+typedef struct VkRayTracingPipelineCreateInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPipelineCreateFlags flags;
+    uint32_t stageCount;
+    const VkPipelineShaderStageCreateInfo32 *pStages;
+    uint32_t groupCount;
+    const VkRayTracingShaderGroupCreateInfoKHR *pGroups;
+    uint32_t maxPipelineRayRecursionDepth;
+    const VkPipelineLibraryCreateInfoKHR *pLibraryInfo;
+    const VkRayTracingPipelineInterfaceCreateInfoKHR *pLibraryInterface;
+    const VkPipelineDynamicStateCreateInfo *pDynamicState;
+    VkPipelineLayout DECLSPEC_ALIGN(8) layout;
+    VkPipeline DECLSPEC_ALIGN(8) basePipelineHandle;
+    int32_t basePipelineIndex;
+} VkRayTracingPipelineCreateInfoKHR32;
+
+typedef struct VkRayTracingPipelineCreateInfoNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPipelineCreateFlags flags;
+    uint32_t stageCount;
+    const VkPipelineShaderStageCreateInfo32 *pStages;
+    uint32_t groupCount;
+    const VkRayTracingShaderGroupCreateInfoNV *pGroups;
+    uint32_t maxRecursionDepth;
+    VkPipelineLayout DECLSPEC_ALIGN(8) layout;
+    VkPipeline DECLSPEC_ALIGN(8) basePipelineHandle;
+    int32_t basePipelineIndex;
+} VkRayTracingPipelineCreateInfoNV32;
+
+typedef struct VkSemaphoreTypeCreateInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkSemaphoreType semaphoreType;
+    uint64_t DECLSPEC_ALIGN(8) initialValue;
+} VkSemaphoreTypeCreateInfo32;
+typedef VkSemaphoreTypeCreateInfo32 VkSemaphoreTypeCreateInfoKHR32;
+
+typedef struct VkSwapchainCreateInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkSwapchainCreateFlagsKHR flags;
+    VkSurfaceKHR DECLSPEC_ALIGN(8) surface;
+    uint32_t minImageCount;
+    VkFormat imageFormat;
+    VkColorSpaceKHR imageColorSpace;
+    VkExtent2D imageExtent;
+    uint32_t imageArrayLayers;
+    VkImageUsageFlags imageUsage;
+    VkSharingMode imageSharingMode;
+    uint32_t queueFamilyIndexCount;
+    const uint32_t *pQueueFamilyIndices;
+    VkSurfaceTransformFlagBitsKHR preTransform;
+    VkCompositeAlphaFlagBitsKHR compositeAlpha;
+    VkPresentModeKHR presentMode;
+    VkBool32 clipped;
+    VkSwapchainKHR DECLSPEC_ALIGN(8) oldSwapchain;
+} VkSwapchainCreateInfoKHR32;
+
+typedef struct VkDebugMarkerObjectNameInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDebugReportObjectTypeEXT objectType;
+    uint64_t DECLSPEC_ALIGN(8) object;
+    const char *pObjectName;
+} VkDebugMarkerObjectNameInfoEXT32;
+
+typedef struct VkDebugMarkerObjectTagInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDebugReportObjectTypeEXT objectType;
+    uint64_t DECLSPEC_ALIGN(8) object;
+    uint64_t DECLSPEC_ALIGN(8) tagName;
+    size_t tagSize;
+    const void *pTag;
+} VkDebugMarkerObjectTagInfoEXT32;
+
+typedef struct VkMappedMemoryRange32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+    VkDeviceSize DECLSPEC_ALIGN(8) offset;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+} VkMappedMemoryRange32;
+
+typedef struct VkAccelerationStructureBuildSizesInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDeviceSize DECLSPEC_ALIGN(8) accelerationStructureSize;
+    VkDeviceSize DECLSPEC_ALIGN(8) updateScratchSize;
+    VkDeviceSize DECLSPEC_ALIGN(8) buildScratchSize;
+} VkAccelerationStructureBuildSizesInfoKHR32;
+
+typedef struct VkAccelerationStructureDeviceAddressInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkAccelerationStructureKHR DECLSPEC_ALIGN(8) accelerationStructure;
+} VkAccelerationStructureDeviceAddressInfoKHR32;
+
+typedef struct VkAccelerationStructureMemoryRequirementsInfoNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkAccelerationStructureMemoryRequirementsTypeNV type;
+    VkAccelerationStructureNV DECLSPEC_ALIGN(8) accelerationStructure;
+} VkAccelerationStructureMemoryRequirementsInfoNV32;
+
+typedef struct VkMemoryRequirements32
+{
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+    VkDeviceSize DECLSPEC_ALIGN(8) alignment;
+    uint32_t memoryTypeBits;
+} VkMemoryRequirements32;
+
+
+typedef struct VkBufferDeviceAddressInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+} VkBufferDeviceAddressInfo32;
+typedef VkBufferDeviceAddressInfo32 VkBufferDeviceAddressInfoKHR32;
+typedef VkBufferDeviceAddressInfo32 VkBufferDeviceAddressInfoEXT32;
+
+typedef struct VkBufferMemoryRequirementsInfo232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+} VkBufferMemoryRequirementsInfo232;
+typedef VkBufferMemoryRequirementsInfo232 VkBufferMemoryRequirementsInfo2KHR32;
+
+typedef struct VkMemoryRequirements232
+{
+    VkStructureType sType;
+    void *pNext;
+    VkMemoryRequirements32 DECLSPEC_ALIGN(8) memoryRequirements;
+} VkMemoryRequirements232;
+typedef VkMemoryRequirements232 VkMemoryRequirements2KHR32;
+
+typedef struct VkDescriptorSetBindingReferenceVALVE32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDescriptorSetLayout DECLSPEC_ALIGN(8) descriptorSetLayout;
+    uint32_t binding;
+} VkDescriptorSetBindingReferenceVALVE32;
+
+typedef struct VkDeviceBufferMemoryRequirements32
+{
+    VkStructureType sType;
+    const void *pNext;
+    const VkBufferCreateInfo32 *pCreateInfo;
+} VkDeviceBufferMemoryRequirements32;
+typedef VkDeviceBufferMemoryRequirements32 VkDeviceBufferMemoryRequirementsKHR32;
+
+typedef struct VkDeviceFaultCountsEXT32
+{
+    VkStructureType sType;
+    void *pNext;
+    uint32_t addressInfoCount;
+    uint32_t vendorInfoCount;
+    VkDeviceSize DECLSPEC_ALIGN(8) vendorBinarySize;
+} VkDeviceFaultCountsEXT32;
+
+typedef struct VkDeviceFaultAddressInfoEXT32
+{
+    VkDeviceFaultAddressTypeEXT addressType;
+    VkDeviceAddress DECLSPEC_ALIGN(8) reportedAddress;
+    VkDeviceSize DECLSPEC_ALIGN(8) addressPrecision;
+} VkDeviceFaultAddressInfoEXT32;
+
+typedef struct VkDeviceFaultVendorInfoEXT32
+{
+    char description[VK_MAX_DESCRIPTION_SIZE];
+    uint64_t DECLSPEC_ALIGN(8) vendorFaultCode;
+    uint64_t DECLSPEC_ALIGN(8) vendorFaultData;
+} VkDeviceFaultVendorInfoEXT32;
+
+typedef struct VkDeviceFaultInfoEXT32
+{
+    VkStructureType sType;
+    void *pNext;
+    char description[VK_MAX_DESCRIPTION_SIZE];
+    VkDeviceFaultAddressInfoEXT32 *pAddressInfos;
+    VkDeviceFaultVendorInfoEXT32 *pVendorInfos;
+    void *pVendorBinaryData;
+} VkDeviceFaultInfoEXT32;
+
+typedef struct VkSparseImageMemoryRequirements32
+{
+    VkSparseImageFormatProperties formatProperties;
+    uint32_t imageMipTailFirstLod;
+    VkDeviceSize DECLSPEC_ALIGN(8) imageMipTailSize;
+    VkDeviceSize DECLSPEC_ALIGN(8) imageMipTailOffset;
+    VkDeviceSize DECLSPEC_ALIGN(8) imageMipTailStride;
+} VkSparseImageMemoryRequirements32;
+
+typedef struct VkSparseImageMemoryRequirements232
+{
+    VkStructureType sType;
+    void *pNext;
+    VkSparseImageMemoryRequirements32 DECLSPEC_ALIGN(8) memoryRequirements;
+} VkSparseImageMemoryRequirements232;
+typedef VkSparseImageMemoryRequirements232 VkSparseImageMemoryRequirements2KHR32;
+
+typedef struct VkDeviceMemoryOpaqueCaptureAddressInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+} VkDeviceMemoryOpaqueCaptureAddressInfo32;
+typedef VkDeviceMemoryOpaqueCaptureAddressInfo32 VkDeviceMemoryOpaqueCaptureAddressInfoKHR32;
+
+typedef struct VkGeneratedCommandsMemoryRequirementsInfoNV32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPipelineBindPoint pipelineBindPoint;
+    VkPipeline DECLSPEC_ALIGN(8) pipeline;
+    VkIndirectCommandsLayoutNV DECLSPEC_ALIGN(8) indirectCommandsLayout;
+    uint32_t maxSequencesCount;
+} VkGeneratedCommandsMemoryRequirementsInfoNV32;
+
+typedef struct VkImageMemoryRequirementsInfo232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImage DECLSPEC_ALIGN(8) image;
+} VkImageMemoryRequirementsInfo232;
+typedef VkImageMemoryRequirementsInfo232 VkImageMemoryRequirementsInfo2KHR32;
+
+typedef struct VkImageSparseMemoryRequirementsInfo232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImage DECLSPEC_ALIGN(8) image;
+} VkImageSparseMemoryRequirementsInfo232;
+typedef VkImageSparseMemoryRequirementsInfo232 VkImageSparseMemoryRequirementsInfo2KHR32;
+
+typedef struct VkSubresourceLayout32
+{
+    VkDeviceSize DECLSPEC_ALIGN(8) offset;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+    VkDeviceSize DECLSPEC_ALIGN(8) rowPitch;
+    VkDeviceSize DECLSPEC_ALIGN(8) arrayPitch;
+    VkDeviceSize DECLSPEC_ALIGN(8) depthPitch;
+} VkSubresourceLayout32;
+
+typedef struct VkSubresourceLayout2EXT32
+{
+    VkStructureType sType;
+    void *pNext;
+    VkSubresourceLayout32 DECLSPEC_ALIGN(8) subresourceLayout;
+} VkSubresourceLayout2EXT32;
+
+typedef struct VkImageViewAddressPropertiesNVX32
+{
+    VkStructureType sType;
+    void *pNext;
+    VkDeviceAddress DECLSPEC_ALIGN(8) deviceAddress;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+} VkImageViewAddressPropertiesNVX32;
+
+typedef struct VkImageViewHandleInfoNVX32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkImageView DECLSPEC_ALIGN(8) imageView;
+    VkDescriptorType descriptorType;
+    VkSampler DECLSPEC_ALIGN(8) sampler;
+} VkImageViewHandleInfoNVX32;
+
+typedef struct VkMicromapBuildSizesInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDeviceSize DECLSPEC_ALIGN(8) micromapSize;
+    VkDeviceSize DECLSPEC_ALIGN(8) buildScratchSize;
+    VkBool32 discardable;
+} VkMicromapBuildSizesInfoEXT32;
+
+typedef struct VkPerformanceValueINTEL32
+{
+    VkPerformanceValueTypeINTEL type;
+    VkPerformanceValueDataINTEL DECLSPEC_ALIGN(8) data;
+} VkPerformanceValueINTEL32;
+
+typedef struct VkImageFormatProperties32
+{
+    VkExtent3D maxExtent;
+    uint32_t maxMipLevels;
+    uint32_t maxArrayLayers;
+    VkSampleCountFlags sampleCounts;
+    VkDeviceSize DECLSPEC_ALIGN(8) maxResourceSize;
+} VkImageFormatProperties32;
+
+typedef struct VkImageFormatProperties232
+{
+    VkStructureType sType;
+    void *pNext;
+    VkImageFormatProperties32 DECLSPEC_ALIGN(8) imageFormatProperties;
+} VkImageFormatProperties232;
+typedef VkImageFormatProperties232 VkImageFormatProperties2KHR32;
+
+typedef struct VkMemoryHeap32
+{
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+    VkMemoryHeapFlags flags;
+} VkMemoryHeap32;
+
+typedef struct VkPhysicalDeviceMemoryProperties32
+{
+    uint32_t memoryTypeCount;
+    VkMemoryType memoryTypes[VK_MAX_MEMORY_TYPES];
+    uint32_t memoryHeapCount;
+    VkMemoryHeap32 DECLSPEC_ALIGN(8) memoryHeaps[VK_MAX_MEMORY_HEAPS];
+} VkPhysicalDeviceMemoryProperties32;
+
+typedef struct VkPhysicalDeviceMemoryBudgetPropertiesEXT32
+{
+    VkStructureType sType;
+    void *pNext;
+    VkDeviceSize DECLSPEC_ALIGN(8) heapBudget[VK_MAX_MEMORY_HEAPS];
+    VkDeviceSize DECLSPEC_ALIGN(8) heapUsage[VK_MAX_MEMORY_HEAPS];
+} VkPhysicalDeviceMemoryBudgetPropertiesEXT32;
+
+typedef struct VkPhysicalDeviceMemoryProperties232
+{
+    VkStructureType sType;
+    void *pNext;
+    VkPhysicalDeviceMemoryProperties32 DECLSPEC_ALIGN(8) memoryProperties;
+} VkPhysicalDeviceMemoryProperties232;
+typedef VkPhysicalDeviceMemoryProperties232 VkPhysicalDeviceMemoryProperties2KHR32;
+
+typedef struct VkPhysicalDeviceLimits32
+{
+    uint32_t maxImageDimension1D;
+    uint32_t maxImageDimension2D;
+    uint32_t maxImageDimension3D;
+    uint32_t maxImageDimensionCube;
+    uint32_t maxImageArrayLayers;
+    uint32_t maxTexelBufferElements;
+    uint32_t maxUniformBufferRange;
+    uint32_t maxStorageBufferRange;
+    uint32_t maxPushConstantsSize;
+    uint32_t maxMemoryAllocationCount;
+    uint32_t maxSamplerAllocationCount;
+    VkDeviceSize DECLSPEC_ALIGN(8) bufferImageGranularity;
+    VkDeviceSize DECLSPEC_ALIGN(8) sparseAddressSpaceSize;
+    uint32_t maxBoundDescriptorSets;
+    uint32_t maxPerStageDescriptorSamplers;
+    uint32_t maxPerStageDescriptorUniformBuffers;
+    uint32_t maxPerStageDescriptorStorageBuffers;
+    uint32_t maxPerStageDescriptorSampledImages;
+    uint32_t maxPerStageDescriptorStorageImages;
+    uint32_t maxPerStageDescriptorInputAttachments;
+    uint32_t maxPerStageResources;
+    uint32_t maxDescriptorSetSamplers;
+    uint32_t maxDescriptorSetUniformBuffers;
+    uint32_t maxDescriptorSetUniformBuffersDynamic;
+    uint32_t maxDescriptorSetStorageBuffers;
+    uint32_t maxDescriptorSetStorageBuffersDynamic;
+    uint32_t maxDescriptorSetSampledImages;
+    uint32_t maxDescriptorSetStorageImages;
+    uint32_t maxDescriptorSetInputAttachments;
+    uint32_t maxVertexInputAttributes;
+    uint32_t maxVertexInputBindings;
+    uint32_t maxVertexInputAttributeOffset;
+    uint32_t maxVertexInputBindingStride;
+    uint32_t maxVertexOutputComponents;
+    uint32_t maxTessellationGenerationLevel;
+    uint32_t maxTessellationPatchSize;
+    uint32_t maxTessellationControlPerVertexInputComponents;
+    uint32_t maxTessellationControlPerVertexOutputComponents;
+    uint32_t maxTessellationControlPerPatchOutputComponents;
+    uint32_t maxTessellationControlTotalOutputComponents;
+    uint32_t maxTessellationEvaluationInputComponents;
+    uint32_t maxTessellationEvaluationOutputComponents;
+    uint32_t maxGeometryShaderInvocations;
+    uint32_t maxGeometryInputComponents;
+    uint32_t maxGeometryOutputComponents;
+    uint32_t maxGeometryOutputVertices;
+    uint32_t maxGeometryTotalOutputComponents;
+    uint32_t maxFragmentInputComponents;
+    uint32_t maxFragmentOutputAttachments;
+    uint32_t maxFragmentDualSrcAttachments;
+    uint32_t maxFragmentCombinedOutputResources;
+    uint32_t maxComputeSharedMemorySize;
+    uint32_t maxComputeWorkGroupCount[3];
+    uint32_t maxComputeWorkGroupInvocations;
+    uint32_t maxComputeWorkGroupSize[3];
+    uint32_t subPixelPrecisionBits;
+    uint32_t subTexelPrecisionBits;
+    uint32_t mipmapPrecisionBits;
+    uint32_t maxDrawIndexedIndexValue;
+    uint32_t maxDrawIndirectCount;
+    float maxSamplerLodBias;
+    float maxSamplerAnisotropy;
+    uint32_t maxViewports;
+    uint32_t maxViewportDimensions[2];
+    float viewportBoundsRange[2];
+    uint32_t viewportSubPixelBits;
+    size_t minMemoryMapAlignment;
+    VkDeviceSize DECLSPEC_ALIGN(8) minTexelBufferOffsetAlignment;
+    VkDeviceSize DECLSPEC_ALIGN(8) minUniformBufferOffsetAlignment;
+    VkDeviceSize DECLSPEC_ALIGN(8) minStorageBufferOffsetAlignment;
+    int32_t minTexelOffset;
+    uint32_t maxTexelOffset;
+    int32_t minTexelGatherOffset;
+    uint32_t maxTexelGatherOffset;
+    float minInterpolationOffset;
+    float maxInterpolationOffset;
+    uint32_t subPixelInterpolationOffsetBits;
+    uint32_t maxFramebufferWidth;
+    uint32_t maxFramebufferHeight;
+    uint32_t maxFramebufferLayers;
+    VkSampleCountFlags framebufferColorSampleCounts;
+    VkSampleCountFlags framebufferDepthSampleCounts;
+    VkSampleCountFlags framebufferStencilSampleCounts;
+    VkSampleCountFlags framebufferNoAttachmentsSampleCounts;
+    uint32_t maxColorAttachments;
+    VkSampleCountFlags sampledImageColorSampleCounts;
+    VkSampleCountFlags sampledImageIntegerSampleCounts;
+    VkSampleCountFlags sampledImageDepthSampleCounts;
+    VkSampleCountFlags sampledImageStencilSampleCounts;
+    VkSampleCountFlags storageImageSampleCounts;
+    uint32_t maxSampleMaskWords;
+    VkBool32 timestampComputeAndGraphics;
+    float timestampPeriod;
+    uint32_t maxClipDistances;
+    uint32_t maxCullDistances;
+    uint32_t maxCombinedClipAndCullDistances;
+    uint32_t discreteQueuePriorities;
+    float pointSizeRange[2];
+    float lineWidthRange[2];
+    float pointSizeGranularity;
+    float lineWidthGranularity;
+    VkBool32 strictLines;
+    VkBool32 standardSampleLocations;
+    VkDeviceSize DECLSPEC_ALIGN(8) optimalBufferCopyOffsetAlignment;
+    VkDeviceSize DECLSPEC_ALIGN(8) optimalBufferCopyRowPitchAlignment;
+    VkDeviceSize DECLSPEC_ALIGN(8) nonCoherentAtomSize;
+} VkPhysicalDeviceLimits32;
+
+typedef struct VkPhysicalDeviceProperties32
+{
+    uint32_t apiVersion;
+    uint32_t driverVersion;
+    uint32_t vendorID;
+    uint32_t deviceID;
+    VkPhysicalDeviceType deviceType;
+    char deviceName[VK_MAX_PHYSICAL_DEVICE_NAME_SIZE];
+    uint8_t pipelineCacheUUID[VK_UUID_SIZE];
+    VkPhysicalDeviceLimits32 DECLSPEC_ALIGN(8) limits;
+    VkPhysicalDeviceSparseProperties sparseProperties;
+} VkPhysicalDeviceProperties32;
+
+typedef struct VkPhysicalDeviceMaintenance3Properties32
+{
+    VkStructureType sType;
+    void *pNext;
+    uint32_t maxPerSetDescriptors;
+    VkDeviceSize DECLSPEC_ALIGN(8) maxMemoryAllocationSize;
+} VkPhysicalDeviceMaintenance3Properties32;
+typedef VkPhysicalDeviceMaintenance3Properties32 VkPhysicalDeviceMaintenance3PropertiesKHR32;
+
+typedef struct VkPhysicalDeviceMaintenance4Properties32
+{
+    VkStructureType sType;
+    void *pNext;
+    VkDeviceSize DECLSPEC_ALIGN(8) maxBufferSize;
+} VkPhysicalDeviceMaintenance4Properties32;
+typedef VkPhysicalDeviceMaintenance4Properties32 VkPhysicalDeviceMaintenance4PropertiesKHR32;
+
+typedef struct VkPhysicalDeviceExternalMemoryHostPropertiesEXT32
+{
+    VkStructureType sType;
+    void *pNext;
+    VkDeviceSize DECLSPEC_ALIGN(8) minImportedHostPointerAlignment;
+} VkPhysicalDeviceExternalMemoryHostPropertiesEXT32;
+
+typedef struct VkPhysicalDeviceTimelineSemaphoreProperties32
+{
+    VkStructureType sType;
+    void *pNext;
+    uint64_t DECLSPEC_ALIGN(8) maxTimelineSemaphoreValueDifference;
+} VkPhysicalDeviceTimelineSemaphoreProperties32;
+typedef VkPhysicalDeviceTimelineSemaphoreProperties32 VkPhysicalDeviceTimelineSemaphorePropertiesKHR32;
+
+typedef struct VkPhysicalDeviceTransformFeedbackPropertiesEXT32
+{
+    VkStructureType sType;
+    void *pNext;
+    uint32_t maxTransformFeedbackStreams;
+    uint32_t maxTransformFeedbackBuffers;
+    VkDeviceSize DECLSPEC_ALIGN(8) maxTransformFeedbackBufferSize;
+    uint32_t maxTransformFeedbackStreamDataSize;
+    uint32_t maxTransformFeedbackBufferDataSize;
+    uint32_t maxTransformFeedbackBufferDataStride;
+    VkBool32 transformFeedbackQueries;
+    VkBool32 transformFeedbackStreamsLinesTriangles;
+    VkBool32 transformFeedbackRasterizationStreamSelect;
+    VkBool32 transformFeedbackDraw;
+} VkPhysicalDeviceTransformFeedbackPropertiesEXT32;
+
+typedef struct VkPhysicalDeviceMemoryDecompressionPropertiesNV32
+{
+    VkStructureType sType;
+    void *pNext;
+    VkMemoryDecompressionMethodFlagsNV decompressionMethods;
+    uint64_t DECLSPEC_ALIGN(8) maxDecompressionIndirectCount;
+} VkPhysicalDeviceMemoryDecompressionPropertiesNV32;
+
+typedef struct VkPhysicalDeviceAccelerationStructurePropertiesKHR32
+{
+    VkStructureType sType;
+    void *pNext;
+    uint64_t DECLSPEC_ALIGN(8) maxGeometryCount;
+    uint64_t DECLSPEC_ALIGN(8) maxInstanceCount;
+    uint64_t DECLSPEC_ALIGN(8) maxPrimitiveCount;
+    uint32_t maxPerStageDescriptorAccelerationStructures;
+    uint32_t maxPerStageDescriptorUpdateAfterBindAccelerationStructures;
+    uint32_t maxDescriptorSetAccelerationStructures;
+    uint32_t maxDescriptorSetUpdateAfterBindAccelerationStructures;
+    uint32_t minAccelerationStructureScratchOffsetAlignment;
+} VkPhysicalDeviceAccelerationStructurePropertiesKHR32;
+
+typedef struct VkPhysicalDeviceRayTracingPropertiesNV32
+{
+    VkStructureType sType;
+    void *pNext;
+    uint32_t shaderGroupHandleSize;
+    uint32_t maxRecursionDepth;
+    uint32_t maxShaderGroupStride;
+    uint32_t shaderGroupBaseAlignment;
+    uint64_t DECLSPEC_ALIGN(8) maxGeometryCount;
+    uint64_t DECLSPEC_ALIGN(8) maxInstanceCount;
+    uint64_t DECLSPEC_ALIGN(8) maxTriangleCount;
+    uint32_t maxDescriptorSetAccelerationStructures;
+} VkPhysicalDeviceRayTracingPropertiesNV32;
+
+typedef struct VkPhysicalDeviceTexelBufferAlignmentProperties32
+{
+    VkStructureType sType;
+    void *pNext;
+    VkDeviceSize DECLSPEC_ALIGN(8) storageTexelBufferOffsetAlignmentBytes;
+    VkBool32 storageTexelBufferOffsetSingleTexelAlignment;
+    VkDeviceSize DECLSPEC_ALIGN(8) uniformTexelBufferOffsetAlignmentBytes;
+    VkBool32 uniformTexelBufferOffsetSingleTexelAlignment;
+} VkPhysicalDeviceTexelBufferAlignmentProperties32;
+typedef VkPhysicalDeviceTexelBufferAlignmentProperties32 VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT32;
+
+typedef struct VkPhysicalDeviceVulkan11Properties32
+{
+    VkStructureType sType;
+    void *pNext;
+    uint8_t deviceUUID[VK_UUID_SIZE];
+    uint8_t driverUUID[VK_UUID_SIZE];
+    uint8_t deviceLUID[VK_LUID_SIZE];
+    uint32_t deviceNodeMask;
+    VkBool32 deviceLUIDValid;
+    uint32_t subgroupSize;
+    VkShaderStageFlags subgroupSupportedStages;
+    VkSubgroupFeatureFlags subgroupSupportedOperations;
+    VkBool32 subgroupQuadOperationsInAllStages;
+    VkPointClippingBehavior pointClippingBehavior;
+    uint32_t maxMultiviewViewCount;
+    uint32_t maxMultiviewInstanceIndex;
+    VkBool32 protectedNoFault;
+    uint32_t maxPerSetDescriptors;
+    VkDeviceSize DECLSPEC_ALIGN(8) maxMemoryAllocationSize;
+} VkPhysicalDeviceVulkan11Properties32;
+
+typedef struct VkPhysicalDeviceVulkan12Properties32
+{
+    VkStructureType sType;
+    void *pNext;
+    VkDriverId driverID;
+    char driverName[VK_MAX_DRIVER_NAME_SIZE];
+    char driverInfo[VK_MAX_DRIVER_INFO_SIZE];
+    VkConformanceVersion conformanceVersion;
+    VkShaderFloatControlsIndependence denormBehaviorIndependence;
+    VkShaderFloatControlsIndependence roundingModeIndependence;
+    VkBool32 shaderSignedZeroInfNanPreserveFloat16;
+    VkBool32 shaderSignedZeroInfNanPreserveFloat32;
+    VkBool32 shaderSignedZeroInfNanPreserveFloat64;
+    VkBool32 shaderDenormPreserveFloat16;
+    VkBool32 shaderDenormPreserveFloat32;
+    VkBool32 shaderDenormPreserveFloat64;
+    VkBool32 shaderDenormFlushToZeroFloat16;
+    VkBool32 shaderDenormFlushToZeroFloat32;
+    VkBool32 shaderDenormFlushToZeroFloat64;
+    VkBool32 shaderRoundingModeRTEFloat16;
+    VkBool32 shaderRoundingModeRTEFloat32;
+    VkBool32 shaderRoundingModeRTEFloat64;
+    VkBool32 shaderRoundingModeRTZFloat16;
+    VkBool32 shaderRoundingModeRTZFloat32;
+    VkBool32 shaderRoundingModeRTZFloat64;
+    uint32_t maxUpdateAfterBindDescriptorsInAllPools;
+    VkBool32 shaderUniformBufferArrayNonUniformIndexingNative;
+    VkBool32 shaderSampledImageArrayNonUniformIndexingNative;
+    VkBool32 shaderStorageBufferArrayNonUniformIndexingNative;
+    VkBool32 shaderStorageImageArrayNonUniformIndexingNative;
+    VkBool32 shaderInputAttachmentArrayNonUniformIndexingNative;
+    VkBool32 robustBufferAccessUpdateAfterBind;
+    VkBool32 quadDivergentImplicitLod;
+    uint32_t maxPerStageDescriptorUpdateAfterBindSamplers;
+    uint32_t maxPerStageDescriptorUpdateAfterBindUniformBuffers;
+    uint32_t maxPerStageDescriptorUpdateAfterBindStorageBuffers;
+    uint32_t maxPerStageDescriptorUpdateAfterBindSampledImages;
+    uint32_t maxPerStageDescriptorUpdateAfterBindStorageImages;
+    uint32_t maxPerStageDescriptorUpdateAfterBindInputAttachments;
+    uint32_t maxPerStageUpdateAfterBindResources;
+    uint32_t maxDescriptorSetUpdateAfterBindSamplers;
+    uint32_t maxDescriptorSetUpdateAfterBindUniformBuffers;
+    uint32_t maxDescriptorSetUpdateAfterBindUniformBuffersDynamic;
+    uint32_t maxDescriptorSetUpdateAfterBindStorageBuffers;
+    uint32_t maxDescriptorSetUpdateAfterBindStorageBuffersDynamic;
+    uint32_t maxDescriptorSetUpdateAfterBindSampledImages;
+    uint32_t maxDescriptorSetUpdateAfterBindStorageImages;
+    uint32_t maxDescriptorSetUpdateAfterBindInputAttachments;
+    VkResolveModeFlags supportedDepthResolveModes;
+    VkResolveModeFlags supportedStencilResolveModes;
+    VkBool32 independentResolveNone;
+    VkBool32 independentResolve;
+    VkBool32 filterMinmaxSingleComponentFormats;
+    VkBool32 filterMinmaxImageComponentMapping;
+    uint64_t DECLSPEC_ALIGN(8) maxTimelineSemaphoreValueDifference;
+    VkSampleCountFlags framebufferIntegerColorSampleCounts;
+} VkPhysicalDeviceVulkan12Properties32;
+
+typedef struct VkPhysicalDeviceVulkan13Properties32
+{
+    VkStructureType sType;
+    void *pNext;
+    uint32_t minSubgroupSize;
+    uint32_t maxSubgroupSize;
+    uint32_t maxComputeWorkgroupSubgroups;
+    VkShaderStageFlags requiredSubgroupSizeStages;
+    uint32_t maxInlineUniformBlockSize;
+    uint32_t maxPerStageDescriptorInlineUniformBlocks;
+    uint32_t maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks;
+    uint32_t maxDescriptorSetInlineUniformBlocks;
+    uint32_t maxDescriptorSetUpdateAfterBindInlineUniformBlocks;
+    uint32_t maxInlineUniformTotalSize;
+    VkBool32 integerDotProduct8BitUnsignedAccelerated;
+    VkBool32 integerDotProduct8BitSignedAccelerated;
+    VkBool32 integerDotProduct8BitMixedSignednessAccelerated;
+    VkBool32 integerDotProduct4x8BitPackedUnsignedAccelerated;
+    VkBool32 integerDotProduct4x8BitPackedSignedAccelerated;
+    VkBool32 integerDotProduct4x8BitPackedMixedSignednessAccelerated;
+    VkBool32 integerDotProduct16BitUnsignedAccelerated;
+    VkBool32 integerDotProduct16BitSignedAccelerated;
+    VkBool32 integerDotProduct16BitMixedSignednessAccelerated;
+    VkBool32 integerDotProduct32BitUnsignedAccelerated;
+    VkBool32 integerDotProduct32BitSignedAccelerated;
+    VkBool32 integerDotProduct32BitMixedSignednessAccelerated;
+    VkBool32 integerDotProduct64BitUnsignedAccelerated;
+    VkBool32 integerDotProduct64BitSignedAccelerated;
+    VkBool32 integerDotProduct64BitMixedSignednessAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating8BitUnsignedAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating8BitSignedAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating16BitUnsignedAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating16BitSignedAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating32BitUnsignedAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating32BitSignedAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating64BitUnsignedAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating64BitSignedAccelerated;
+    VkBool32 integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated;
+    VkDeviceSize DECLSPEC_ALIGN(8) storageTexelBufferOffsetAlignmentBytes;
+    VkBool32 storageTexelBufferOffsetSingleTexelAlignment;
+    VkDeviceSize DECLSPEC_ALIGN(8) uniformTexelBufferOffsetAlignmentBytes;
+    VkBool32 uniformTexelBufferOffsetSingleTexelAlignment;
+    VkDeviceSize DECLSPEC_ALIGN(8) maxBufferSize;
+} VkPhysicalDeviceVulkan13Properties32;
+
+typedef struct VkPhysicalDeviceRobustness2PropertiesEXT32
+{
+    VkStructureType sType;
+    void *pNext;
+    VkDeviceSize DECLSPEC_ALIGN(8) robustStorageBufferAccessSizeAlignment;
+    VkDeviceSize DECLSPEC_ALIGN(8) robustUniformBufferAccessSizeAlignment;
+} VkPhysicalDeviceRobustness2PropertiesEXT32;
+
+typedef struct VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM32
+{
+    VkStructureType sType;
+    void *pNext;
+    uint64_t DECLSPEC_ALIGN(8) shaderCoreMask;
+    uint32_t shaderCoreCount;
+    uint32_t shaderWarpsPerCore;
+} VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM32;
+
+typedef struct VkPhysicalDeviceProperties232
+{
+    VkStructureType sType;
+    void *pNext;
+    VkPhysicalDeviceProperties32 DECLSPEC_ALIGN(8) properties;
+} VkPhysicalDeviceProperties232;
+typedef VkPhysicalDeviceProperties232 VkPhysicalDeviceProperties2KHR32;
+
+typedef struct VkPhysicalDeviceSurfaceInfo2KHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkSurfaceKHR DECLSPEC_ALIGN(8) surface;
+} VkPhysicalDeviceSurfaceInfo2KHR32;
+
+typedef struct VkPipelineExecutableInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPipeline DECLSPEC_ALIGN(8) pipeline;
+    uint32_t executableIndex;
+} VkPipelineExecutableInfoKHR32;
+
+typedef struct VkPipelineInfoKHR32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkPipeline DECLSPEC_ALIGN(8) pipeline;
+} VkPipelineInfoKHR32;
+typedef VkPipelineInfoKHR32 VkPipelineInfoEXT32;
+
+typedef struct VkPipelineExecutableStatisticKHR32
+{
+    VkStructureType sType;
+    void *pNext;
+    char name[VK_MAX_DESCRIPTION_SIZE];
+    char description[VK_MAX_DESCRIPTION_SIZE];
+    VkPipelineExecutableStatisticFormatKHR format;
+    VkPipelineExecutableStatisticValueKHR DECLSPEC_ALIGN(8) value;
+} VkPipelineExecutableStatisticKHR32;
+
+
+typedef struct VkSparseMemoryBind32
+{
+    VkDeviceSize DECLSPEC_ALIGN(8) resourceOffset;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+    VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+    VkDeviceSize DECLSPEC_ALIGN(8) memoryOffset;
+    VkSparseMemoryBindFlags flags;
+} VkSparseMemoryBind32;
+
+typedef struct VkSparseBufferMemoryBindInfo32
+{
+    VkBuffer DECLSPEC_ALIGN(8) buffer;
+    uint32_t bindCount;
+    const VkSparseMemoryBind32 *pBinds;
+} VkSparseBufferMemoryBindInfo32;
+
+typedef struct VkSparseImageOpaqueMemoryBindInfo32
+{
+    VkImage DECLSPEC_ALIGN(8) image;
+    uint32_t bindCount;
+    const VkSparseMemoryBind32 *pBinds;
+} VkSparseImageOpaqueMemoryBindInfo32;
+
+typedef struct VkSparseImageMemoryBind32
+{
+    VkImageSubresource subresource;
+    VkOffset3D offset;
+    VkExtent3D extent;
+    VkDeviceMemory DECLSPEC_ALIGN(8) memory;
+    VkDeviceSize DECLSPEC_ALIGN(8) memoryOffset;
+    VkSparseMemoryBindFlags flags;
+} VkSparseImageMemoryBind32;
+
+typedef struct VkSparseImageMemoryBindInfo32
+{
+    VkImage DECLSPEC_ALIGN(8) image;
+    uint32_t bindCount;
+    const VkSparseImageMemoryBind32 *pBinds;
+} VkSparseImageMemoryBindInfo32;
+
+typedef struct VkBindSparseInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    uint32_t waitSemaphoreCount;
+    const VkSemaphore *pWaitSemaphores;
+    uint32_t bufferBindCount;
+    const VkSparseBufferMemoryBindInfo32 *pBufferBinds;
+    uint32_t imageOpaqueBindCount;
+    const VkSparseImageOpaqueMemoryBindInfo32 *pImageOpaqueBinds;
+    uint32_t imageBindCount;
+    const VkSparseImageMemoryBindInfo32 *pImageBinds;
+    uint32_t signalSemaphoreCount;
+    const VkSemaphore *pSignalSemaphores;
+} VkBindSparseInfo32;
+
+typedef struct VkSemaphoreSubmitInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkSemaphore DECLSPEC_ALIGN(8) semaphore;
+    uint64_t DECLSPEC_ALIGN(8) value;
+    VkPipelineStageFlags2 stageMask;
+    uint32_t deviceIndex;
+} VkSemaphoreSubmitInfo32;
+typedef VkSemaphoreSubmitInfo32 VkSemaphoreSubmitInfoKHR32;
+
+typedef struct VkSubmitInfo232
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkSubmitFlags flags;
+    uint32_t waitSemaphoreInfoCount;
+    const VkSemaphoreSubmitInfo32 *pWaitSemaphoreInfos;
+    uint32_t commandBufferInfoCount;
+    const VkCommandBufferSubmitInfo *pCommandBufferInfos;
+    uint32_t signalSemaphoreInfoCount;
+    const VkSemaphoreSubmitInfo32 *pSignalSemaphoreInfos;
+} VkSubmitInfo232;
+typedef VkSubmitInfo232 VkSubmitInfo2KHR32;
+
+typedef struct VkDebugUtilsObjectTagInfoEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkObjectType objectType;
+    uint64_t DECLSPEC_ALIGN(8) objectHandle;
+    uint64_t DECLSPEC_ALIGN(8) tagName;
+    size_t tagSize;
+    const void *pTag;
+} VkDebugUtilsObjectTagInfoEXT32;
+
+typedef struct VkSemaphoreSignalInfo32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkSemaphore DECLSPEC_ALIGN(8) semaphore;
+    uint64_t DECLSPEC_ALIGN(8) value;
+} VkSemaphoreSignalInfo32;
+typedef VkSemaphoreSignalInfo32 VkSemaphoreSignalInfoKHR32;
+
+typedef struct VkDeviceAddressBindingCallbackDataEXT32
+{
+    VkStructureType sType;
+    void *pNext;
+    VkDeviceAddressBindingFlagsEXT flags;
+    VkDeviceAddress DECLSPEC_ALIGN(8) baseAddress;
+    VkDeviceSize DECLSPEC_ALIGN(8) size;
+    VkDeviceAddressBindingTypeEXT bindingType;
+} VkDeviceAddressBindingCallbackDataEXT32;
+
+typedef struct VkDebugUtilsMessengerCallbackDataEXT32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDebugUtilsMessengerCallbackDataFlagsEXT flags;
+    const char *pMessageIdName;
+    int32_t messageIdNumber;
+    const char *pMessage;
+    uint32_t queueLabelCount;
+    const VkDebugUtilsLabelEXT *pQueueLabels;
+    uint32_t cmdBufLabelCount;
+    const VkDebugUtilsLabelEXT *pCmdBufLabels;
+    uint32_t objectCount;
+    const VkDebugUtilsObjectNameInfoEXT32 *pObjects;
+} VkDebugUtilsMessengerCallbackDataEXT32;
+
+typedef struct VkCopyDescriptorSet32
+{
+    VkStructureType sType;
+    const void *pNext;
+    VkDescriptorSet DECLSPEC_ALIGN(8) srcSet;
+    uint32_t srcBinding;
+    uint32_t srcArrayElement;
+    VkDescriptorSet DECLSPEC_ALIGN(8) dstSet;
+    uint32_t dstBinding;
+    uint32_t dstArrayElement;
+    uint32_t descriptorCount;
+} VkCopyDescriptorSet32;
+
+#endif /* USE_STRUCT_CONVERSION */
+
 static uint64_t wine_vk_unwrap_handle(uint32_t type, uint64_t handle)
 {
     switch(type)
@@ -49,7 +1851,7 @@ static uint64_t wine_vk_unwrap_handle(uint32_t type, uint64_t handle)
 }

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAcquireNextImageInfoKHR_win32_to_host(const VkAcquireNextImageInfoKHR *in, VkAcquireNextImageInfoKHR_host *out)
+static inline void convert_VkAcquireNextImageInfoKHR_win32_to_host(const VkAcquireNextImageInfoKHR32 *in, VkAcquireNextImageInfoKHR_host *out)
 {
     if (!in) return;

@@ -64,7 +1866,7 @@ static inline void convert_VkAcquireNextImageInfoKHR_win32_to_host(const VkAcqui
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAcquireProfilingLockInfoKHR_win32_to_host(const VkAcquireProfilingLockInfoKHR *in, VkAcquireProfilingLockInfoKHR_host *out)
+static inline void convert_VkAcquireProfilingLockInfoKHR_win32_to_host(const VkAcquireProfilingLockInfoKHR32 *in, VkAcquireProfilingLockInfoKHR_host *out)
 {
     if (!in) return;

@@ -76,7 +1878,7 @@ static inline void convert_VkAcquireProfilingLockInfoKHR_win32_to_host(const VkA
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCommandBufferAllocateInfo_win32_to_unwrapped_host(const VkCommandBufferAllocateInfo *in, VkCommandBufferAllocateInfo_host *out)
+static inline void convert_VkCommandBufferAllocateInfo_win32_to_unwrapped_host(const VkCommandBufferAllocateInfo32 *in, VkCommandBufferAllocateInfo_host *out)
 {
     if (!in) return;

@@ -89,7 +1891,7 @@ static inline void convert_VkCommandBufferAllocateInfo_win32_to_unwrapped_host(c
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDescriptorSetAllocateInfo_win32_to_host(const VkDescriptorSetAllocateInfo *in, VkDescriptorSetAllocateInfo_host *out)
+static inline void convert_VkDescriptorSetAllocateInfo_win32_to_host(const VkDescriptorSetAllocateInfo32 *in, VkDescriptorSetAllocateInfo_host *out)
 {
     if (!in) return;

@@ -102,7 +1904,7 @@ static inline void convert_VkDescriptorSetAllocateInfo_win32_to_host(const VkDes
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryAllocateInfo_win32_to_host(struct conversion_context *ctx, const VkMemoryAllocateInfo *in, VkMemoryAllocateInfo_host *out)
+static inline void convert_VkMemoryAllocateInfo_win32_to_host(struct conversion_context *ctx, const VkMemoryAllocateInfo32 *in, VkMemoryAllocateInfo_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -121,7 +1923,7 @@ static inline void convert_VkMemoryAllocateInfo_win32_to_host(struct conversion_
         case VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV:
         {
             VkDedicatedAllocationMemoryAllocateInfoNV_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkDedicatedAllocationMemoryAllocateInfoNV *in_ext = (const VkDedicatedAllocationMemoryAllocateInfoNV *)in_header;
+            const VkDedicatedAllocationMemoryAllocateInfoNV32 *in_ext = (const VkDedicatedAllocationMemoryAllocateInfoNV32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV;
             out_ext->pNext = NULL;
             out_ext->image = in_ext->image;
@@ -182,7 +1984,7 @@ static inline void convert_VkMemoryAllocateInfo_win32_to_host(struct conversion_
         case VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO:
         {
             VkMemoryDedicatedAllocateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkMemoryDedicatedAllocateInfo *in_ext = (const VkMemoryDedicatedAllocateInfo *)in_header;
+            const VkMemoryDedicatedAllocateInfo32 *in_ext = (const VkMemoryDedicatedAllocateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO;
             out_ext->pNext = NULL;
             out_ext->image = in_ext->image;
@@ -217,7 +2019,7 @@ static inline void convert_VkMemoryAllocateInfo_win32_to_host(struct conversion_
         case VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO:
         {
             VkMemoryOpaqueCaptureAddressAllocateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkMemoryOpaqueCaptureAddressAllocateInfo *in_ext = (const VkMemoryOpaqueCaptureAddressAllocateInfo *)in_header;
+            const VkMemoryOpaqueCaptureAddressAllocateInfo32 *in_ext = (const VkMemoryOpaqueCaptureAddressAllocateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO;
             out_ext->pNext = NULL;
             out_ext->opaqueCaptureAddress = in_ext->opaqueCaptureAddress;
@@ -234,7 +2036,7 @@ static inline void convert_VkMemoryAllocateInfo_win32_to_host(struct conversion_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCommandBufferInheritanceInfo_win32_to_host(const VkCommandBufferInheritanceInfo *in, VkCommandBufferInheritanceInfo_host *out)
+static inline void convert_VkCommandBufferInheritanceInfo_win32_to_host(const VkCommandBufferInheritanceInfo32 *in, VkCommandBufferInheritanceInfo_host *out)
 {
     if (!in) return;

@@ -250,7 +2052,7 @@ static inline void convert_VkCommandBufferInheritanceInfo_win32_to_host(const Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkCommandBufferInheritanceInfo_host *convert_VkCommandBufferInheritanceInfo_array_win32_to_host(struct conversion_context *ctx, const VkCommandBufferInheritanceInfo *in, uint32_t count)
+static inline const VkCommandBufferInheritanceInfo_host *convert_VkCommandBufferInheritanceInfo_array_win32_to_host(struct conversion_context *ctx, const VkCommandBufferInheritanceInfo32 *in, uint32_t count)
 {
     VkCommandBufferInheritanceInfo_host *out;
     unsigned int i;
@@ -268,7 +2070,7 @@ static inline const VkCommandBufferInheritanceInfo_host *convert_VkCommandBuffer
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCommandBufferBeginInfo_win32_to_host(struct conversion_context *ctx, const VkCommandBufferBeginInfo *in, VkCommandBufferBeginInfo_host *out)
+static inline void convert_VkCommandBufferBeginInfo_win32_to_host(struct conversion_context *ctx, const VkCommandBufferBeginInfo32 *in, VkCommandBufferBeginInfo_host *out)
 {
     if (!in) return;

@@ -280,7 +2082,7 @@ static inline void convert_VkCommandBufferBeginInfo_win32_to_host(struct convers
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBindAccelerationStructureMemoryInfoNV_win32_to_host(const VkBindAccelerationStructureMemoryInfoNV *in, VkBindAccelerationStructureMemoryInfoNV_host *out)
+static inline void convert_VkBindAccelerationStructureMemoryInfoNV_win32_to_host(const VkBindAccelerationStructureMemoryInfoNV32 *in, VkBindAccelerationStructureMemoryInfoNV_host *out)
 {
     if (!in) return;

@@ -295,7 +2097,7 @@ static inline void convert_VkBindAccelerationStructureMemoryInfoNV_win32_to_host
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBindAccelerationStructureMemoryInfoNV_host *convert_VkBindAccelerationStructureMemoryInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkBindAccelerationStructureMemoryInfoNV *in, uint32_t count)
+static inline const VkBindAccelerationStructureMemoryInfoNV_host *convert_VkBindAccelerationStructureMemoryInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkBindAccelerationStructureMemoryInfoNV32 *in, uint32_t count)
 {
     VkBindAccelerationStructureMemoryInfoNV_host *out;
     unsigned int i;
@@ -313,7 +2115,7 @@ static inline const VkBindAccelerationStructureMemoryInfoNV_host *convert_VkBind
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBindBufferMemoryInfo_win32_to_host(const VkBindBufferMemoryInfo *in, VkBindBufferMemoryInfo_host *out)
+static inline void convert_VkBindBufferMemoryInfo_win32_to_host(const VkBindBufferMemoryInfo32 *in, VkBindBufferMemoryInfo_host *out)
 {
     if (!in) return;

@@ -326,7 +2128,7 @@ static inline void convert_VkBindBufferMemoryInfo_win32_to_host(const VkBindBuff
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBindBufferMemoryInfo_host *convert_VkBindBufferMemoryInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindBufferMemoryInfo *in, uint32_t count)
+static inline const VkBindBufferMemoryInfo_host *convert_VkBindBufferMemoryInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindBufferMemoryInfo32 *in, uint32_t count)
 {
     VkBindBufferMemoryInfo_host *out;
     unsigned int i;
@@ -344,7 +2146,7 @@ static inline const VkBindBufferMemoryInfo_host *convert_VkBindBufferMemoryInfo_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBindImageMemoryInfo_win32_to_host(struct conversion_context *ctx, const VkBindImageMemoryInfo *in, VkBindImageMemoryInfo_host *out)
+static inline void convert_VkBindImageMemoryInfo_win32_to_host(struct conversion_context *ctx, const VkBindImageMemoryInfo32 *in, VkBindImageMemoryInfo_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -378,7 +2180,7 @@ static inline void convert_VkBindImageMemoryInfo_win32_to_host(struct conversion
         case VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR:
         {
             VkBindImageMemorySwapchainInfoKHR_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkBindImageMemorySwapchainInfoKHR *in_ext = (const VkBindImageMemorySwapchainInfoKHR *)in_header;
+            const VkBindImageMemorySwapchainInfoKHR32 *in_ext = (const VkBindImageMemorySwapchainInfoKHR32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR;
             out_ext->pNext = NULL;
             out_ext->swapchain = in_ext->swapchain;
@@ -407,7 +2209,7 @@ static inline void convert_VkBindImageMemoryInfo_win32_to_host(struct conversion
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBindImageMemoryInfo_host *convert_VkBindImageMemoryInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindImageMemoryInfo *in, uint32_t count)
+static inline const VkBindImageMemoryInfo_host *convert_VkBindImageMemoryInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindImageMemoryInfo32 *in, uint32_t count)
 {
     VkBindImageMemoryInfo_host *out;
     unsigned int i;
@@ -425,7 +2227,7 @@ static inline const VkBindImageMemoryInfo_host *convert_VkBindImageMemoryInfo_ar
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureGeometryKHR_win32_to_host(const VkAccelerationStructureGeometryKHR *in, VkAccelerationStructureGeometryKHR_host *out)
+static inline void convert_VkAccelerationStructureGeometryKHR_win32_to_host(const VkAccelerationStructureGeometryKHR32 *in, VkAccelerationStructureGeometryKHR_host *out)
 {
     if (!in) return;

@@ -438,7 +2240,7 @@ static inline void convert_VkAccelerationStructureGeometryKHR_win32_to_host(cons
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkAccelerationStructureGeometryKHR_host *convert_VkAccelerationStructureGeometryKHR_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureGeometryKHR *in, uint32_t count)
+static inline const VkAccelerationStructureGeometryKHR_host *convert_VkAccelerationStructureGeometryKHR_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureGeometryKHR32 *in, uint32_t count)
 {
     VkAccelerationStructureGeometryKHR_host *out;
     unsigned int i;
@@ -456,7 +2258,7 @@ static inline const VkAccelerationStructureGeometryKHR_host *convert_VkAccelerat
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkAccelerationStructureGeometryKHR_host * const*convert_VkAccelerationStructureGeometryKHR_pointer_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureGeometryKHR * const*in, uint32_t count)
+static inline const VkAccelerationStructureGeometryKHR_host * const*convert_VkAccelerationStructureGeometryKHR_pointer_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureGeometryKHR32 * const*in, uint32_t count)
 {
     VkAccelerationStructureGeometryKHR_host **out;
     unsigned int i;
@@ -480,7 +2282,7 @@ static inline const VkAccelerationStructureGeometryKHR_host * const*convert_VkAc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureBuildGeometryInfoKHR *in, VkAccelerationStructureBuildGeometryInfoKHR_host *out)
+static inline void convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureBuildGeometryInfoKHR32 *in, VkAccelerationStructureBuildGeometryInfoKHR_host *out)
 {
     if (!in) return;

@@ -499,7 +2301,7 @@ static inline void convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkAccelerationStructureBuildGeometryInfoKHR_host *convert_VkAccelerationStructureBuildGeometryInfoKHR_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureBuildGeometryInfoKHR *in, uint32_t count)
+static inline const VkAccelerationStructureBuildGeometryInfoKHR_host *convert_VkAccelerationStructureBuildGeometryInfoKHR_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureBuildGeometryInfoKHR32 *in, uint32_t count)
 {
     VkAccelerationStructureBuildGeometryInfoKHR_host *out;
     unsigned int i;
@@ -517,7 +2319,7 @@ static inline const VkAccelerationStructureBuildGeometryInfoKHR_host *convert_Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMicromapBuildInfoEXT_win32_to_host(const VkMicromapBuildInfoEXT *in, VkMicromapBuildInfoEXT_host *out)
+static inline void convert_VkMicromapBuildInfoEXT_win32_to_host(const VkMicromapBuildInfoEXT32 *in, VkMicromapBuildInfoEXT_host *out)
 {
     if (!in) return;

@@ -538,7 +2340,7 @@ static inline void convert_VkMicromapBuildInfoEXT_win32_to_host(const VkMicromap
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkMicromapBuildInfoEXT_host *convert_VkMicromapBuildInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkMicromapBuildInfoEXT *in, uint32_t count)
+static inline const VkMicromapBuildInfoEXT_host *convert_VkMicromapBuildInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkMicromapBuildInfoEXT32 *in, uint32_t count)
 {
     VkMicromapBuildInfoEXT_host *out;
     unsigned int i;
@@ -556,7 +2358,7 @@ static inline const VkMicromapBuildInfoEXT_host *convert_VkMicromapBuildInfoEXT_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkConditionalRenderingBeginInfoEXT_win32_to_host(const VkConditionalRenderingBeginInfoEXT *in, VkConditionalRenderingBeginInfoEXT_host *out)
+static inline void convert_VkConditionalRenderingBeginInfoEXT_win32_to_host(const VkConditionalRenderingBeginInfoEXT32 *in, VkConditionalRenderingBeginInfoEXT_host *out)
 {
     if (!in) return;

@@ -569,7 +2371,7 @@ static inline void convert_VkConditionalRenderingBeginInfoEXT_win32_to_host(cons
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRenderPassBeginInfo_win32_to_host(const VkRenderPassBeginInfo *in, VkRenderPassBeginInfo_host *out)
+static inline void convert_VkRenderPassBeginInfo_win32_to_host(const VkRenderPassBeginInfo32 *in, VkRenderPassBeginInfo_host *out)
 {
     if (!in) return;

@@ -584,7 +2386,7 @@ static inline void convert_VkRenderPassBeginInfo_win32_to_host(const VkRenderPas
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRenderingAttachmentInfo_win32_to_host(const VkRenderingAttachmentInfo *in, VkRenderingAttachmentInfo_host *out)
+static inline void convert_VkRenderingAttachmentInfo_win32_to_host(const VkRenderingAttachmentInfo32 *in, VkRenderingAttachmentInfo_host *out)
 {
     if (!in) return;

@@ -602,7 +2404,7 @@ static inline void convert_VkRenderingAttachmentInfo_win32_to_host(const VkRende
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkRenderingAttachmentInfo_host *convert_VkRenderingAttachmentInfo_array_win32_to_host(struct conversion_context *ctx, const VkRenderingAttachmentInfo *in, uint32_t count)
+static inline const VkRenderingAttachmentInfo_host *convert_VkRenderingAttachmentInfo_array_win32_to_host(struct conversion_context *ctx, const VkRenderingAttachmentInfo32 *in, uint32_t count)
 {
     VkRenderingAttachmentInfo_host *out;
     unsigned int i;
@@ -620,7 +2422,7 @@ static inline const VkRenderingAttachmentInfo_host *convert_VkRenderingAttachmen
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRenderingInfo_win32_to_host(struct conversion_context *ctx, const VkRenderingInfo *in, VkRenderingInfo_host *out)
+static inline void convert_VkRenderingInfo_win32_to_host(struct conversion_context *ctx, const VkRenderingInfo32 *in, VkRenderingInfo_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -670,7 +2472,7 @@ static inline void convert_VkRenderingInfo_win32_to_host(struct conversion_conte
         case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR:
         {
             VkRenderingFragmentShadingRateAttachmentInfoKHR_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkRenderingFragmentShadingRateAttachmentInfoKHR *in_ext = (const VkRenderingFragmentShadingRateAttachmentInfoKHR *)in_header;
+            const VkRenderingFragmentShadingRateAttachmentInfoKHR32 *in_ext = (const VkRenderingFragmentShadingRateAttachmentInfoKHR32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR;
             out_ext->pNext = NULL;
             out_ext->imageView = in_ext->imageView;
@@ -683,7 +2485,7 @@ static inline void convert_VkRenderingInfo_win32_to_host(struct conversion_conte
         case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT:
         {
             VkRenderingFragmentDensityMapAttachmentInfoEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkRenderingFragmentDensityMapAttachmentInfoEXT *in_ext = (const VkRenderingFragmentDensityMapAttachmentInfoEXT *)in_header;
+            const VkRenderingFragmentDensityMapAttachmentInfoEXT32 *in_ext = (const VkRenderingFragmentDensityMapAttachmentInfoEXT32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT;
             out_ext->pNext = NULL;
             out_ext->imageView = in_ext->imageView;
@@ -713,7 +2515,7 @@ static inline void convert_VkRenderingInfo_win32_to_host(struct conversion_conte
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBlitImageInfo2_win32_to_host(const VkBlitImageInfo2 *in, VkBlitImageInfo2_host *out)
+static inline void convert_VkBlitImageInfo2_win32_to_host(const VkBlitImageInfo232 *in, VkBlitImageInfo2_host *out)
 {
     if (!in) return;

@@ -730,7 +2532,7 @@ static inline void convert_VkBlitImageInfo2_win32_to_host(const VkBlitImageInfo2
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGeometryTrianglesNV_win32_to_host(const VkGeometryTrianglesNV *in, VkGeometryTrianglesNV_host *out)
+static inline void convert_VkGeometryTrianglesNV_win32_to_host(const VkGeometryTrianglesNV32 *in, VkGeometryTrianglesNV_host *out)
 {
     if (!in) return;

@@ -751,7 +2553,7 @@ static inline void convert_VkGeometryTrianglesNV_win32_to_host(const VkGeometryT
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGeometryAABBNV_win32_to_host(const VkGeometryAABBNV *in, VkGeometryAABBNV_host *out)
+static inline void convert_VkGeometryAABBNV_win32_to_host(const VkGeometryAABBNV32 *in, VkGeometryAABBNV_host *out)
 {
     if (!in) return;

@@ -765,7 +2567,7 @@ static inline void convert_VkGeometryAABBNV_win32_to_host(const VkGeometryAABBNV
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGeometryDataNV_win32_to_host(const VkGeometryDataNV *in, VkGeometryDataNV_host *out)
+static inline void convert_VkGeometryDataNV_win32_to_host(const VkGeometryDataNV32 *in, VkGeometryDataNV_host *out)
 {
     if (!in) return;

@@ -775,7 +2577,7 @@ static inline void convert_VkGeometryDataNV_win32_to_host(const VkGeometryDataNV
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGeometryNV_win32_to_host(const VkGeometryNV *in, VkGeometryNV_host *out)
+static inline void convert_VkGeometryNV_win32_to_host(const VkGeometryNV32 *in, VkGeometryNV_host *out)
 {
     if (!in) return;

@@ -788,7 +2590,7 @@ static inline void convert_VkGeometryNV_win32_to_host(const VkGeometryNV *in, Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkGeometryNV_host *convert_VkGeometryNV_array_win32_to_host(struct conversion_context *ctx, const VkGeometryNV *in, uint32_t count)
+static inline const VkGeometryNV_host *convert_VkGeometryNV_array_win32_to_host(struct conversion_context *ctx, const VkGeometryNV32 *in, uint32_t count)
 {
     VkGeometryNV_host *out;
     unsigned int i;
@@ -806,7 +2608,7 @@ static inline const VkGeometryNV_host *convert_VkGeometryNV_array_win32_to_host(
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureInfoNV_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureInfoNV *in, VkAccelerationStructureInfoNV_host *out)
+static inline void convert_VkAccelerationStructureInfoNV_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureInfoNV32 *in, VkAccelerationStructureInfoNV_host *out)
 {
     if (!in) return;

@@ -821,7 +2623,7 @@ static inline void convert_VkAccelerationStructureInfoNV_win32_to_host(struct co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyAccelerationStructureInfoKHR_win32_to_host(const VkCopyAccelerationStructureInfoKHR *in, VkCopyAccelerationStructureInfoKHR_host *out)
+static inline void convert_VkCopyAccelerationStructureInfoKHR_win32_to_host(const VkCopyAccelerationStructureInfoKHR32 *in, VkCopyAccelerationStructureInfoKHR_host *out)
 {
     if (!in) return;

@@ -834,7 +2636,7 @@ static inline void convert_VkCopyAccelerationStructureInfoKHR_win32_to_host(cons
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyAccelerationStructureToMemoryInfoKHR_win32_to_host(const VkCopyAccelerationStructureToMemoryInfoKHR *in, VkCopyAccelerationStructureToMemoryInfoKHR_host *out)
+static inline void convert_VkCopyAccelerationStructureToMemoryInfoKHR_win32_to_host(const VkCopyAccelerationStructureToMemoryInfoKHR32 *in, VkCopyAccelerationStructureToMemoryInfoKHR_host *out)
 {
     if (!in) return;

@@ -847,7 +2649,7 @@ static inline void convert_VkCopyAccelerationStructureToMemoryInfoKHR_win32_to_h
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferCopy_win32_to_host(const VkBufferCopy *in, VkBufferCopy_host *out)
+static inline void convert_VkBufferCopy_win32_to_host(const VkBufferCopy32 *in, VkBufferCopy_host *out)
 {
     if (!in) return;

@@ -858,7 +2660,7 @@ static inline void convert_VkBufferCopy_win32_to_host(const VkBufferCopy *in, Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferCopy_host *convert_VkBufferCopy_array_win32_to_host(struct conversion_context *ctx, const VkBufferCopy *in, uint32_t count)
+static inline const VkBufferCopy_host *convert_VkBufferCopy_array_win32_to_host(struct conversion_context *ctx, const VkBufferCopy32 *in, uint32_t count)
 {
     VkBufferCopy_host *out;
     unsigned int i;
@@ -876,7 +2678,7 @@ static inline const VkBufferCopy_host *convert_VkBufferCopy_array_win32_to_host(
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferCopy2_win32_to_host(const VkBufferCopy2 *in, VkBufferCopy2_host *out)
+static inline void convert_VkBufferCopy2_win32_to_host(const VkBufferCopy232 *in, VkBufferCopy2_host *out)
 {
     if (!in) return;

@@ -889,7 +2691,7 @@ static inline void convert_VkBufferCopy2_win32_to_host(const VkBufferCopy2 *in,
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferCopy2_host *convert_VkBufferCopy2_array_win32_to_host(struct conversion_context *ctx, const VkBufferCopy2 *in, uint32_t count)
+static inline const VkBufferCopy2_host *convert_VkBufferCopy2_array_win32_to_host(struct conversion_context *ctx, const VkBufferCopy232 *in, uint32_t count)
 {
     VkBufferCopy2_host *out;
     unsigned int i;
@@ -907,7 +2709,7 @@ static inline const VkBufferCopy2_host *convert_VkBufferCopy2_array_win32_to_hos
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyBufferInfo2_win32_to_host(struct conversion_context *ctx, const VkCopyBufferInfo2 *in, VkCopyBufferInfo2_host *out)
+static inline void convert_VkCopyBufferInfo2_win32_to_host(struct conversion_context *ctx, const VkCopyBufferInfo232 *in, VkCopyBufferInfo2_host *out)
 {
     if (!in) return;

@@ -921,7 +2723,7 @@ static inline void convert_VkCopyBufferInfo2_win32_to_host(struct conversion_con
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferImageCopy_win32_to_host(const VkBufferImageCopy *in, VkBufferImageCopy_host *out)
+static inline void convert_VkBufferImageCopy_win32_to_host(const VkBufferImageCopy32 *in, VkBufferImageCopy_host *out)
 {
     if (!in) return;

@@ -935,7 +2737,7 @@ static inline void convert_VkBufferImageCopy_win32_to_host(const VkBufferImageCo
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferImageCopy_host *convert_VkBufferImageCopy_array_win32_to_host(struct conversion_context *ctx, const VkBufferImageCopy *in, uint32_t count)
+static inline const VkBufferImageCopy_host *convert_VkBufferImageCopy_array_win32_to_host(struct conversion_context *ctx, const VkBufferImageCopy32 *in, uint32_t count)
 {
     VkBufferImageCopy_host *out;
     unsigned int i;
@@ -953,7 +2755,7 @@ static inline const VkBufferImageCopy_host *convert_VkBufferImageCopy_array_win3
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferImageCopy2_win32_to_host(const VkBufferImageCopy2 *in, VkBufferImageCopy2_host *out)
+static inline void convert_VkBufferImageCopy2_win32_to_host(const VkBufferImageCopy232 *in, VkBufferImageCopy2_host *out)
 {
     if (!in) return;

@@ -969,7 +2771,7 @@ static inline void convert_VkBufferImageCopy2_win32_to_host(const VkBufferImageC
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferImageCopy2_host *convert_VkBufferImageCopy2_array_win32_to_host(struct conversion_context *ctx, const VkBufferImageCopy2 *in, uint32_t count)
+static inline const VkBufferImageCopy2_host *convert_VkBufferImageCopy2_array_win32_to_host(struct conversion_context *ctx, const VkBufferImageCopy232 *in, uint32_t count)
 {
     VkBufferImageCopy2_host *out;
     unsigned int i;
@@ -987,7 +2789,7 @@ static inline const VkBufferImageCopy2_host *convert_VkBufferImageCopy2_array_wi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyBufferToImageInfo2_win32_to_host(struct conversion_context *ctx, const VkCopyBufferToImageInfo2 *in, VkCopyBufferToImageInfo2_host *out)
+static inline void convert_VkCopyBufferToImageInfo2_win32_to_host(struct conversion_context *ctx, const VkCopyBufferToImageInfo232 *in, VkCopyBufferToImageInfo2_host *out)
 {
     if (!in) return;

@@ -1002,7 +2804,7 @@ static inline void convert_VkCopyBufferToImageInfo2_win32_to_host(struct convers
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyImageInfo2_win32_to_host(const VkCopyImageInfo2 *in, VkCopyImageInfo2_host *out)
+static inline void convert_VkCopyImageInfo2_win32_to_host(const VkCopyImageInfo232 *in, VkCopyImageInfo2_host *out)
 {
     if (!in) return;

@@ -1018,7 +2820,7 @@ static inline void convert_VkCopyImageInfo2_win32_to_host(const VkCopyImageInfo2
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyImageToBufferInfo2_win32_to_host(struct conversion_context *ctx, const VkCopyImageToBufferInfo2 *in, VkCopyImageToBufferInfo2_host *out)
+static inline void convert_VkCopyImageToBufferInfo2_win32_to_host(struct conversion_context *ctx, const VkCopyImageToBufferInfo232 *in, VkCopyImageToBufferInfo2_host *out)
 {
     if (!in) return;

@@ -1033,7 +2835,7 @@ static inline void convert_VkCopyImageToBufferInfo2_win32_to_host(struct convers
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyMemoryToAccelerationStructureInfoKHR_win32_to_host(const VkCopyMemoryToAccelerationStructureInfoKHR *in, VkCopyMemoryToAccelerationStructureInfoKHR_host *out)
+static inline void convert_VkCopyMemoryToAccelerationStructureInfoKHR_win32_to_host(const VkCopyMemoryToAccelerationStructureInfoKHR32 *in, VkCopyMemoryToAccelerationStructureInfoKHR_host *out)
 {
     if (!in) return;

@@ -1046,7 +2848,7 @@ static inline void convert_VkCopyMemoryToAccelerationStructureInfoKHR_win32_to_h
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyMemoryToMicromapInfoEXT_win32_to_host(const VkCopyMemoryToMicromapInfoEXT *in, VkCopyMemoryToMicromapInfoEXT_host *out)
+static inline void convert_VkCopyMemoryToMicromapInfoEXT_win32_to_host(const VkCopyMemoryToMicromapInfoEXT32 *in, VkCopyMemoryToMicromapInfoEXT_host *out)
 {
     if (!in) return;

@@ -1059,7 +2861,7 @@ static inline void convert_VkCopyMemoryToMicromapInfoEXT_win32_to_host(const VkC
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyMicromapInfoEXT_win32_to_host(const VkCopyMicromapInfoEXT *in, VkCopyMicromapInfoEXT_host *out)
+static inline void convert_VkCopyMicromapInfoEXT_win32_to_host(const VkCopyMicromapInfoEXT32 *in, VkCopyMicromapInfoEXT_host *out)
 {
     if (!in) return;

@@ -1072,7 +2874,7 @@ static inline void convert_VkCopyMicromapInfoEXT_win32_to_host(const VkCopyMicro
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyMicromapToMemoryInfoEXT_win32_to_host(const VkCopyMicromapToMemoryInfoEXT *in, VkCopyMicromapToMemoryInfoEXT_host *out)
+static inline void convert_VkCopyMicromapToMemoryInfoEXT_win32_to_host(const VkCopyMicromapToMemoryInfoEXT32 *in, VkCopyMicromapToMemoryInfoEXT_host *out)
 {
     if (!in) return;

@@ -1085,7 +2887,7 @@ static inline void convert_VkCopyMicromapToMemoryInfoEXT_win32_to_host(const VkC
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCuLaunchInfoNVX_win32_to_host(const VkCuLaunchInfoNVX *in, VkCuLaunchInfoNVX_host *out)
+static inline void convert_VkCuLaunchInfoNVX_win32_to_host(const VkCuLaunchInfoNVX32 *in, VkCuLaunchInfoNVX_host *out)
 {
     if (!in) return;

@@ -1107,7 +2909,7 @@ static inline void convert_VkCuLaunchInfoNVX_win32_to_host(const VkCuLaunchInfoN
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDecompressMemoryRegionNV_win32_to_host(const VkDecompressMemoryRegionNV *in, VkDecompressMemoryRegionNV_host *out)
+static inline void convert_VkDecompressMemoryRegionNV_win32_to_host(const VkDecompressMemoryRegionNV32 *in, VkDecompressMemoryRegionNV_host *out)
 {
     if (!in) return;

@@ -1120,7 +2922,7 @@ static inline void convert_VkDecompressMemoryRegionNV_win32_to_host(const VkDeco
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkDecompressMemoryRegionNV_host *convert_VkDecompressMemoryRegionNV_array_win32_to_host(struct conversion_context *ctx, const VkDecompressMemoryRegionNV *in, uint32_t count)
+static inline const VkDecompressMemoryRegionNV_host *convert_VkDecompressMemoryRegionNV_array_win32_to_host(struct conversion_context *ctx, const VkDecompressMemoryRegionNV32 *in, uint32_t count)
 {
     VkDecompressMemoryRegionNV_host *out;
     unsigned int i;
@@ -1174,7 +2976,7 @@ static inline const VkCommandBuffer *convert_VkCommandBuffer_array_win32_to_host
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkIndirectCommandsStreamNV_win32_to_host(const VkIndirectCommandsStreamNV *in, VkIndirectCommandsStreamNV_host *out)
+static inline void convert_VkIndirectCommandsStreamNV_win32_to_host(const VkIndirectCommandsStreamNV32 *in, VkIndirectCommandsStreamNV_host *out)
 {
     if (!in) return;

@@ -1184,7 +2986,7 @@ static inline void convert_VkIndirectCommandsStreamNV_win32_to_host(const VkIndi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkIndirectCommandsStreamNV_host *convert_VkIndirectCommandsStreamNV_array_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsStreamNV *in, uint32_t count)
+static inline const VkIndirectCommandsStreamNV_host *convert_VkIndirectCommandsStreamNV_array_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsStreamNV32 *in, uint32_t count)
 {
     VkIndirectCommandsStreamNV_host *out;
     unsigned int i;
@@ -1202,7 +3004,7 @@ static inline const VkIndirectCommandsStreamNV_host *convert_VkIndirectCommandsS
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGeneratedCommandsInfoNV_win32_to_host(struct conversion_context *ctx, const VkGeneratedCommandsInfoNV *in, VkGeneratedCommandsInfoNV_host *out)
+static inline void convert_VkGeneratedCommandsInfoNV_win32_to_host(struct conversion_context *ctx, const VkGeneratedCommandsInfoNV32 *in, VkGeneratedCommandsInfoNV_host *out)
 {
     if (!in) return;

@@ -1225,7 +3027,7 @@ static inline void convert_VkGeneratedCommandsInfoNV_win32_to_host(struct conver
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferMemoryBarrier_win32_to_host(const VkBufferMemoryBarrier *in, VkBufferMemoryBarrier_host *out)
+static inline void convert_VkBufferMemoryBarrier_win32_to_host(const VkBufferMemoryBarrier32 *in, VkBufferMemoryBarrier_host *out)
 {
     if (!in) return;

@@ -1242,7 +3044,7 @@ static inline void convert_VkBufferMemoryBarrier_win32_to_host(const VkBufferMem
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferMemoryBarrier_host *convert_VkBufferMemoryBarrier_array_win32_to_host(struct conversion_context *ctx, const VkBufferMemoryBarrier *in, uint32_t count)
+static inline const VkBufferMemoryBarrier_host *convert_VkBufferMemoryBarrier_array_win32_to_host(struct conversion_context *ctx, const VkBufferMemoryBarrier32 *in, uint32_t count)
 {
     VkBufferMemoryBarrier_host *out;
     unsigned int i;
@@ -1260,7 +3062,7 @@ static inline const VkBufferMemoryBarrier_host *convert_VkBufferMemoryBarrier_ar
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageMemoryBarrier_win32_to_host(const VkImageMemoryBarrier *in, VkImageMemoryBarrier_host *out)
+static inline void convert_VkImageMemoryBarrier_win32_to_host(const VkImageMemoryBarrier32 *in, VkImageMemoryBarrier_host *out)
 {
     if (!in) return;

@@ -1278,7 +3080,7 @@ static inline void convert_VkImageMemoryBarrier_win32_to_host(const VkImageMemor
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkImageMemoryBarrier_host *convert_VkImageMemoryBarrier_array_win32_to_host(struct conversion_context *ctx, const VkImageMemoryBarrier *in, uint32_t count)
+static inline const VkImageMemoryBarrier_host *convert_VkImageMemoryBarrier_array_win32_to_host(struct conversion_context *ctx, const VkImageMemoryBarrier32 *in, uint32_t count)
 {
     VkImageMemoryBarrier_host *out;
     unsigned int i;
@@ -1296,7 +3098,7 @@ static inline const VkImageMemoryBarrier_host *convert_VkImageMemoryBarrier_arra
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferMemoryBarrier2_win32_to_host(const VkBufferMemoryBarrier2 *in, VkBufferMemoryBarrier2_host *out)
+static inline void convert_VkBufferMemoryBarrier2_win32_to_host(const VkBufferMemoryBarrier232 *in, VkBufferMemoryBarrier2_host *out)
 {
     if (!in) return;

@@ -1315,7 +3117,7 @@ static inline void convert_VkBufferMemoryBarrier2_win32_to_host(const VkBufferMe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferMemoryBarrier2_host *convert_VkBufferMemoryBarrier2_array_win32_to_host(struct conversion_context *ctx, const VkBufferMemoryBarrier2 *in, uint32_t count)
+static inline const VkBufferMemoryBarrier2_host *convert_VkBufferMemoryBarrier2_array_win32_to_host(struct conversion_context *ctx, const VkBufferMemoryBarrier232 *in, uint32_t count)
 {
     VkBufferMemoryBarrier2_host *out;
     unsigned int i;
@@ -1333,7 +3135,7 @@ static inline const VkBufferMemoryBarrier2_host *convert_VkBufferMemoryBarrier2_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageMemoryBarrier2_win32_to_host(const VkImageMemoryBarrier2 *in, VkImageMemoryBarrier2_host *out)
+static inline void convert_VkImageMemoryBarrier2_win32_to_host(const VkImageMemoryBarrier232 *in, VkImageMemoryBarrier2_host *out)
 {
     if (!in) return;

@@ -1353,7 +3155,7 @@ static inline void convert_VkImageMemoryBarrier2_win32_to_host(const VkImageMemo
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkImageMemoryBarrier2_host *convert_VkImageMemoryBarrier2_array_win32_to_host(struct conversion_context *ctx, const VkImageMemoryBarrier2 *in, uint32_t count)
+static inline const VkImageMemoryBarrier2_host *convert_VkImageMemoryBarrier2_array_win32_to_host(struct conversion_context *ctx, const VkImageMemoryBarrier232 *in, uint32_t count)
 {
     VkImageMemoryBarrier2_host *out;
     unsigned int i;
@@ -1371,7 +3173,7 @@ static inline const VkImageMemoryBarrier2_host *convert_VkImageMemoryBarrier2_ar
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDependencyInfo_win32_to_host(struct conversion_context *ctx, const VkDependencyInfo *in, VkDependencyInfo_host *out)
+static inline void convert_VkDependencyInfo_win32_to_host(struct conversion_context *ctx, const VkDependencyInfo32 *in, VkDependencyInfo_host *out)
 {
     if (!in) return;

@@ -1388,7 +3190,7 @@ static inline void convert_VkDependencyInfo_win32_to_host(struct conversion_cont
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDescriptorImageInfo_win32_to_host(const VkDescriptorImageInfo *in, VkDescriptorImageInfo_host *out)
+static inline void convert_VkDescriptorImageInfo_win32_to_host(const VkDescriptorImageInfo32 *in, VkDescriptorImageInfo_host *out)
 {
     if (!in) return;

@@ -1399,7 +3201,7 @@ static inline void convert_VkDescriptorImageInfo_win32_to_host(const VkDescripto
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkDescriptorImageInfo_host *convert_VkDescriptorImageInfo_array_win32_to_host(struct conversion_context *ctx, const VkDescriptorImageInfo *in, uint32_t count)
+static inline const VkDescriptorImageInfo_host *convert_VkDescriptorImageInfo_array_win32_to_host(struct conversion_context *ctx, const VkDescriptorImageInfo32 *in, uint32_t count)
 {
     VkDescriptorImageInfo_host *out;
     unsigned int i;
@@ -1417,7 +3219,7 @@ static inline const VkDescriptorImageInfo_host *convert_VkDescriptorImageInfo_ar
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDescriptorBufferInfo_win32_to_host(const VkDescriptorBufferInfo *in, VkDescriptorBufferInfo_host *out)
+static inline void convert_VkDescriptorBufferInfo_win32_to_host(const VkDescriptorBufferInfo32 *in, VkDescriptorBufferInfo_host *out)
 {
     if (!in) return;

@@ -1428,7 +3230,7 @@ static inline void convert_VkDescriptorBufferInfo_win32_to_host(const VkDescript
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkDescriptorBufferInfo_host *convert_VkDescriptorBufferInfo_array_win32_to_host(struct conversion_context *ctx, const VkDescriptorBufferInfo *in, uint32_t count)
+static inline const VkDescriptorBufferInfo_host *convert_VkDescriptorBufferInfo_array_win32_to_host(struct conversion_context *ctx, const VkDescriptorBufferInfo32 *in, uint32_t count)
 {
     VkDescriptorBufferInfo_host *out;
     unsigned int i;
@@ -1446,7 +3248,7 @@ static inline const VkDescriptorBufferInfo_host *convert_VkDescriptorBufferInfo_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkWriteDescriptorSet_win32_to_host(struct conversion_context *ctx, const VkWriteDescriptorSet *in, VkWriteDescriptorSet_host *out)
+static inline void convert_VkWriteDescriptorSet_win32_to_host(struct conversion_context *ctx, const VkWriteDescriptorSet32 *in, VkWriteDescriptorSet_host *out)
 {
     if (!in) return;

@@ -1464,7 +3266,7 @@ static inline void convert_VkWriteDescriptorSet_win32_to_host(struct conversion_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkWriteDescriptorSet_host *convert_VkWriteDescriptorSet_array_win32_to_host(struct conversion_context *ctx, const VkWriteDescriptorSet *in, uint32_t count)
+static inline const VkWriteDescriptorSet_host *convert_VkWriteDescriptorSet_array_win32_to_host(struct conversion_context *ctx, const VkWriteDescriptorSet32 *in, uint32_t count)
 {
     VkWriteDescriptorSet_host *out;
     unsigned int i;
@@ -1482,7 +3284,7 @@ static inline const VkWriteDescriptorSet_host *convert_VkWriteDescriptorSet_arra
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkResolveImageInfo2_win32_to_host(const VkResolveImageInfo2 *in, VkResolveImageInfo2_host *out)
+static inline void convert_VkResolveImageInfo2_win32_to_host(const VkResolveImageInfo232 *in, VkResolveImageInfo2_host *out)
 {
     if (!in) return;

@@ -1498,7 +3300,7 @@ static inline void convert_VkResolveImageInfo2_win32_to_host(const VkResolveImag
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPerformanceMarkerInfoINTEL_win32_to_host(const VkPerformanceMarkerInfoINTEL *in, VkPerformanceMarkerInfoINTEL_host *out)
+static inline void convert_VkPerformanceMarkerInfoINTEL_win32_to_host(const VkPerformanceMarkerInfoINTEL32 *in, VkPerformanceMarkerInfoINTEL_host *out)
 {
     if (!in) return;

@@ -1509,7 +3311,7 @@ static inline void convert_VkPerformanceMarkerInfoINTEL_win32_to_host(const VkPe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPerformanceOverrideInfoINTEL_win32_to_host(const VkPerformanceOverrideInfoINTEL *in, VkPerformanceOverrideInfoINTEL_host *out)
+static inline void convert_VkPerformanceOverrideInfoINTEL_win32_to_host(const VkPerformanceOverrideInfoINTEL32 *in, VkPerformanceOverrideInfoINTEL_host *out)
 {
     if (!in) return;

@@ -1522,7 +3324,7 @@ static inline void convert_VkPerformanceOverrideInfoINTEL_win32_to_host(const Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkStridedDeviceAddressRegionKHR_win32_to_host(const VkStridedDeviceAddressRegionKHR *in, VkStridedDeviceAddressRegionKHR_host *out)
+static inline void convert_VkStridedDeviceAddressRegionKHR_win32_to_host(const VkStridedDeviceAddressRegionKHR32 *in, VkStridedDeviceAddressRegionKHR_host *out)
 {
     if (!in) return;

@@ -1533,7 +3335,7 @@ static inline void convert_VkStridedDeviceAddressRegionKHR_win32_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkDependencyInfo_host *convert_VkDependencyInfo_array_win32_to_host(struct conversion_context *ctx, const VkDependencyInfo *in, uint32_t count)
+static inline const VkDependencyInfo_host *convert_VkDependencyInfo_array_win32_to_host(struct conversion_context *ctx, const VkDependencyInfo32 *in, uint32_t count)
 {
     VkDependencyInfo_host *out;
     unsigned int i;
@@ -1551,7 +3353,7 @@ static inline const VkDependencyInfo_host *convert_VkDependencyInfo_array_win32_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureCreateInfoKHR_win32_to_host(const VkAccelerationStructureCreateInfoKHR *in, VkAccelerationStructureCreateInfoKHR_host *out)
+static inline void convert_VkAccelerationStructureCreateInfoKHR_win32_to_host(const VkAccelerationStructureCreateInfoKHR32 *in, VkAccelerationStructureCreateInfoKHR_host *out)
 {
     if (!in) return;

@@ -1567,7 +3369,7 @@ static inline void convert_VkAccelerationStructureCreateInfoKHR_win32_to_host(co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureCreateInfoNV *in, VkAccelerationStructureCreateInfoNV_host *out)
+static inline void convert_VkAccelerationStructureCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureCreateInfoNV32 *in, VkAccelerationStructureCreateInfoNV_host *out)
 {
     if (!in) return;

@@ -1579,7 +3381,7 @@ static inline void convert_VkAccelerationStructureCreateInfoNV_win32_to_host(str
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferCreateInfo_win32_to_host(struct conversion_context *ctx, const VkBufferCreateInfo *in, VkBufferCreateInfo_host *out)
+static inline void convert_VkBufferCreateInfo_win32_to_host(struct conversion_context *ctx, const VkBufferCreateInfo32 *in, VkBufferCreateInfo_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -1624,7 +3426,7 @@ static inline void convert_VkBufferCreateInfo_win32_to_host(struct conversion_co
         case VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO:
         {
             VkBufferOpaqueCaptureAddressCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkBufferOpaqueCaptureAddressCreateInfo *in_ext = (const VkBufferOpaqueCaptureAddressCreateInfo *)in_header;
+            const VkBufferOpaqueCaptureAddressCreateInfo32 *in_ext = (const VkBufferOpaqueCaptureAddressCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO;
             out_ext->pNext = NULL;
             out_ext->opaqueCaptureAddress = in_ext->opaqueCaptureAddress;
@@ -1635,7 +3437,7 @@ static inline void convert_VkBufferCreateInfo_win32_to_host(struct conversion_co
         case VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT:
         {
             VkBufferDeviceAddressCreateInfoEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkBufferDeviceAddressCreateInfoEXT *in_ext = (const VkBufferDeviceAddressCreateInfoEXT *)in_header;
+            const VkBufferDeviceAddressCreateInfoEXT32 *in_ext = (const VkBufferDeviceAddressCreateInfoEXT32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT;
             out_ext->pNext = NULL;
             out_ext->deviceAddress = in_ext->deviceAddress;
@@ -1652,7 +3454,7 @@ static inline void convert_VkBufferCreateInfo_win32_to_host(struct conversion_co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferViewCreateInfo_win32_to_host(const VkBufferViewCreateInfo *in, VkBufferViewCreateInfo_host *out)
+static inline void convert_VkBufferViewCreateInfo_win32_to_host(const VkBufferViewCreateInfo32 *in, VkBufferViewCreateInfo_host *out)
 {
     if (!in) return;

@@ -1667,7 +3469,7 @@ static inline void convert_VkBufferViewCreateInfo_win32_to_host(const VkBufferVi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineCreationFeedback_host_to_win32(const VkPipelineCreationFeedback_host *in, VkPipelineCreationFeedback *out)
+static inline void convert_VkPipelineCreationFeedback_host_to_win32(const VkPipelineCreationFeedback_host *in, VkPipelineCreationFeedback32 *out)
 {
     if (!in) return;

@@ -1677,7 +3479,7 @@ static inline void convert_VkPipelineCreationFeedback_host_to_win32(const VkPipe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkPipelineCreationFeedback_host *convert_VkPipelineCreationFeedback_array_win32_to_host(struct conversion_context *ctx, const VkPipelineCreationFeedback *in, uint32_t count)
+static inline VkPipelineCreationFeedback_host *convert_VkPipelineCreationFeedback_array_win32_to_host(struct conversion_context *ctx, const VkPipelineCreationFeedback32 *in, uint32_t count)
 {
     VkPipelineCreationFeedback_host *out;
     if (!in || !count) return NULL;
@@ -1689,7 +3491,7 @@ static inline VkPipelineCreationFeedback_host *convert_VkPipelineCreationFeedbac
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineCreationFeedback_array_host_to_win32(const VkPipelineCreationFeedback_host *in, VkPipelineCreationFeedback *out, uint32_t count)
+static inline void convert_VkPipelineCreationFeedback_array_host_to_win32(const VkPipelineCreationFeedback_host *in, VkPipelineCreationFeedback32 *out, uint32_t count)
 {
     unsigned int i;

@@ -1805,7 +3607,7 @@ static inline void convert_VkPipelineShaderStageCreateInfo_win64_to_host(struct
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineShaderStageCreateInfo_win32_to_host(struct conversion_context *ctx, const VkPipelineShaderStageCreateInfo *in, VkPipelineShaderStageCreateInfo_host *out)
+static inline void convert_VkPipelineShaderStageCreateInfo_win32_to_host(struct conversion_context *ctx, const VkPipelineShaderStageCreateInfo32 *in, VkPipelineShaderStageCreateInfo_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -1840,7 +3642,7 @@ static inline void convert_VkPipelineShaderStageCreateInfo_win32_to_host(struct
         case VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT:
         {
             VkShaderModuleValidationCacheCreateInfoEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkShaderModuleValidationCacheCreateInfoEXT *in_ext = (const VkShaderModuleValidationCacheCreateInfoEXT *)in_header;
+            const VkShaderModuleValidationCacheCreateInfoEXT32 *in_ext = (const VkShaderModuleValidationCacheCreateInfoEXT32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT;
             out_ext->pNext = NULL;
             out_ext->validationCache = in_ext->validationCache;
@@ -1851,7 +3653,7 @@ static inline void convert_VkPipelineShaderStageCreateInfo_win32_to_host(struct
         case VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT:
         {
             VkDebugUtilsObjectNameInfoEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkDebugUtilsObjectNameInfoEXT *in_ext = (const VkDebugUtilsObjectNameInfoEXT *)in_header;
+            const VkDebugUtilsObjectNameInfoEXT32 *in_ext = (const VkDebugUtilsObjectNameInfoEXT32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT;
             out_ext->pNext = NULL;
             out_ext->objectType = in_ext->objectType;
@@ -1922,7 +3724,7 @@ static inline void convert_VkComputePipelineCreateInfo_win64_to_host(struct conv
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conversion_context *ctx, const VkComputePipelineCreateInfo *in, VkComputePipelineCreateInfo_host *out)
+static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conversion_context *ctx, const VkComputePipelineCreateInfo32 *in, VkComputePipelineCreateInfo_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -1944,7 +3746,7 @@ static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conv
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
             VkPipelineCreationFeedbackCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkPipelineCreationFeedbackCreateInfo *in_ext = (const VkPipelineCreationFeedbackCreateInfo *)in_header;
+            const VkPipelineCreationFeedbackCreateInfo32 *in_ext = (const VkPipelineCreationFeedbackCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             out_ext->pNext = NULL;
             out_ext->pPipelineCreationFeedback = convert_VkPipelineCreationFeedback_array_win32_to_host(ctx, in_ext->pPipelineCreationFeedback, 1);
@@ -1957,7 +3759,7 @@ static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conv
         case VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI:
         {
             VkSubpassShadingPipelineCreateInfoHUAWEI_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkSubpassShadingPipelineCreateInfoHUAWEI *in_ext = (const VkSubpassShadingPipelineCreateInfoHUAWEI *)in_header;
+            const VkSubpassShadingPipelineCreateInfoHUAWEI32 *in_ext = (const VkSubpassShadingPipelineCreateInfoHUAWEI32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI;
             out_ext->pNext = NULL;
             out_ext->renderPass = in_ext->renderPass;
@@ -2000,7 +3802,7 @@ static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conv
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkComputePipelineCreateInfo_host_to_win32(const VkComputePipelineCreateInfo_host *in, const VkComputePipelineCreateInfo *out)
+static inline void convert_VkComputePipelineCreateInfo_host_to_win32(const VkComputePipelineCreateInfo_host *in, const VkComputePipelineCreateInfo32 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -2014,7 +3816,7 @@ static inline void convert_VkComputePipelineCreateInfo_host_to_win32(const VkCom
         {
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
-            VkPipelineCreationFeedbackCreateInfo *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
+            VkPipelineCreationFeedbackCreateInfo32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
             const VkPipelineCreationFeedbackCreateInfo_host *in_ext = (const VkPipelineCreationFeedbackCreateInfo_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             convert_VkPipelineCreationFeedback_array_host_to_win32(in_ext->pPipelineCreationFeedback, out_ext->pPipelineCreationFeedback, 1);
@@ -2048,7 +3850,7 @@ static inline const VkComputePipelineCreateInfo *convert_VkComputePipelineCreate
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkComputePipelineCreateInfo_host *convert_VkComputePipelineCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkComputePipelineCreateInfo *in, uint32_t count)
+static inline const VkComputePipelineCreateInfo_host *convert_VkComputePipelineCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkComputePipelineCreateInfo32 *in, uint32_t count)
 {
     VkComputePipelineCreateInfo_host *out;
     unsigned int i;
@@ -2066,7 +3868,7 @@ static inline const VkComputePipelineCreateInfo_host *convert_VkComputePipelineC
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkComputePipelineCreateInfo_array_host_to_win32(const VkComputePipelineCreateInfo_host *in, const VkComputePipelineCreateInfo *out, uint32_t count)
+static inline void convert_VkComputePipelineCreateInfo_array_host_to_win32(const VkComputePipelineCreateInfo_host *in, const VkComputePipelineCreateInfo32 *out, uint32_t count)
 {
     unsigned int i;

@@ -2080,7 +3882,7 @@ static inline void convert_VkComputePipelineCreateInfo_array_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCuFunctionCreateInfoNVX_win32_to_host(const VkCuFunctionCreateInfoNVX *in, VkCuFunctionCreateInfoNVX_host *out)
+static inline void convert_VkCuFunctionCreateInfoNVX_win32_to_host(const VkCuFunctionCreateInfoNVX32 *in, VkCuFunctionCreateInfoNVX_host *out)
 {
     if (!in) return;

@@ -2092,7 +3894,7 @@ static inline void convert_VkCuFunctionCreateInfoNVX_win32_to_host(const VkCuFun
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDescriptorUpdateTemplateCreateInfo_win32_to_host(const VkDescriptorUpdateTemplateCreateInfo *in, VkDescriptorUpdateTemplateCreateInfo_host *out)
+static inline void convert_VkDescriptorUpdateTemplateCreateInfo_win32_to_host(const VkDescriptorUpdateTemplateCreateInfo32 *in, VkDescriptorUpdateTemplateCreateInfo_host *out)
 {
     if (!in) return;

@@ -5776,7 +7578,7 @@ static inline void convert_VkDeviceCreateInfo_win32_to_host(struct conversion_co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkFramebufferCreateInfo_win32_to_host(const VkFramebufferCreateInfo *in, VkFramebufferCreateInfo_host *out)
+static inline void convert_VkFramebufferCreateInfo_win32_to_host(const VkFramebufferCreateInfo32 *in, VkFramebufferCreateInfo_host *out)
 {
     if (!in) return;

@@ -5811,7 +7613,7 @@ static inline const VkPipelineShaderStageCreateInfo *convert_VkPipelineShaderSta
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkPipelineShaderStageCreateInfo_host *convert_VkPipelineShaderStageCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkPipelineShaderStageCreateInfo *in, uint32_t count)
+static inline const VkPipelineShaderStageCreateInfo_host *convert_VkPipelineShaderStageCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkPipelineShaderStageCreateInfo32 *in, uint32_t count)
 {
     VkPipelineShaderStageCreateInfo_host *out;
     unsigned int i;
@@ -5843,7 +7645,7 @@ static inline void convert_VkGraphicsShaderGroupCreateInfoNV_win64_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGraphicsShaderGroupCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkGraphicsShaderGroupCreateInfoNV *in, VkGraphicsShaderGroupCreateInfoNV_host *out)
+static inline void convert_VkGraphicsShaderGroupCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkGraphicsShaderGroupCreateInfoNV32 *in, VkGraphicsShaderGroupCreateInfoNV_host *out)
 {
     if (!in) return;

@@ -5875,7 +7677,7 @@ static inline const VkGraphicsShaderGroupCreateInfoNV *convert_VkGraphicsShaderG
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkGraphicsShaderGroupCreateInfoNV_host *convert_VkGraphicsShaderGroupCreateInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkGraphicsShaderGroupCreateInfoNV *in, uint32_t count)
+static inline const VkGraphicsShaderGroupCreateInfoNV_host *convert_VkGraphicsShaderGroupCreateInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkGraphicsShaderGroupCreateInfoNV32 *in, uint32_t count)
 {
     VkGraphicsShaderGroupCreateInfoNV_host *out;
     unsigned int i;
@@ -6098,7 +7900,7 @@ static inline void convert_VkGraphicsPipelineCreateInfo_win64_to_host(struct con
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGraphicsPipelineCreateInfo_win32_to_host(struct conversion_context *ctx, const VkGraphicsPipelineCreateInfo *in, VkGraphicsPipelineCreateInfo_host *out)
+static inline void convert_VkGraphicsPipelineCreateInfo_win32_to_host(struct conversion_context *ctx, const VkGraphicsPipelineCreateInfo32 *in, VkGraphicsPipelineCreateInfo_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -6132,7 +7934,7 @@ static inline void convert_VkGraphicsPipelineCreateInfo_win32_to_host(struct con
         case VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV:
         {
             VkGraphicsPipelineShaderGroupsCreateInfoNV_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkGraphicsPipelineShaderGroupsCreateInfoNV *in_ext = (const VkGraphicsPipelineShaderGroupsCreateInfoNV *)in_header;
+            const VkGraphicsPipelineShaderGroupsCreateInfoNV32 *in_ext = (const VkGraphicsPipelineShaderGroupsCreateInfoNV32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV;
             out_ext->pNext = NULL;
             out_ext->groupCount = in_ext->groupCount;
@@ -6171,7 +7973,7 @@ static inline void convert_VkGraphicsPipelineCreateInfo_win32_to_host(struct con
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
             VkPipelineCreationFeedbackCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkPipelineCreationFeedbackCreateInfo *in_ext = (const VkPipelineCreationFeedbackCreateInfo *)in_header;
+            const VkPipelineCreationFeedbackCreateInfo32 *in_ext = (const VkPipelineCreationFeedbackCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             out_ext->pNext = NULL;
             out_ext->pPipelineCreationFeedback = convert_VkPipelineCreationFeedback_array_win32_to_host(ctx, in_ext->pPipelineCreationFeedback, 1);
@@ -6303,7 +8105,7 @@ static inline void convert_VkGraphicsPipelineCreateInfo_win32_to_host(struct con
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGraphicsPipelineCreateInfo_host_to_win32(const VkGraphicsPipelineCreateInfo_host *in, const VkGraphicsPipelineCreateInfo *out)
+static inline void convert_VkGraphicsPipelineCreateInfo_host_to_win32(const VkGraphicsPipelineCreateInfo_host *in, const VkGraphicsPipelineCreateInfo32 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -6317,7 +8119,7 @@ static inline void convert_VkGraphicsPipelineCreateInfo_host_to_win32(const VkGr
         {
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
-            VkPipelineCreationFeedbackCreateInfo *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
+            VkPipelineCreationFeedbackCreateInfo32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
             const VkPipelineCreationFeedbackCreateInfo_host *in_ext = (const VkPipelineCreationFeedbackCreateInfo_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             convert_VkPipelineCreationFeedback_array_host_to_win32(in_ext->pPipelineCreationFeedback, out_ext->pPipelineCreationFeedback, 1);
@@ -6351,7 +8153,7 @@ static inline const VkGraphicsPipelineCreateInfo *convert_VkGraphicsPipelineCrea
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkGraphicsPipelineCreateInfo_host *convert_VkGraphicsPipelineCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkGraphicsPipelineCreateInfo *in, uint32_t count)
+static inline const VkGraphicsPipelineCreateInfo_host *convert_VkGraphicsPipelineCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkGraphicsPipelineCreateInfo32 *in, uint32_t count)
 {
     VkGraphicsPipelineCreateInfo_host *out;
     unsigned int i;
@@ -6369,7 +8171,7 @@ static inline const VkGraphicsPipelineCreateInfo_host *convert_VkGraphicsPipelin
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGraphicsPipelineCreateInfo_array_host_to_win32(const VkGraphicsPipelineCreateInfo_host *in, const VkGraphicsPipelineCreateInfo *out, uint32_t count)
+static inline void convert_VkGraphicsPipelineCreateInfo_array_host_to_win32(const VkGraphicsPipelineCreateInfo_host *in, const VkGraphicsPipelineCreateInfo32 *out, uint32_t count)
 {
     unsigned int i;

@@ -6435,7 +8237,7 @@ static inline void convert_VkImageCreateInfo_win32_to_host(struct conversion_con
         case VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHR:
         {
             VkImageSwapchainCreateInfoKHR_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkImageSwapchainCreateInfoKHR *in_ext = (const VkImageSwapchainCreateInfoKHR *)in_header;
+            const VkImageSwapchainCreateInfoKHR32 *in_ext = (const VkImageSwapchainCreateInfoKHR32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHR;
             out_ext->pNext = NULL;
             out_ext->swapchain = in_ext->swapchain;
@@ -6499,7 +8301,7 @@ static inline void convert_VkImageCreateInfo_win32_to_host(struct conversion_con
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageViewCreateInfo_win32_to_host(struct conversion_context *ctx, const VkImageViewCreateInfo *in, VkImageViewCreateInfo_host *out)
+static inline void convert_VkImageViewCreateInfo_win32_to_host(struct conversion_context *ctx, const VkImageViewCreateInfo32 *in, VkImageViewCreateInfo_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -6533,7 +8335,7 @@ static inline void convert_VkImageViewCreateInfo_win32_to_host(struct conversion
         case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO:
         {
             VkSamplerYcbcrConversionInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkSamplerYcbcrConversionInfo *in_ext = (const VkSamplerYcbcrConversionInfo *)in_header;
+            const VkSamplerYcbcrConversionInfo32 *in_ext = (const VkSamplerYcbcrConversionInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO;
             out_ext->pNext = NULL;
             out_ext->conversion = in_ext->conversion;
@@ -6585,7 +8387,7 @@ static inline void convert_VkImageViewCreateInfo_win32_to_host(struct conversion
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkIndirectCommandsLayoutTokenNV_win32_to_host(const VkIndirectCommandsLayoutTokenNV *in, VkIndirectCommandsLayoutTokenNV_host *out)
+static inline void convert_VkIndirectCommandsLayoutTokenNV_win32_to_host(const VkIndirectCommandsLayoutTokenNV32 *in, VkIndirectCommandsLayoutTokenNV_host *out)
 {
     if (!in) return;

@@ -6608,7 +8410,7 @@ static inline void convert_VkIndirectCommandsLayoutTokenNV_win32_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkIndirectCommandsLayoutTokenNV_host *convert_VkIndirectCommandsLayoutTokenNV_array_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsLayoutTokenNV *in, uint32_t count)
+static inline const VkIndirectCommandsLayoutTokenNV_host *convert_VkIndirectCommandsLayoutTokenNV_array_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsLayoutTokenNV32 *in, uint32_t count)
 {
     VkIndirectCommandsLayoutTokenNV_host *out;
     unsigned int i;
@@ -6626,7 +8428,7 @@ static inline const VkIndirectCommandsLayoutTokenNV_host *convert_VkIndirectComm
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkIndirectCommandsLayoutCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsLayoutCreateInfoNV *in, VkIndirectCommandsLayoutCreateInfoNV_host *out)
+static inline void convert_VkIndirectCommandsLayoutCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsLayoutCreateInfoNV32 *in, VkIndirectCommandsLayoutCreateInfoNV_host *out)
 {
     if (!in) return;

@@ -6812,7 +8614,7 @@ static inline void convert_VkInstanceCreateInfo_win32_to_host(struct conversion_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMicromapCreateInfoEXT_win32_to_host(const VkMicromapCreateInfoEXT *in, VkMicromapCreateInfoEXT_host *out)
+static inline void convert_VkMicromapCreateInfoEXT_win32_to_host(const VkMicromapCreateInfoEXT32 *in, VkMicromapCreateInfoEXT_host *out)
 {
     if (!in) return;

@@ -6850,7 +8652,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoKHR_win64_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRayTracingPipelineCreateInfoKHR_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoKHR *in, VkRayTracingPipelineCreateInfoKHR_host *out)
+static inline void convert_VkRayTracingPipelineCreateInfoKHR_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoKHR32 *in, VkRayTracingPipelineCreateInfoKHR_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -6879,7 +8681,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoKHR_win32_to_host(struc
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
             VkPipelineCreationFeedbackCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkPipelineCreationFeedbackCreateInfo *in_ext = (const VkPipelineCreationFeedbackCreateInfo *)in_header;
+            const VkPipelineCreationFeedbackCreateInfo32 *in_ext = (const VkPipelineCreationFeedbackCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             out_ext->pNext = NULL;
             out_ext->pPipelineCreationFeedback = convert_VkPipelineCreationFeedback_array_win32_to_host(ctx, in_ext->pPipelineCreationFeedback, 1);
@@ -6912,7 +8714,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoKHR_win32_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRayTracingPipelineCreateInfoKHR_host_to_win32(const VkRayTracingPipelineCreateInfoKHR_host *in, const VkRayTracingPipelineCreateInfoKHR *out)
+static inline void convert_VkRayTracingPipelineCreateInfoKHR_host_to_win32(const VkRayTracingPipelineCreateInfoKHR_host *in, const VkRayTracingPipelineCreateInfoKHR32 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -6926,7 +8728,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoKHR_host_to_win32(const
         {
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
-            VkPipelineCreationFeedbackCreateInfo *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
+            VkPipelineCreationFeedbackCreateInfo32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
             const VkPipelineCreationFeedbackCreateInfo_host *in_ext = (const VkPipelineCreationFeedbackCreateInfo_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             convert_VkPipelineCreationFeedback_array_host_to_win32(in_ext->pPipelineCreationFeedback, out_ext->pPipelineCreationFeedback, 1);
@@ -6960,7 +8762,7 @@ static inline const VkRayTracingPipelineCreateInfoKHR *convert_VkRayTracingPipel
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkRayTracingPipelineCreateInfoKHR_host *convert_VkRayTracingPipelineCreateInfoKHR_array_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoKHR *in, uint32_t count)
+static inline const VkRayTracingPipelineCreateInfoKHR_host *convert_VkRayTracingPipelineCreateInfoKHR_array_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoKHR32 *in, uint32_t count)
 {
     VkRayTracingPipelineCreateInfoKHR_host *out;
     unsigned int i;
@@ -6978,7 +8780,7 @@ static inline const VkRayTracingPipelineCreateInfoKHR_host *convert_VkRayTracing
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRayTracingPipelineCreateInfoKHR_array_host_to_win32(const VkRayTracingPipelineCreateInfoKHR_host *in, const VkRayTracingPipelineCreateInfoKHR *out, uint32_t count)
+static inline void convert_VkRayTracingPipelineCreateInfoKHR_array_host_to_win32(const VkRayTracingPipelineCreateInfoKHR_host *in, const VkRayTracingPipelineCreateInfoKHR32 *out, uint32_t count)
 {
     unsigned int i;

@@ -7011,7 +8813,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoNV_win64_to_host(struct
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRayTracingPipelineCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoNV *in, VkRayTracingPipelineCreateInfoNV_host *out)
+static inline void convert_VkRayTracingPipelineCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoNV32 *in, VkRayTracingPipelineCreateInfoNV_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -7037,7 +8839,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoNV_win32_to_host(struct
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
             VkPipelineCreationFeedbackCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkPipelineCreationFeedbackCreateInfo *in_ext = (const VkPipelineCreationFeedbackCreateInfo *)in_header;
+            const VkPipelineCreationFeedbackCreateInfo32 *in_ext = (const VkPipelineCreationFeedbackCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             out_ext->pNext = NULL;
             out_ext->pPipelineCreationFeedback = convert_VkPipelineCreationFeedback_array_win32_to_host(ctx, in_ext->pPipelineCreationFeedback, 1);
@@ -7056,7 +8858,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoNV_win32_to_host(struct
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRayTracingPipelineCreateInfoNV_host_to_win32(const VkRayTracingPipelineCreateInfoNV_host *in, const VkRayTracingPipelineCreateInfoNV *out)
+static inline void convert_VkRayTracingPipelineCreateInfoNV_host_to_win32(const VkRayTracingPipelineCreateInfoNV_host *in, const VkRayTracingPipelineCreateInfoNV32 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -7070,7 +8872,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoNV_host_to_win32(const
         {
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
-            VkPipelineCreationFeedbackCreateInfo *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
+            VkPipelineCreationFeedbackCreateInfo32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
             const VkPipelineCreationFeedbackCreateInfo_host *in_ext = (const VkPipelineCreationFeedbackCreateInfo_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             convert_VkPipelineCreationFeedback_array_host_to_win32(in_ext->pPipelineCreationFeedback, out_ext->pPipelineCreationFeedback, 1);
@@ -7104,7 +8906,7 @@ static inline const VkRayTracingPipelineCreateInfoNV *convert_VkRayTracingPipeli
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkRayTracingPipelineCreateInfoNV_host *convert_VkRayTracingPipelineCreateInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoNV *in, uint32_t count)
+static inline const VkRayTracingPipelineCreateInfoNV_host *convert_VkRayTracingPipelineCreateInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoNV32 *in, uint32_t count)
 {
     VkRayTracingPipelineCreateInfoNV_host *out;
     unsigned int i;
@@ -7122,7 +8924,7 @@ static inline const VkRayTracingPipelineCreateInfoNV_host *convert_VkRayTracingP
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRayTracingPipelineCreateInfoNV_array_host_to_win32(const VkRayTracingPipelineCreateInfoNV_host *in, const VkRayTracingPipelineCreateInfoNV *out, uint32_t count)
+static inline void convert_VkRayTracingPipelineCreateInfoNV_array_host_to_win32(const VkRayTracingPipelineCreateInfoNV_host *in, const VkRayTracingPipelineCreateInfoNV32 *out, uint32_t count)
 {
     unsigned int i;

@@ -7169,7 +8971,7 @@ static inline void convert_VkSamplerCreateInfo_win32_to_host(struct conversion_c
         case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO:
         {
             VkSamplerYcbcrConversionInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkSamplerYcbcrConversionInfo *in_ext = (const VkSamplerYcbcrConversionInfo *)in_header;
+            const VkSamplerYcbcrConversionInfo32 *in_ext = (const VkSamplerYcbcrConversionInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO;
             out_ext->pNext = NULL;
             out_ext->conversion = in_ext->conversion;
@@ -7250,7 +9052,7 @@ static inline void convert_VkSemaphoreCreateInfo_win32_to_host(struct conversion
         case VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO:
         {
             VkSemaphoreTypeCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkSemaphoreTypeCreateInfo *in_ext = (const VkSemaphoreTypeCreateInfo *)in_header;
+            const VkSemaphoreTypeCreateInfo32 *in_ext = (const VkSemaphoreTypeCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO;
             out_ext->pNext = NULL;
             out_ext->semaphoreType = in_ext->semaphoreType;
@@ -7288,7 +9090,7 @@ static inline void convert_VkShaderModuleCreateInfo_win32_to_host(struct convers
         case VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT:
         {
             VkShaderModuleValidationCacheCreateInfoEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkShaderModuleValidationCacheCreateInfoEXT *in_ext = (const VkShaderModuleValidationCacheCreateInfoEXT *)in_header;
+            const VkShaderModuleValidationCacheCreateInfoEXT32 *in_ext = (const VkShaderModuleValidationCacheCreateInfoEXT32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT;
             out_ext->pNext = NULL;
             out_ext->validationCache = in_ext->validationCache;
@@ -7331,7 +9133,7 @@ static inline void convert_VkSwapchainCreateInfoKHR_win64_to_host(const VkSwapch
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSwapchainCreateInfoKHR_win32_to_host(const VkSwapchainCreateInfoKHR *in, VkSwapchainCreateInfoKHR_host *out)
+static inline void convert_VkSwapchainCreateInfoKHR_win32_to_host(const VkSwapchainCreateInfoKHR32 *in, VkSwapchainCreateInfoKHR_host *out)
 {
     if (!in) return;

@@ -7370,7 +9172,7 @@ static inline void convert_VkDebugMarkerObjectNameInfoEXT_win64_to_host(const Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDebugMarkerObjectNameInfoEXT_win32_to_host(const VkDebugMarkerObjectNameInfoEXT *in, VkDebugMarkerObjectNameInfoEXT_host *out)
+static inline void convert_VkDebugMarkerObjectNameInfoEXT_win32_to_host(const VkDebugMarkerObjectNameInfoEXT32 *in, VkDebugMarkerObjectNameInfoEXT_host *out)
 {
     if (!in) return;

@@ -7398,7 +9200,7 @@ static inline void convert_VkDebugMarkerObjectTagInfoEXT_win64_to_host(const VkD
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDebugMarkerObjectTagInfoEXT_win32_to_host(const VkDebugMarkerObjectTagInfoEXT *in, VkDebugMarkerObjectTagInfoEXT_host *out)
+static inline void convert_VkDebugMarkerObjectTagInfoEXT_win32_to_host(const VkDebugMarkerObjectTagInfoEXT32 *in, VkDebugMarkerObjectTagInfoEXT_host *out)
 {
     if (!in) return;

@@ -7413,7 +9215,7 @@ static inline void convert_VkDebugMarkerObjectTagInfoEXT_win32_to_host(const VkD
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMappedMemoryRange_win32_to_host(const VkMappedMemoryRange *in, VkMappedMemoryRange_host *out)
+static inline void convert_VkMappedMemoryRange_win32_to_host(const VkMappedMemoryRange32 *in, VkMappedMemoryRange_host *out)
 {
     if (!in) return;

@@ -7426,7 +9228,7 @@ static inline void convert_VkMappedMemoryRange_win32_to_host(const VkMappedMemor
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkMappedMemoryRange_host *convert_VkMappedMemoryRange_array_win32_to_host(struct conversion_context *ctx, const VkMappedMemoryRange *in, uint32_t count)
+static inline const VkMappedMemoryRange_host *convert_VkMappedMemoryRange_array_win32_to_host(struct conversion_context *ctx, const VkMappedMemoryRange32 *in, uint32_t count)
 {
     VkMappedMemoryRange_host *out;
     unsigned int i;
@@ -7444,7 +9246,7 @@ static inline const VkMappedMemoryRange_host *convert_VkMappedMemoryRange_array_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureBuildSizesInfoKHR_win32_to_host(const VkAccelerationStructureBuildSizesInfoKHR *in, VkAccelerationStructureBuildSizesInfoKHR_host *out)
+static inline void convert_VkAccelerationStructureBuildSizesInfoKHR_win32_to_host(const VkAccelerationStructureBuildSizesInfoKHR32 *in, VkAccelerationStructureBuildSizesInfoKHR_host *out)
 {
     if (!in) return;

@@ -7457,7 +9259,7 @@ static inline void convert_VkAccelerationStructureBuildSizesInfoKHR_win32_to_hos
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureBuildSizesInfoKHR_host_to_win32(const VkAccelerationStructureBuildSizesInfoKHR_host *in, VkAccelerationStructureBuildSizesInfoKHR *out)
+static inline void convert_VkAccelerationStructureBuildSizesInfoKHR_host_to_win32(const VkAccelerationStructureBuildSizesInfoKHR_host *in, VkAccelerationStructureBuildSizesInfoKHR32 *out)
 {
     if (!in) return;

@@ -7468,7 +9270,7 @@ static inline void convert_VkAccelerationStructureBuildSizesInfoKHR_host_to_win3
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureDeviceAddressInfoKHR_win32_to_host(const VkAccelerationStructureDeviceAddressInfoKHR *in, VkAccelerationStructureDeviceAddressInfoKHR_host *out)
+static inline void convert_VkAccelerationStructureDeviceAddressInfoKHR_win32_to_host(const VkAccelerationStructureDeviceAddressInfoKHR32 *in, VkAccelerationStructureDeviceAddressInfoKHR_host *out)
 {
     if (!in) return;

@@ -7479,7 +9281,7 @@ static inline void convert_VkAccelerationStructureDeviceAddressInfoKHR_win32_to_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureMemoryRequirementsInfoNV_win32_to_host(const VkAccelerationStructureMemoryRequirementsInfoNV *in, VkAccelerationStructureMemoryRequirementsInfoNV_host *out)
+static inline void convert_VkAccelerationStructureMemoryRequirementsInfoNV_win32_to_host(const VkAccelerationStructureMemoryRequirementsInfoNV32 *in, VkAccelerationStructureMemoryRequirementsInfoNV_host *out)
 {
     if (!in) return;

@@ -7491,7 +9293,7 @@ static inline void convert_VkAccelerationStructureMemoryRequirementsInfoNV_win32
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryRequirements_host_to_win32(const VkMemoryRequirements_host *in, VkMemoryRequirements *out)
+static inline void convert_VkMemoryRequirements_host_to_win32(const VkMemoryRequirements_host *in, VkMemoryRequirements32 *out)
 {
     if (!in) return;

@@ -7502,7 +9304,7 @@ static inline void convert_VkMemoryRequirements_host_to_win32(const VkMemoryRequ
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryRequirements2KHR_win32_to_host(const VkMemoryRequirements2KHR *in, VkMemoryRequirements2KHR_host *out)
+static inline void convert_VkMemoryRequirements2KHR_win32_to_host(const VkMemoryRequirements2KHR32 *in, VkMemoryRequirements2KHR_host *out)
 {
     if (!in) return;

@@ -7512,7 +9314,7 @@ static inline void convert_VkMemoryRequirements2KHR_win32_to_host(const VkMemory
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryRequirements2KHR_host_to_win32(const VkMemoryRequirements2KHR_host *in, VkMemoryRequirements2KHR *out)
+static inline void convert_VkMemoryRequirements2KHR_host_to_win32(const VkMemoryRequirements2KHR_host *in, VkMemoryRequirements2KHR32 *out)
 {
     if (!in) return;

@@ -7521,7 +9323,7 @@ static inline void convert_VkMemoryRequirements2KHR_host_to_win32(const VkMemory
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferDeviceAddressInfo_win32_to_host(const VkBufferDeviceAddressInfo *in, VkBufferDeviceAddressInfo_host *out)
+static inline void convert_VkBufferDeviceAddressInfo_win32_to_host(const VkBufferDeviceAddressInfo32 *in, VkBufferDeviceAddressInfo_host *out)
 {
     if (!in) return;

@@ -7532,7 +9334,7 @@ static inline void convert_VkBufferDeviceAddressInfo_win32_to_host(const VkBuffe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferMemoryRequirementsInfo2_win32_to_host(const VkBufferMemoryRequirementsInfo2 *in, VkBufferMemoryRequirementsInfo2_host *out)
+static inline void convert_VkBufferMemoryRequirementsInfo2_win32_to_host(const VkBufferMemoryRequirementsInfo232 *in, VkBufferMemoryRequirementsInfo2_host *out)
 {
     if (!in) return;

@@ -7543,7 +9345,7 @@ static inline void convert_VkBufferMemoryRequirementsInfo2_win32_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryRequirements2_win32_to_host(const VkMemoryRequirements2 *in, VkMemoryRequirements2_host *out)
+static inline void convert_VkMemoryRequirements2_win32_to_host(const VkMemoryRequirements232 *in, VkMemoryRequirements2_host *out)
 {
     if (!in) return;

@@ -7553,7 +9355,7 @@ static inline void convert_VkMemoryRequirements2_win32_to_host(const VkMemoryReq
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryRequirements2_host_to_win32(const VkMemoryRequirements2_host *in, VkMemoryRequirements2 *out)
+static inline void convert_VkMemoryRequirements2_host_to_win32(const VkMemoryRequirements2_host *in, VkMemoryRequirements232 *out)
 {
     if (!in) return;

@@ -7562,7 +9364,7 @@ static inline void convert_VkMemoryRequirements2_host_to_win32(const VkMemoryReq
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDescriptorSetBindingReferenceVALVE_win32_to_host(const VkDescriptorSetBindingReferenceVALVE *in, VkDescriptorSetBindingReferenceVALVE_host *out)
+static inline void convert_VkDescriptorSetBindingReferenceVALVE_win32_to_host(const VkDescriptorSetBindingReferenceVALVE32 *in, VkDescriptorSetBindingReferenceVALVE_host *out)
 {
     if (!in) return;

@@ -7574,7 +9376,7 @@ static inline void convert_VkDescriptorSetBindingReferenceVALVE_win32_to_host(co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferCreateInfo_host *convert_VkBufferCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkBufferCreateInfo *in, uint32_t count)
+static inline const VkBufferCreateInfo_host *convert_VkBufferCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkBufferCreateInfo32 *in, uint32_t count)
 {
     VkBufferCreateInfo_host *out;
     unsigned int i;
@@ -7592,7 +9394,7 @@ static inline const VkBufferCreateInfo_host *convert_VkBufferCreateInfo_array_wi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceBufferMemoryRequirements_win32_to_host(struct conversion_context *ctx, const VkDeviceBufferMemoryRequirements *in, VkDeviceBufferMemoryRequirements_host *out)
+static inline void convert_VkDeviceBufferMemoryRequirements_win32_to_host(struct conversion_context *ctx, const VkDeviceBufferMemoryRequirements32 *in, VkDeviceBufferMemoryRequirements_host *out)
 {
     if (!in) return;

@@ -7603,7 +9405,7 @@ static inline void convert_VkDeviceBufferMemoryRequirements_win32_to_host(struct
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultCountsEXT_win32_to_host(const VkDeviceFaultCountsEXT *in, VkDeviceFaultCountsEXT_host *out)
+static inline void convert_VkDeviceFaultCountsEXT_win32_to_host(const VkDeviceFaultCountsEXT32 *in, VkDeviceFaultCountsEXT_host *out)
 {
     if (!in) return;

@@ -7616,7 +9418,7 @@ static inline void convert_VkDeviceFaultCountsEXT_win32_to_host(const VkDeviceFa
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultCountsEXT_host_to_win32(const VkDeviceFaultCountsEXT_host *in, VkDeviceFaultCountsEXT *out)
+static inline void convert_VkDeviceFaultCountsEXT_host_to_win32(const VkDeviceFaultCountsEXT_host *in, VkDeviceFaultCountsEXT32 *out)
 {
     if (!in) return;

@@ -7627,7 +9429,7 @@ static inline void convert_VkDeviceFaultCountsEXT_host_to_win32(const VkDeviceFa
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultAddressInfoEXT_win32_to_host(const VkDeviceFaultAddressInfoEXT *in, VkDeviceFaultAddressInfoEXT_host *out)
+static inline void convert_VkDeviceFaultAddressInfoEXT_win32_to_host(const VkDeviceFaultAddressInfoEXT32 *in, VkDeviceFaultAddressInfoEXT_host *out)
 {
     if (!in) return;

@@ -7638,7 +9440,7 @@ static inline void convert_VkDeviceFaultAddressInfoEXT_win32_to_host(const VkDev
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultAddressInfoEXT_host_to_win32(const VkDeviceFaultAddressInfoEXT_host *in, VkDeviceFaultAddressInfoEXT *out)
+static inline void convert_VkDeviceFaultAddressInfoEXT_host_to_win32(const VkDeviceFaultAddressInfoEXT_host *in, VkDeviceFaultAddressInfoEXT32 *out)
 {
     if (!in) return;

@@ -7649,7 +9451,7 @@ static inline void convert_VkDeviceFaultAddressInfoEXT_host_to_win32(const VkDev
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkDeviceFaultAddressInfoEXT_host *convert_VkDeviceFaultAddressInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultAddressInfoEXT *in, uint32_t count)
+static inline VkDeviceFaultAddressInfoEXT_host *convert_VkDeviceFaultAddressInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultAddressInfoEXT32 *in, uint32_t count)
 {
     VkDeviceFaultAddressInfoEXT_host *out;
     unsigned int i;
@@ -7667,7 +9469,7 @@ static inline VkDeviceFaultAddressInfoEXT_host *convert_VkDeviceFaultAddressInfo
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultAddressInfoEXT_array_host_to_win32(const VkDeviceFaultAddressInfoEXT_host *in, VkDeviceFaultAddressInfoEXT *out, uint32_t count)
+static inline void convert_VkDeviceFaultAddressInfoEXT_array_host_to_win32(const VkDeviceFaultAddressInfoEXT_host *in, VkDeviceFaultAddressInfoEXT32 *out, uint32_t count)
 {
     unsigned int i;

@@ -7681,7 +9483,7 @@ static inline void convert_VkDeviceFaultAddressInfoEXT_array_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultVendorInfoEXT_win32_to_host(const VkDeviceFaultVendorInfoEXT *in, VkDeviceFaultVendorInfoEXT_host *out)
+static inline void convert_VkDeviceFaultVendorInfoEXT_win32_to_host(const VkDeviceFaultVendorInfoEXT32 *in, VkDeviceFaultVendorInfoEXT_host *out)
 {
     if (!in) return;

@@ -7692,7 +9494,7 @@ static inline void convert_VkDeviceFaultVendorInfoEXT_win32_to_host(const VkDevi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultVendorInfoEXT_host_to_win32(const VkDeviceFaultVendorInfoEXT_host *in, VkDeviceFaultVendorInfoEXT *out)
+static inline void convert_VkDeviceFaultVendorInfoEXT_host_to_win32(const VkDeviceFaultVendorInfoEXT_host *in, VkDeviceFaultVendorInfoEXT32 *out)
 {
     if (!in) return;

@@ -7703,7 +9505,7 @@ static inline void convert_VkDeviceFaultVendorInfoEXT_host_to_win32(const VkDevi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkDeviceFaultVendorInfoEXT_host *convert_VkDeviceFaultVendorInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultVendorInfoEXT *in, uint32_t count)
+static inline VkDeviceFaultVendorInfoEXT_host *convert_VkDeviceFaultVendorInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultVendorInfoEXT32 *in, uint32_t count)
 {
     VkDeviceFaultVendorInfoEXT_host *out;
     unsigned int i;
@@ -7721,7 +9523,7 @@ static inline VkDeviceFaultVendorInfoEXT_host *convert_VkDeviceFaultVendorInfoEX
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultVendorInfoEXT_array_host_to_win32(const VkDeviceFaultVendorInfoEXT_host *in, VkDeviceFaultVendorInfoEXT *out, uint32_t count)
+static inline void convert_VkDeviceFaultVendorInfoEXT_array_host_to_win32(const VkDeviceFaultVendorInfoEXT_host *in, VkDeviceFaultVendorInfoEXT32 *out, uint32_t count)
 {
     unsigned int i;

@@ -7735,7 +9537,7 @@ static inline void convert_VkDeviceFaultVendorInfoEXT_array_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultInfoEXT_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultInfoEXT *in, VkDeviceFaultInfoEXT_host *out)
+static inline void convert_VkDeviceFaultInfoEXT_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultInfoEXT32 *in, VkDeviceFaultInfoEXT_host *out)
 {
     if (!in) return;

@@ -7749,7 +9551,7 @@ static inline void convert_VkDeviceFaultInfoEXT_win32_to_host(struct conversion_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultInfoEXT_host_to_win32(const VkDeviceFaultInfoEXT_host *in, VkDeviceFaultInfoEXT *out)
+static inline void convert_VkDeviceFaultInfoEXT_host_to_win32(const VkDeviceFaultInfoEXT_host *in, VkDeviceFaultInfoEXT32 *out)
 {
     if (!in) return;

@@ -7791,7 +9593,7 @@ static inline void convert_VkDeviceImageMemoryRequirements_win32_to_host(struct
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryRequirements_host_to_win32(const VkSparseImageMemoryRequirements_host *in, VkSparseImageMemoryRequirements *out)
+static inline void convert_VkSparseImageMemoryRequirements_host_to_win32(const VkSparseImageMemoryRequirements_host *in, VkSparseImageMemoryRequirements32 *out)
 {
     if (!in) return;

@@ -7804,7 +9606,7 @@ static inline void convert_VkSparseImageMemoryRequirements_host_to_win32(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryRequirements2_win32_to_host(const VkSparseImageMemoryRequirements2 *in, VkSparseImageMemoryRequirements2_host *out)
+static inline void convert_VkSparseImageMemoryRequirements2_win32_to_host(const VkSparseImageMemoryRequirements232 *in, VkSparseImageMemoryRequirements2_host *out)
 {
     if (!in) return;

@@ -7814,7 +9616,7 @@ static inline void convert_VkSparseImageMemoryRequirements2_win32_to_host(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryRequirements2_host_to_win32(const VkSparseImageMemoryRequirements2_host *in, VkSparseImageMemoryRequirements2 *out)
+static inline void convert_VkSparseImageMemoryRequirements2_host_to_win32(const VkSparseImageMemoryRequirements2_host *in, VkSparseImageMemoryRequirements232 *out)
 {
     if (!in) return;

@@ -7823,7 +9625,7 @@ static inline void convert_VkSparseImageMemoryRequirements2_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkSparseImageMemoryRequirements2_host *convert_VkSparseImageMemoryRequirements2_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryRequirements2 *in, uint32_t count)
+static inline VkSparseImageMemoryRequirements2_host *convert_VkSparseImageMemoryRequirements2_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryRequirements232 *in, uint32_t count)
 {
     VkSparseImageMemoryRequirements2_host *out;
     unsigned int i;
@@ -7841,7 +9643,7 @@ static inline VkSparseImageMemoryRequirements2_host *convert_VkSparseImageMemory
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryRequirements2_array_host_to_win32(const VkSparseImageMemoryRequirements2_host *in, VkSparseImageMemoryRequirements2 *out, uint32_t count)
+static inline void convert_VkSparseImageMemoryRequirements2_array_host_to_win32(const VkSparseImageMemoryRequirements2_host *in, VkSparseImageMemoryRequirements232 *out, uint32_t count)
 {
     unsigned int i;

@@ -7855,7 +9657,7 @@ static inline void convert_VkSparseImageMemoryRequirements2_array_host_to_win32(
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win32_to_host(const VkDeviceMemoryOpaqueCaptureAddressInfo *in, VkDeviceMemoryOpaqueCaptureAddressInfo_host *out)
+static inline void convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win32_to_host(const VkDeviceMemoryOpaqueCaptureAddressInfo32 *in, VkDeviceMemoryOpaqueCaptureAddressInfo_host *out)
 {
     if (!in) return;

@@ -7866,7 +9668,7 @@ static inline void convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win32_to_host(
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGeneratedCommandsMemoryRequirementsInfoNV_win32_to_host(const VkGeneratedCommandsMemoryRequirementsInfoNV *in, VkGeneratedCommandsMemoryRequirementsInfoNV_host *out)
+static inline void convert_VkGeneratedCommandsMemoryRequirementsInfoNV_win32_to_host(const VkGeneratedCommandsMemoryRequirementsInfoNV32 *in, VkGeneratedCommandsMemoryRequirementsInfoNV_host *out)
 {
     if (!in) return;

@@ -7880,7 +9682,7 @@ static inline void convert_VkGeneratedCommandsMemoryRequirementsInfoNV_win32_to_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageMemoryRequirementsInfo2_win32_to_host(const VkImageMemoryRequirementsInfo2 *in, VkImageMemoryRequirementsInfo2_host *out)
+static inline void convert_VkImageMemoryRequirementsInfo2_win32_to_host(const VkImageMemoryRequirementsInfo232 *in, VkImageMemoryRequirementsInfo2_host *out)
 {
     if (!in) return;

@@ -7891,7 +9693,7 @@ static inline void convert_VkImageMemoryRequirementsInfo2_win32_to_host(const Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryRequirements_array_host_to_win32(const VkSparseImageMemoryRequirements_host *in, VkSparseImageMemoryRequirements *out, uint32_t count)
+static inline void convert_VkSparseImageMemoryRequirements_array_host_to_win32(const VkSparseImageMemoryRequirements_host *in, VkSparseImageMemoryRequirements32 *out, uint32_t count)
 {
     unsigned int i;

@@ -7905,7 +9707,7 @@ static inline void convert_VkSparseImageMemoryRequirements_array_host_to_win32(c
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageSparseMemoryRequirementsInfo2_win32_to_host(const VkImageSparseMemoryRequirementsInfo2 *in, VkImageSparseMemoryRequirementsInfo2_host *out)
+static inline void convert_VkImageSparseMemoryRequirementsInfo2_win32_to_host(const VkImageSparseMemoryRequirementsInfo232 *in, VkImageSparseMemoryRequirementsInfo2_host *out)
 {
     if (!in) return;

@@ -7916,7 +9718,7 @@ static inline void convert_VkImageSparseMemoryRequirementsInfo2_win32_to_host(co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSubresourceLayout_host_to_win32(const VkSubresourceLayout_host *in, VkSubresourceLayout *out)
+static inline void convert_VkSubresourceLayout_host_to_win32(const VkSubresourceLayout_host *in, VkSubresourceLayout32 *out)
 {
     if (!in) return;

@@ -7929,7 +9731,7 @@ static inline void convert_VkSubresourceLayout_host_to_win32(const VkSubresource
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSubresourceLayout2EXT_win32_to_host(const VkSubresourceLayout2EXT *in, VkSubresourceLayout2EXT_host *out)
+static inline void convert_VkSubresourceLayout2EXT_win32_to_host(const VkSubresourceLayout2EXT32 *in, VkSubresourceLayout2EXT_host *out)
 {
     if (!in) return;

@@ -7939,7 +9741,7 @@ static inline void convert_VkSubresourceLayout2EXT_win32_to_host(const VkSubreso
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSubresourceLayout2EXT_host_to_win32(const VkSubresourceLayout2EXT_host *in, VkSubresourceLayout2EXT *out)
+static inline void convert_VkSubresourceLayout2EXT_host_to_win32(const VkSubresourceLayout2EXT_host *in, VkSubresourceLayout2EXT32 *out)
 {
     if (!in) return;

@@ -7948,7 +9750,7 @@ static inline void convert_VkSubresourceLayout2EXT_host_to_win32(const VkSubreso
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageViewAddressPropertiesNVX_win32_to_host(const VkImageViewAddressPropertiesNVX *in, VkImageViewAddressPropertiesNVX_host *out)
+static inline void convert_VkImageViewAddressPropertiesNVX_win32_to_host(const VkImageViewAddressPropertiesNVX32 *in, VkImageViewAddressPropertiesNVX_host *out)
 {
     if (!in) return;

@@ -7958,7 +9760,7 @@ static inline void convert_VkImageViewAddressPropertiesNVX_win32_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageViewAddressPropertiesNVX_host_to_win32(const VkImageViewAddressPropertiesNVX_host *in, VkImageViewAddressPropertiesNVX *out)
+static inline void convert_VkImageViewAddressPropertiesNVX_host_to_win32(const VkImageViewAddressPropertiesNVX_host *in, VkImageViewAddressPropertiesNVX32 *out)
 {
     if (!in) return;

@@ -7968,7 +9770,7 @@ static inline void convert_VkImageViewAddressPropertiesNVX_host_to_win32(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageViewHandleInfoNVX_win32_to_host(const VkImageViewHandleInfoNVX *in, VkImageViewHandleInfoNVX_host *out)
+static inline void convert_VkImageViewHandleInfoNVX_win32_to_host(const VkImageViewHandleInfoNVX32 *in, VkImageViewHandleInfoNVX_host *out)
 {
     if (!in) return;

@@ -7981,7 +9783,7 @@ static inline void convert_VkImageViewHandleInfoNVX_win32_to_host(const VkImageV
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMicromapBuildSizesInfoEXT_win32_to_host(const VkMicromapBuildSizesInfoEXT *in, VkMicromapBuildSizesInfoEXT_host *out)
+static inline void convert_VkMicromapBuildSizesInfoEXT_win32_to_host(const VkMicromapBuildSizesInfoEXT32 *in, VkMicromapBuildSizesInfoEXT_host *out)
 {
     if (!in) return;

@@ -7994,7 +9796,7 @@ static inline void convert_VkMicromapBuildSizesInfoEXT_win32_to_host(const VkMic
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMicromapBuildSizesInfoEXT_host_to_win32(const VkMicromapBuildSizesInfoEXT_host *in, VkMicromapBuildSizesInfoEXT *out)
+static inline void convert_VkMicromapBuildSizesInfoEXT_host_to_win32(const VkMicromapBuildSizesInfoEXT_host *in, VkMicromapBuildSizesInfoEXT32 *out)
 {
     if (!in) return;

@@ -8005,7 +9807,7 @@ static inline void convert_VkMicromapBuildSizesInfoEXT_host_to_win32(const VkMic
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPerformanceValueINTEL_win32_to_host(const VkPerformanceValueINTEL *in, VkPerformanceValueINTEL_host *out)
+static inline void convert_VkPerformanceValueINTEL_win32_to_host(const VkPerformanceValueINTEL32 *in, VkPerformanceValueINTEL_host *out)
 {
     if (!in) return;

@@ -8015,7 +9817,7 @@ static inline void convert_VkPerformanceValueINTEL_win32_to_host(const VkPerform
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPerformanceValueINTEL_host_to_win32(const VkPerformanceValueINTEL_host *in, VkPerformanceValueINTEL *out)
+static inline void convert_VkPerformanceValueINTEL_host_to_win32(const VkPerformanceValueINTEL_host *in, VkPerformanceValueINTEL32 *out)
 {
     if (!in) return;

@@ -8043,7 +9845,7 @@ static inline void convert_VkPhysicalDeviceExternalSemaphoreInfo_win32_to_host(s
         case VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO:
         {
             VkSemaphoreTypeCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkSemaphoreTypeCreateInfo *in_ext = (const VkSemaphoreTypeCreateInfo *)in_header;
+            const VkSemaphoreTypeCreateInfo32 *in_ext = (const VkSemaphoreTypeCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO;
             out_ext->pNext = NULL;
             out_ext->semaphoreType = in_ext->semaphoreType;
@@ -8061,7 +9863,7 @@ static inline void convert_VkPhysicalDeviceExternalSemaphoreInfo_win32_to_host(s
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageFormatProperties_host_to_win32(const VkImageFormatProperties_host *in, VkImageFormatProperties *out)
+static inline void convert_VkImageFormatProperties_host_to_win32(const VkImageFormatProperties_host *in, VkImageFormatProperties32 *out)
 {
     if (!in) return;

@@ -8074,7 +9876,7 @@ static inline void convert_VkImageFormatProperties_host_to_win32(const VkImageFo
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageFormatProperties2_win32_to_host(const VkImageFormatProperties2 *in, VkImageFormatProperties2_host *out)
+static inline void convert_VkImageFormatProperties2_win32_to_host(const VkImageFormatProperties232 *in, VkImageFormatProperties2_host *out)
 {
     if (!in) return;

@@ -8084,7 +9886,7 @@ static inline void convert_VkImageFormatProperties2_win32_to_host(const VkImageF
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageFormatProperties2_host_to_win32(const VkImageFormatProperties2_host *in, VkImageFormatProperties2 *out)
+static inline void convert_VkImageFormatProperties2_host_to_win32(const VkImageFormatProperties2_host *in, VkImageFormatProperties232 *out)
 {
     if (!in) return;

@@ -8093,7 +9895,7 @@ static inline void convert_VkImageFormatProperties2_host_to_win32(const VkImageF
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryHeap_host_to_win32(const VkMemoryHeap_host *in, VkMemoryHeap *out)
+static inline void convert_VkMemoryHeap_host_to_win32(const VkMemoryHeap_host *in, VkMemoryHeap32 *out)
 {
     if (!in) return;

@@ -8103,7 +9905,7 @@ static inline void convert_VkMemoryHeap_host_to_win32(const VkMemoryHeap_host *i
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryHeap_array_host_to_win32(const VkMemoryHeap_host *in, VkMemoryHeap *out, uint32_t count)
+static inline void convert_VkMemoryHeap_array_host_to_win32(const VkMemoryHeap_host *in, VkMemoryHeap32 *out, uint32_t count)
 {
     unsigned int i;

@@ -8117,7 +9919,7 @@ static inline void convert_VkMemoryHeap_array_host_to_win32(const VkMemoryHeap_h
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win32(const VkPhysicalDeviceMemoryProperties_host *in, VkPhysicalDeviceMemoryProperties *out)
+static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win32(const VkPhysicalDeviceMemoryProperties_host *in, VkPhysicalDeviceMemoryProperties32 *out)
 {
     if (!in) return;

@@ -8129,7 +9931,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceMemoryProperties2_win32_to_host(struct conversion_context *ctx, const VkPhysicalDeviceMemoryProperties2 *in, VkPhysicalDeviceMemoryProperties2_host *out)
+static inline void convert_VkPhysicalDeviceMemoryProperties2_win32_to_host(struct conversion_context *ctx, const VkPhysicalDeviceMemoryProperties232 *in, VkPhysicalDeviceMemoryProperties2_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -8161,7 +9963,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties2_win32_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceMemoryProperties2_host_to_win32(const VkPhysicalDeviceMemoryProperties2_host *in, VkPhysicalDeviceMemoryProperties2 *out)
+static inline void convert_VkPhysicalDeviceMemoryProperties2_host_to_win32(const VkPhysicalDeviceMemoryProperties2_host *in, VkPhysicalDeviceMemoryProperties232 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -8176,7 +9978,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties2_host_to_win32(const
         {
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT:
         {
-            VkPhysicalDeviceMemoryBudgetPropertiesEXT *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT);
+            VkPhysicalDeviceMemoryBudgetPropertiesEXT32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT);
             const VkPhysicalDeviceMemoryBudgetPropertiesEXT_host *in_ext = (const VkPhysicalDeviceMemoryBudgetPropertiesEXT_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT;
             memcpy(out_ext->heapBudget, in_ext->heapBudget, VK_MAX_MEMORY_HEAPS * sizeof(VkDeviceSize));
@@ -8192,7 +9994,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties2_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceLimits_host_to_win32(const VkPhysicalDeviceLimits_host *in, VkPhysicalDeviceLimits *out)
+static inline void convert_VkPhysicalDeviceLimits_host_to_win32(const VkPhysicalDeviceLimits_host *in, VkPhysicalDeviceLimits32 *out)
 {
     if (!in) return;

@@ -8306,7 +10108,7 @@ static inline void convert_VkPhysicalDeviceLimits_host_to_win32(const VkPhysical
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceProperties_host_to_win32(const VkPhysicalDeviceProperties_host *in, VkPhysicalDeviceProperties *out)
+static inline void convert_VkPhysicalDeviceProperties_host_to_win32(const VkPhysicalDeviceProperties_host *in, VkPhysicalDeviceProperties32 *out)
 {
     if (!in) return;

@@ -8323,7 +10125,7 @@ static inline void convert_VkPhysicalDeviceProperties_host_to_win32(const VkPhys
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conversion_context *ctx, const VkPhysicalDeviceProperties2 *in, VkPhysicalDeviceProperties2_host *out)
+static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conversion_context *ctx, const VkPhysicalDeviceProperties232 *in, VkPhysicalDeviceProperties2_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -8929,7 +10731,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhysicalDeviceProperties2_host *in, VkPhysicalDeviceProperties2 *out)
+static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhysicalDeviceProperties2_host *in, VkPhysicalDeviceProperties232 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -9103,7 +10905,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES:
         {
-            VkPhysicalDeviceMaintenance3Properties *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES);
+            VkPhysicalDeviceMaintenance3Properties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES);
             const VkPhysicalDeviceMaintenance3Properties_host *in_ext = (const VkPhysicalDeviceMaintenance3Properties_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES;
             out_ext->maxPerSetDescriptors = in_ext->maxPerSetDescriptors;
@@ -9113,7 +10915,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES:
         {
-            VkPhysicalDeviceMaintenance4Properties *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES);
+            VkPhysicalDeviceMaintenance4Properties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES);
             const VkPhysicalDeviceMaintenance4Properties_host *in_ext = (const VkPhysicalDeviceMaintenance4Properties_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES;
             out_ext->maxBufferSize = in_ext->maxBufferSize;
@@ -9147,7 +10949,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT:
         {
-            VkPhysicalDeviceExternalMemoryHostPropertiesEXT *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT);
+            VkPhysicalDeviceExternalMemoryHostPropertiesEXT32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT);
             const VkPhysicalDeviceExternalMemoryHostPropertiesEXT_host *in_ext = (const VkPhysicalDeviceExternalMemoryHostPropertiesEXT_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT;
             out_ext->minImportedHostPointerAlignment = in_ext->minImportedHostPointerAlignment;
@@ -9236,7 +11038,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES:
         {
-            VkPhysicalDeviceTimelineSemaphoreProperties *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES);
+            VkPhysicalDeviceTimelineSemaphoreProperties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES);
             const VkPhysicalDeviceTimelineSemaphoreProperties_host *in_ext = (const VkPhysicalDeviceTimelineSemaphoreProperties_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES;
             out_ext->maxTimelineSemaphoreValueDifference = in_ext->maxTimelineSemaphoreValueDifference;
@@ -9278,7 +11080,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT:
         {
-            VkPhysicalDeviceTransformFeedbackPropertiesEXT *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT);
+            VkPhysicalDeviceTransformFeedbackPropertiesEXT32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT);
             const VkPhysicalDeviceTransformFeedbackPropertiesEXT_host *in_ext = (const VkPhysicalDeviceTransformFeedbackPropertiesEXT_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT;
             out_ext->maxTransformFeedbackStreams = in_ext->maxTransformFeedbackStreams;
@@ -9305,7 +11107,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV:
         {
-            VkPhysicalDeviceMemoryDecompressionPropertiesNV *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV);
+            VkPhysicalDeviceMemoryDecompressionPropertiesNV32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV);
             const VkPhysicalDeviceMemoryDecompressionPropertiesNV_host *in_ext = (const VkPhysicalDeviceMemoryDecompressionPropertiesNV_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV;
             out_ext->decompressionMethods = in_ext->decompressionMethods;
@@ -9383,7 +11185,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR:
         {
-            VkPhysicalDeviceAccelerationStructurePropertiesKHR *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR);
+            VkPhysicalDeviceAccelerationStructurePropertiesKHR32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR);
             const VkPhysicalDeviceAccelerationStructurePropertiesKHR_host *in_ext = (const VkPhysicalDeviceAccelerationStructurePropertiesKHR_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR;
             out_ext->maxGeometryCount = in_ext->maxGeometryCount;
@@ -9415,7 +11217,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV:
         {
-            VkPhysicalDeviceRayTracingPropertiesNV *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV);
+            VkPhysicalDeviceRayTracingPropertiesNV32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV);
             const VkPhysicalDeviceRayTracingPropertiesNV_host *in_ext = (const VkPhysicalDeviceRayTracingPropertiesNV_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV;
             out_ext->shaderGroupHandleSize = in_ext->shaderGroupHandleSize;
@@ -9491,7 +11293,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES:
         {
-            VkPhysicalDeviceTexelBufferAlignmentProperties *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES);
+            VkPhysicalDeviceTexelBufferAlignmentProperties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES);
             const VkPhysicalDeviceTexelBufferAlignmentProperties_host *in_ext = (const VkPhysicalDeviceTexelBufferAlignmentProperties_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES;
             out_ext->storageTexelBufferOffsetAlignmentBytes = in_ext->storageTexelBufferOffsetAlignmentBytes;
@@ -9533,7 +11335,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES:
         {
-            VkPhysicalDeviceVulkan11Properties *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES);
+            VkPhysicalDeviceVulkan11Properties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES);
             const VkPhysicalDeviceVulkan11Properties_host *in_ext = (const VkPhysicalDeviceVulkan11Properties_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES;
             memcpy(out_ext->deviceUUID, in_ext->deviceUUID, VK_UUID_SIZE * sizeof(uint8_t));
@@ -9556,7 +11358,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES:
         {
-            VkPhysicalDeviceVulkan12Properties *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES);
+            VkPhysicalDeviceVulkan12Properties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES);
             const VkPhysicalDeviceVulkan12Properties_host *in_ext = (const VkPhysicalDeviceVulkan12Properties_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES;
             out_ext->driverID = in_ext->driverID;
@@ -9616,7 +11418,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES:
         {
-            VkPhysicalDeviceVulkan13Properties *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES);
+            VkPhysicalDeviceVulkan13Properties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES);
             const VkPhysicalDeviceVulkan13Properties_host *in_ext = (const VkPhysicalDeviceVulkan13Properties_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES;
             out_ext->minSubgroupSize = in_ext->minSubgroupSize;
@@ -9687,7 +11489,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT:
         {
-            VkPhysicalDeviceRobustness2PropertiesEXT *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT);
+            VkPhysicalDeviceRobustness2PropertiesEXT32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT);
             const VkPhysicalDeviceRobustness2PropertiesEXT_host *in_ext = (const VkPhysicalDeviceRobustness2PropertiesEXT_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT;
             out_ext->robustStorageBufferAccessSizeAlignment = in_ext->robustStorageBufferAccessSizeAlignment;
@@ -9860,7 +11662,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM:
         {
-            VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM);
+            VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM);
             const VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM_host *in_ext = (const VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM_host *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM;
             out_ext->shaderCoreMask = in_ext->shaderCoreMask;
@@ -9886,7 +11688,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_unwrapped_host(const VkPhysicalDeviceSurfaceInfo2KHR *in, VkPhysicalDeviceSurfaceInfo2KHR_host *out)
+static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_unwrapped_host(const VkPhysicalDeviceSurfaceInfo2KHR32 *in, VkPhysicalDeviceSurfaceInfo2KHR_host *out)
 {
     if (!in) return;

@@ -9908,7 +11710,7 @@ static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win64_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(const VkPhysicalDeviceSurfaceInfo2KHR *in, VkPhysicalDeviceSurfaceInfo2KHR_host *out)
+static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(const VkPhysicalDeviceSurfaceInfo2KHR32 *in, VkPhysicalDeviceSurfaceInfo2KHR_host *out)
 {
     if (!in) return;

@@ -9919,7 +11721,7 @@ static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineExecutableInfoKHR_win32_to_host(const VkPipelineExecutableInfoKHR *in, VkPipelineExecutableInfoKHR_host *out)
+static inline void convert_VkPipelineExecutableInfoKHR_win32_to_host(const VkPipelineExecutableInfoKHR32 *in, VkPipelineExecutableInfoKHR_host *out)
 {
     if (!in) return;

@@ -9931,7 +11733,7 @@ static inline void convert_VkPipelineExecutableInfoKHR_win32_to_host(const VkPip
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineInfoKHR_win32_to_host(const VkPipelineInfoKHR *in, VkPipelineInfoKHR_host *out)
+static inline void convert_VkPipelineInfoKHR_win32_to_host(const VkPipelineInfoKHR32 *in, VkPipelineInfoKHR_host *out)
 {
     if (!in) return;

@@ -9942,7 +11744,7 @@ static inline void convert_VkPipelineInfoKHR_win32_to_host(const VkPipelineInfoK
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineExecutableStatisticKHR_win32_to_host(const VkPipelineExecutableStatisticKHR *in, VkPipelineExecutableStatisticKHR_host *out)
+static inline void convert_VkPipelineExecutableStatisticKHR_win32_to_host(const VkPipelineExecutableStatisticKHR32 *in, VkPipelineExecutableStatisticKHR_host *out)
 {
     if (!in) return;

@@ -9952,7 +11754,7 @@ static inline void convert_VkPipelineExecutableStatisticKHR_win32_to_host(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineExecutableStatisticKHR_host_to_win32(const VkPipelineExecutableStatisticKHR_host *in, VkPipelineExecutableStatisticKHR *out)
+static inline void convert_VkPipelineExecutableStatisticKHR_host_to_win32(const VkPipelineExecutableStatisticKHR_host *in, VkPipelineExecutableStatisticKHR32 *out)
 {
     if (!in) return;

@@ -9964,7 +11766,7 @@ static inline void convert_VkPipelineExecutableStatisticKHR_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkPipelineExecutableStatisticKHR_host *convert_VkPipelineExecutableStatisticKHR_array_win32_to_host(struct conversion_context *ctx, const VkPipelineExecutableStatisticKHR *in, uint32_t count)
+static inline VkPipelineExecutableStatisticKHR_host *convert_VkPipelineExecutableStatisticKHR_array_win32_to_host(struct conversion_context *ctx, const VkPipelineExecutableStatisticKHR32 *in, uint32_t count)
 {
     VkPipelineExecutableStatisticKHR_host *out;
     unsigned int i;
@@ -9982,7 +11784,7 @@ static inline VkPipelineExecutableStatisticKHR_host *convert_VkPipelineExecutabl
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineExecutableStatisticKHR_array_host_to_win32(const VkPipelineExecutableStatisticKHR_host *in, VkPipelineExecutableStatisticKHR *out, uint32_t count)
+static inline void convert_VkPipelineExecutableStatisticKHR_array_host_to_win32(const VkPipelineExecutableStatisticKHR_host *in, VkPipelineExecutableStatisticKHR32 *out, uint32_t count)
 {
     unsigned int i;

@@ -9996,7 +11798,7 @@ static inline void convert_VkPipelineExecutableStatisticKHR_array_host_to_win32(
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineInfoEXT_win32_to_host(const VkPipelineInfoEXT *in, VkPipelineInfoEXT_host *out)
+static inline void convert_VkPipelineInfoEXT_win32_to_host(const VkPipelineInfoEXT32 *in, VkPipelineInfoEXT_host *out)
 {
     if (!in) return;

@@ -10007,7 +11809,7 @@ static inline void convert_VkPipelineInfoEXT_win32_to_host(const VkPipelineInfoE
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseMemoryBind_win32_to_host(const VkSparseMemoryBind *in, VkSparseMemoryBind_host *out)
+static inline void convert_VkSparseMemoryBind_win32_to_host(const VkSparseMemoryBind32 *in, VkSparseMemoryBind_host *out)
 {
     if (!in) return;

@@ -10020,7 +11822,7 @@ static inline void convert_VkSparseMemoryBind_win32_to_host(const VkSparseMemory
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSparseMemoryBind_host *convert_VkSparseMemoryBind_array_win32_to_host(struct conversion_context *ctx, const VkSparseMemoryBind *in, uint32_t count)
+static inline const VkSparseMemoryBind_host *convert_VkSparseMemoryBind_array_win32_to_host(struct conversion_context *ctx, const VkSparseMemoryBind32 *in, uint32_t count)
 {
     VkSparseMemoryBind_host *out;
     unsigned int i;
@@ -10038,7 +11840,7 @@ static inline const VkSparseMemoryBind_host *convert_VkSparseMemoryBind_array_wi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseBufferMemoryBindInfo_win32_to_host(struct conversion_context *ctx, const VkSparseBufferMemoryBindInfo *in, VkSparseBufferMemoryBindInfo_host *out)
+static inline void convert_VkSparseBufferMemoryBindInfo_win32_to_host(struct conversion_context *ctx, const VkSparseBufferMemoryBindInfo32 *in, VkSparseBufferMemoryBindInfo_host *out)
 {
     if (!in) return;

@@ -10049,7 +11851,7 @@ static inline void convert_VkSparseBufferMemoryBindInfo_win32_to_host(struct con
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSparseBufferMemoryBindInfo_host *convert_VkSparseBufferMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseBufferMemoryBindInfo *in, uint32_t count)
+static inline const VkSparseBufferMemoryBindInfo_host *convert_VkSparseBufferMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseBufferMemoryBindInfo32 *in, uint32_t count)
 {
     VkSparseBufferMemoryBindInfo_host *out;
     unsigned int i;
@@ -10067,7 +11869,7 @@ static inline const VkSparseBufferMemoryBindInfo_host *convert_VkSparseBufferMem
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageOpaqueMemoryBindInfo_win32_to_host(struct conversion_context *ctx, const VkSparseImageOpaqueMemoryBindInfo *in, VkSparseImageOpaqueMemoryBindInfo_host *out)
+static inline void convert_VkSparseImageOpaqueMemoryBindInfo_win32_to_host(struct conversion_context *ctx, const VkSparseImageOpaqueMemoryBindInfo32 *in, VkSparseImageOpaqueMemoryBindInfo_host *out)
 {
     if (!in) return;

@@ -10078,7 +11880,7 @@ static inline void convert_VkSparseImageOpaqueMemoryBindInfo_win32_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSparseImageOpaqueMemoryBindInfo_host *convert_VkSparseImageOpaqueMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageOpaqueMemoryBindInfo *in, uint32_t count)
+static inline const VkSparseImageOpaqueMemoryBindInfo_host *convert_VkSparseImageOpaqueMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageOpaqueMemoryBindInfo32 *in, uint32_t count)
 {
     VkSparseImageOpaqueMemoryBindInfo_host *out;
     unsigned int i;
@@ -10096,7 +11898,7 @@ static inline const VkSparseImageOpaqueMemoryBindInfo_host *convert_VkSparseImag
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryBind_win32_to_host(const VkSparseImageMemoryBind *in, VkSparseImageMemoryBind_host *out)
+static inline void convert_VkSparseImageMemoryBind_win32_to_host(const VkSparseImageMemoryBind32 *in, VkSparseImageMemoryBind_host *out)
 {
     if (!in) return;

@@ -10110,7 +11912,7 @@ static inline void convert_VkSparseImageMemoryBind_win32_to_host(const VkSparseI
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSparseImageMemoryBind_host *convert_VkSparseImageMemoryBind_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBind *in, uint32_t count)
+static inline const VkSparseImageMemoryBind_host *convert_VkSparseImageMemoryBind_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBind32 *in, uint32_t count)
 {
     VkSparseImageMemoryBind_host *out;
     unsigned int i;
@@ -10128,7 +11930,7 @@ static inline const VkSparseImageMemoryBind_host *convert_VkSparseImageMemoryBin
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryBindInfo_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBindInfo *in, VkSparseImageMemoryBindInfo_host *out)
+static inline void convert_VkSparseImageMemoryBindInfo_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBindInfo32 *in, VkSparseImageMemoryBindInfo_host *out)
 {
     if (!in) return;

@@ -10139,7 +11941,7 @@ static inline void convert_VkSparseImageMemoryBindInfo_win32_to_host(struct conv
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSparseImageMemoryBindInfo_host *convert_VkSparseImageMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBindInfo *in, uint32_t count)
+static inline const VkSparseImageMemoryBindInfo_host *convert_VkSparseImageMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBindInfo32 *in, uint32_t count)
 {
     VkSparseImageMemoryBindInfo_host *out;
     unsigned int i;
@@ -10157,7 +11959,7 @@ static inline const VkSparseImageMemoryBindInfo_host *convert_VkSparseImageMemor
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBindSparseInfo_win32_to_host(struct conversion_context *ctx, const VkBindSparseInfo *in, VkBindSparseInfo_host *out)
+static inline void convert_VkBindSparseInfo_win32_to_host(struct conversion_context *ctx, const VkBindSparseInfo32 *in, VkBindSparseInfo_host *out)
 {
     if (!in) return;

@@ -10177,7 +11979,7 @@ static inline void convert_VkBindSparseInfo_win32_to_host(struct conversion_cont
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBindSparseInfo_host *convert_VkBindSparseInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindSparseInfo *in, uint32_t count)
+static inline const VkBindSparseInfo_host *convert_VkBindSparseInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindSparseInfo32 *in, uint32_t count)
 {
     VkBindSparseInfo_host *out;
     unsigned int i;
@@ -10265,7 +12067,7 @@ static inline const VkSubmitInfo *convert_VkSubmitInfo_array_win32_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSemaphoreSubmitInfo_win32_to_host(const VkSemaphoreSubmitInfo *in, VkSemaphoreSubmitInfo_host *out)
+static inline void convert_VkSemaphoreSubmitInfo_win32_to_host(const VkSemaphoreSubmitInfo32 *in, VkSemaphoreSubmitInfo_host *out)
 {
     if (!in) return;

@@ -10279,7 +12081,7 @@ static inline void convert_VkSemaphoreSubmitInfo_win32_to_host(const VkSemaphore
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSemaphoreSubmitInfo_host *convert_VkSemaphoreSubmitInfo_array_win32_to_host(struct conversion_context *ctx, const VkSemaphoreSubmitInfo *in, uint32_t count)
+static inline const VkSemaphoreSubmitInfo_host *convert_VkSemaphoreSubmitInfo_array_win32_to_host(struct conversion_context *ctx, const VkSemaphoreSubmitInfo32 *in, uint32_t count)
 {
     VkSemaphoreSubmitInfo_host *out;
     unsigned int i;
@@ -10374,7 +12176,7 @@ static inline void convert_VkSubmitInfo2_win64_to_host(struct conversion_context
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSubmitInfo2_win32_to_host(struct conversion_context *ctx, const VkSubmitInfo2 *in, VkSubmitInfo2_host *out)
+static inline void convert_VkSubmitInfo2_win32_to_host(struct conversion_context *ctx, const VkSubmitInfo232 *in, VkSubmitInfo2_host *out)
 {
     if (!in) return;

@@ -10409,7 +12211,7 @@ static inline const VkSubmitInfo2 *convert_VkSubmitInfo2_array_win64_to_host(str
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSubmitInfo2_host *convert_VkSubmitInfo2_array_win32_to_host(struct conversion_context *ctx, const VkSubmitInfo2 *in, uint32_t count)
+static inline const VkSubmitInfo2_host *convert_VkSubmitInfo2_array_win32_to_host(struct conversion_context *ctx, const VkSubmitInfo232 *in, uint32_t count)
 {
     VkSubmitInfo2_host *out;
     unsigned int i;
@@ -10440,7 +12242,7 @@ static inline void convert_VkDebugUtilsObjectNameInfoEXT_win64_to_host(const VkD
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDebugUtilsObjectNameInfoEXT_win32_to_host(const VkDebugUtilsObjectNameInfoEXT *in, VkDebugUtilsObjectNameInfoEXT_host *out)
+static inline void convert_VkDebugUtilsObjectNameInfoEXT_win32_to_host(const VkDebugUtilsObjectNameInfoEXT32 *in, VkDebugUtilsObjectNameInfoEXT_host *out)
 {
     if (!in) return;

@@ -10468,7 +12270,7 @@ static inline void convert_VkDebugUtilsObjectTagInfoEXT_win64_to_host(const VkDe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDebugUtilsObjectTagInfoEXT_win32_to_host(const VkDebugUtilsObjectTagInfoEXT *in, VkDebugUtilsObjectTagInfoEXT_host *out)
+static inline void convert_VkDebugUtilsObjectTagInfoEXT_win32_to_host(const VkDebugUtilsObjectTagInfoEXT32 *in, VkDebugUtilsObjectTagInfoEXT_host *out)
 {
     if (!in) return;

@@ -10483,7 +12285,7 @@ static inline void convert_VkDebugUtilsObjectTagInfoEXT_win32_to_host(const VkDe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSemaphoreSignalInfo_win32_to_host(const VkSemaphoreSignalInfo *in, VkSemaphoreSignalInfo_host *out)
+static inline void convert_VkSemaphoreSignalInfo_win32_to_host(const VkSemaphoreSignalInfo32 *in, VkSemaphoreSignalInfo_host *out)
 {
     if (!in) return;

@@ -10513,7 +12315,7 @@ static inline const VkDebugUtilsObjectNameInfoEXT *convert_VkDebugUtilsObjectNam
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkDebugUtilsObjectNameInfoEXT_host *convert_VkDebugUtilsObjectNameInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDebugUtilsObjectNameInfoEXT *in, uint32_t count)
+static inline const VkDebugUtilsObjectNameInfoEXT_host *convert_VkDebugUtilsObjectNameInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDebugUtilsObjectNameInfoEXT32 *in, uint32_t count)
 {
     VkDebugUtilsObjectNameInfoEXT_host *out;
     unsigned int i;
@@ -10551,7 +12353,7 @@ static inline void convert_VkDebugUtilsMessengerCallbackDataEXT_win64_to_host(st
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDebugUtilsMessengerCallbackDataEXT_win32_to_host(struct conversion_context *ctx, const VkDebugUtilsMessengerCallbackDataEXT *in, VkDebugUtilsMessengerCallbackDataEXT_host *out)
+static inline void convert_VkDebugUtilsMessengerCallbackDataEXT_win32_to_host(struct conversion_context *ctx, const VkDebugUtilsMessengerCallbackDataEXT32 *in, VkDebugUtilsMessengerCallbackDataEXT_host *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -10578,7 +12380,7 @@ static inline void convert_VkDebugUtilsMessengerCallbackDataEXT_win32_to_host(st
         case VK_STRUCTURE_TYPE_DEVICE_ADDRESS_BINDING_CALLBACK_DATA_EXT:
         {
             VkDeviceAddressBindingCallbackDataEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
-            const VkDeviceAddressBindingCallbackDataEXT *in_ext = (const VkDeviceAddressBindingCallbackDataEXT *)in_header;
+            const VkDeviceAddressBindingCallbackDataEXT32 *in_ext = (const VkDeviceAddressBindingCallbackDataEXT32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_DEVICE_ADDRESS_BINDING_CALLBACK_DATA_EXT;
             out_ext->pNext = NULL;
             out_ext->flags = in_ext->flags;
@@ -10598,7 +12400,7 @@ static inline void convert_VkDebugUtilsMessengerCallbackDataEXT_win32_to_host(st
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyDescriptorSet_win32_to_host(const VkCopyDescriptorSet *in, VkCopyDescriptorSet_host *out)
+static inline void convert_VkCopyDescriptorSet_win32_to_host(const VkCopyDescriptorSet32 *in, VkCopyDescriptorSet_host *out)
 {
     if (!in) return;

@@ -10615,7 +12417,7 @@ static inline void convert_VkCopyDescriptorSet_win32_to_host(const VkCopyDescrip
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkCopyDescriptorSet_host *convert_VkCopyDescriptorSet_array_win32_to_host(struct conversion_context *ctx, const VkCopyDescriptorSet *in, uint32_t count)
+static inline const VkCopyDescriptorSet_host *convert_VkCopyDescriptorSet_array_win32_to_host(struct conversion_context *ctx, const VkCopyDescriptorSet32 *in, uint32_t count)
 {
     VkCopyDescriptorSet_host *out;
     unsigned int i;
@@ -10651,7 +12453,7 @@ static NTSTATUS thunk32_vkAcquireNextImage2KHR(void *args)
     struct
     {
         VkDevice device;
-        const VkAcquireNextImageInfoKHR *pAcquireInfo;
+        const VkAcquireNextImageInfoKHR32 *pAcquireInfo;
         uint32_t *pImageIndex;
         VkResult result;
     } *params = args;
@@ -10752,7 +12554,7 @@ static NTSTATUS thunk32_vkAcquireProfilingLockKHR(void *args)
     struct
     {
         VkDevice device;
-        const VkAcquireProfilingLockInfoKHR *pInfo;
+        const VkAcquireProfilingLockInfoKHR32 *pInfo;
         VkResult result;
     } *params = args;
     VkAcquireProfilingLockInfoKHR_host pInfo_host;
@@ -10785,7 +12587,7 @@ static NTSTATUS thunk32_vkAllocateCommandBuffers(void *args)
     struct
     {
         VkDevice device;
-        const VkCommandBufferAllocateInfo *pAllocateInfo;
+        const VkCommandBufferAllocateInfo32 *pAllocateInfo;
         VkCommandBuffer *pCommandBuffers;
         VkResult result;
     } *params = args;
@@ -10819,7 +12621,7 @@ static NTSTATUS thunk32_vkAllocateDescriptorSets(void *args)
     struct
     {
         VkDevice device;
-        const VkDescriptorSetAllocateInfo *pAllocateInfo;
+        const VkDescriptorSetAllocateInfo32 *pAllocateInfo;
         VkDescriptorSet *pDescriptorSets;
         VkResult result;
     } *params = args;
@@ -10853,7 +12655,7 @@ static NTSTATUS thunk32_vkAllocateMemory(void *args)
     struct
     {
         VkDevice device;
-        const VkMemoryAllocateInfo *pAllocateInfo;
+        const VkMemoryAllocateInfo32 *pAllocateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkDeviceMemory *pMemory;
         VkResult result;
@@ -10891,7 +12693,7 @@ static NTSTATUS thunk32_vkBeginCommandBuffer(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCommandBufferBeginInfo *pBeginInfo;
+        const VkCommandBufferBeginInfo32 *pBeginInfo;
         VkResult result;
     } *params = args;
     VkCommandBufferBeginInfo_host pBeginInfo_host;
@@ -10928,7 +12730,7 @@ static NTSTATUS thunk32_vkBindAccelerationStructureMemoryNV(void *args)
     {
         VkDevice device;
         uint32_t bindInfoCount;
-        const VkBindAccelerationStructureMemoryInfoNV *pBindInfos;
+        const VkBindAccelerationStructureMemoryInfoNV32 *pBindInfos;
         VkResult result;
     } *params = args;
     const VkBindAccelerationStructureMemoryInfoNV_host *pBindInfos_host;
@@ -10998,7 +12800,7 @@ static NTSTATUS thunk32_vkBindBufferMemory2(void *args)
     {
         VkDevice device;
         uint32_t bindInfoCount;
-        const VkBindBufferMemoryInfo *pBindInfos;
+        const VkBindBufferMemoryInfo32 *pBindInfos;
         VkResult result;
     } *params = args;
     const VkBindBufferMemoryInfo_host *pBindInfos_host;
@@ -11035,7 +12837,7 @@ static NTSTATUS thunk32_vkBindBufferMemory2KHR(void *args)
     {
         VkDevice device;
         uint32_t bindInfoCount;
-        const VkBindBufferMemoryInfo *pBindInfos;
+        const VkBindBufferMemoryInfo32 *pBindInfos;
         VkResult result;
     } *params = args;
     const VkBindBufferMemoryInfo_host *pBindInfos_host;
@@ -11105,7 +12907,7 @@ static NTSTATUS thunk32_vkBindImageMemory2(void *args)
     {
         VkDevice device;
         uint32_t bindInfoCount;
-        const VkBindImageMemoryInfo *pBindInfos;
+        const VkBindImageMemoryInfo32 *pBindInfos;
         VkResult result;
     } *params = args;
     const VkBindImageMemoryInfo_host *pBindInfos_host;
@@ -11142,7 +12944,7 @@ static NTSTATUS thunk32_vkBindImageMemory2KHR(void *args)
     {
         VkDevice device;
         uint32_t bindInfoCount;
-        const VkBindImageMemoryInfo *pBindInfos;
+        const VkBindImageMemoryInfo32 *pBindInfos;
         VkResult result;
     } *params = args;
     const VkBindImageMemoryInfo_host *pBindInfos_host;
@@ -11214,7 +13016,7 @@ static NTSTATUS thunk32_vkBuildAccelerationStructuresKHR(void *args)
         VkDevice device;
         VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
         uint32_t infoCount;
-        const VkAccelerationStructureBuildGeometryInfoKHR *pInfos;
+        const VkAccelerationStructureBuildGeometryInfoKHR32 *pInfos;
         const VkAccelerationStructureBuildRangeInfoKHR * const*ppBuildRangeInfos;
         VkResult result;
     } *params = args;
@@ -11253,7 +13055,7 @@ static NTSTATUS thunk32_vkBuildMicromapsEXT(void *args)
         VkDevice device;
         VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
         uint32_t infoCount;
-        const VkMicromapBuildInfoEXT *pInfos;
+        const VkMicromapBuildInfoEXT32 *pInfos;
         VkResult result;
     } *params = args;
     const VkMicromapBuildInfoEXT_host *pInfos_host;
@@ -11289,7 +13091,7 @@ static NTSTATUS thunk32_vkCmdBeginConditionalRenderingEXT(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkConditionalRenderingBeginInfoEXT *pConditionalRenderingBegin;
+        const VkConditionalRenderingBeginInfoEXT32 *pConditionalRenderingBegin;
     } *params = args;
     VkConditionalRenderingBeginInfoEXT_host pConditionalRenderingBegin_host;

@@ -11416,7 +13218,7 @@ static NTSTATUS thunk32_vkCmdBeginRenderPass(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkRenderPassBeginInfo *pRenderPassBegin;
+        const VkRenderPassBeginInfo32 *pRenderPassBegin;
         VkSubpassContents contents;
     } *params = args;
     VkRenderPassBeginInfo_host pRenderPassBegin_host;
@@ -11449,7 +13251,7 @@ static NTSTATUS thunk32_vkCmdBeginRenderPass2(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkRenderPassBeginInfo *pRenderPassBegin;
+        const VkRenderPassBeginInfo32 *pRenderPassBegin;
         const VkSubpassBeginInfo *pSubpassBeginInfo;
     } *params = args;
     VkRenderPassBeginInfo_host pRenderPassBegin_host;
@@ -11482,7 +13284,7 @@ static NTSTATUS thunk32_vkCmdBeginRenderPass2KHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkRenderPassBeginInfo *pRenderPassBegin;
+        const VkRenderPassBeginInfo32 *pRenderPassBegin;
         const VkSubpassBeginInfo *pSubpassBeginInfo;
     } *params = args;
     VkRenderPassBeginInfo_host pRenderPassBegin_host;
@@ -11515,7 +13317,7 @@ static NTSTATUS thunk32_vkCmdBeginRendering(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkRenderingInfo *pRenderingInfo;
+        const VkRenderingInfo32 *pRenderingInfo;
     } *params = args;
     VkRenderingInfo_host pRenderingInfo_host;
     struct conversion_context ctx;
@@ -11550,7 +13352,7 @@ static NTSTATUS thunk32_vkCmdBeginRenderingKHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkRenderingInfo *pRenderingInfo;
+        const VkRenderingInfo32 *pRenderingInfo;
     } *params = args;
     VkRenderingInfo_host pRenderingInfo_host;
     struct conversion_context ctx;
@@ -11984,7 +13786,7 @@ static NTSTATUS thunk32_vkCmdBlitImage2(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkBlitImageInfo2 *pBlitImageInfo;
+        const VkBlitImageInfo232 *pBlitImageInfo;
     } *params = args;
     VkBlitImageInfo2_host pBlitImageInfo_host;

@@ -12016,7 +13818,7 @@ static NTSTATUS thunk32_vkCmdBlitImage2KHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkBlitImageInfo2 *pBlitImageInfo;
+        const VkBlitImageInfo232 *pBlitImageInfo;
     } *params = args;
     VkBlitImageInfo2_host pBlitImageInfo_host;

@@ -12048,7 +13850,7 @@ static NTSTATUS thunk32_vkCmdBuildAccelerationStructureNV(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkAccelerationStructureInfoNV *pInfo;
+        const VkAccelerationStructureInfoNV32 *pInfo;
         VkBuffer DECLSPEC_ALIGN(8) instanceData;
         VkDeviceSize DECLSPEC_ALIGN(8) instanceOffset;
         VkBool32 update;
@@ -12091,7 +13893,7 @@ static NTSTATUS thunk32_vkCmdBuildAccelerationStructuresIndirectKHR(void *args)
     {
         VkCommandBuffer commandBuffer;
         uint32_t infoCount;
-        const VkAccelerationStructureBuildGeometryInfoKHR *pInfos;
+        const VkAccelerationStructureBuildGeometryInfoKHR32 *pInfos;
         const VkDeviceAddress *pIndirectDeviceAddresses;
         const uint32_t *pIndirectStrides;
         const uint32_t * const*ppMaxPrimitiveCounts;
@@ -12130,7 +13932,7 @@ static NTSTATUS thunk32_vkCmdBuildAccelerationStructuresKHR(void *args)
     {
         VkCommandBuffer commandBuffer;
         uint32_t infoCount;
-        const VkAccelerationStructureBuildGeometryInfoKHR *pInfos;
+        const VkAccelerationStructureBuildGeometryInfoKHR32 *pInfos;
         const VkAccelerationStructureBuildRangeInfoKHR * const*ppBuildRangeInfos;
     } *params = args;
     const VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
@@ -12167,7 +13969,7 @@ static NTSTATUS thunk32_vkCmdBuildMicromapsEXT(void *args)
     {
         VkCommandBuffer commandBuffer;
         uint32_t infoCount;
-        const VkMicromapBuildInfoEXT *pInfos;
+        const VkMicromapBuildInfoEXT32 *pInfos;
     } *params = args;
     const VkMicromapBuildInfoEXT_host *pInfos_host;
     struct conversion_context ctx;
@@ -12303,7 +14105,7 @@ static NTSTATUS thunk32_vkCmdCopyAccelerationStructureKHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyAccelerationStructureInfoKHR *pInfo;
+        const VkCopyAccelerationStructureInfoKHR32 *pInfo;
     } *params = args;
     VkCopyAccelerationStructureInfoKHR_host pInfo_host;

@@ -12367,7 +14169,7 @@ static NTSTATUS thunk32_vkCmdCopyAccelerationStructureToMemoryKHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyAccelerationStructureToMemoryInfoKHR *pInfo;
+        const VkCopyAccelerationStructureToMemoryInfoKHR32 *pInfo;
     } *params = args;
     VkCopyAccelerationStructureToMemoryInfoKHR_host pInfo_host;

@@ -12402,7 +14204,7 @@ static NTSTATUS thunk32_vkCmdCopyBuffer(void *args)
         VkBuffer DECLSPEC_ALIGN(8) srcBuffer;
         VkBuffer DECLSPEC_ALIGN(8) dstBuffer;
         uint32_t regionCount;
-        const VkBufferCopy *pRegions;
+        const VkBufferCopy32 *pRegions;
     } *params = args;
     const VkBufferCopy_host *pRegions_host;
     struct conversion_context ctx;
@@ -12437,7 +14239,7 @@ static NTSTATUS thunk32_vkCmdCopyBuffer2(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyBufferInfo2 *pCopyBufferInfo;
+        const VkCopyBufferInfo232 *pCopyBufferInfo;
     } *params = args;
     VkCopyBufferInfo2_host pCopyBufferInfo_host;
     struct conversion_context ctx;
@@ -12472,7 +14274,7 @@ static NTSTATUS thunk32_vkCmdCopyBuffer2KHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyBufferInfo2 *pCopyBufferInfo;
+        const VkCopyBufferInfo232 *pCopyBufferInfo;
     } *params = args;
     VkCopyBufferInfo2_host pCopyBufferInfo_host;
     struct conversion_context ctx;
@@ -12511,7 +14313,7 @@ static NTSTATUS thunk32_vkCmdCopyBufferToImage(void *args)
         VkImage DECLSPEC_ALIGN(8) dstImage;
         VkImageLayout dstImageLayout;
         uint32_t regionCount;
-        const VkBufferImageCopy *pRegions;
+        const VkBufferImageCopy32 *pRegions;
     } *params = args;
     const VkBufferImageCopy_host *pRegions_host;
     struct conversion_context ctx;
@@ -12546,7 +14348,7 @@ static NTSTATUS thunk32_vkCmdCopyBufferToImage2(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo;
+        const VkCopyBufferToImageInfo232 *pCopyBufferToImageInfo;
     } *params = args;
     VkCopyBufferToImageInfo2_host pCopyBufferToImageInfo_host;
     struct conversion_context ctx;
@@ -12581,7 +14383,7 @@ static NTSTATUS thunk32_vkCmdCopyBufferToImage2KHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo;
+        const VkCopyBufferToImageInfo232 *pCopyBufferToImageInfo;
     } *params = args;
     VkCopyBufferToImageInfo2_host pCopyBufferToImageInfo_host;
     struct conversion_context ctx;
@@ -12651,7 +14453,7 @@ static NTSTATUS thunk32_vkCmdCopyImage2(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyImageInfo2 *pCopyImageInfo;
+        const VkCopyImageInfo232 *pCopyImageInfo;
     } *params = args;
     VkCopyImageInfo2_host pCopyImageInfo_host;

@@ -12683,7 +14485,7 @@ static NTSTATUS thunk32_vkCmdCopyImage2KHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyImageInfo2 *pCopyImageInfo;
+        const VkCopyImageInfo232 *pCopyImageInfo;
     } *params = args;
     VkCopyImageInfo2_host pCopyImageInfo_host;

@@ -12719,7 +14521,7 @@ static NTSTATUS thunk32_vkCmdCopyImageToBuffer(void *args)
         VkImageLayout srcImageLayout;
         VkBuffer DECLSPEC_ALIGN(8) dstBuffer;
         uint32_t regionCount;
-        const VkBufferImageCopy *pRegions;
+        const VkBufferImageCopy32 *pRegions;
     } *params = args;
     const VkBufferImageCopy_host *pRegions_host;
     struct conversion_context ctx;
@@ -12754,7 +14556,7 @@ static NTSTATUS thunk32_vkCmdCopyImageToBuffer2(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo;
+        const VkCopyImageToBufferInfo232 *pCopyImageToBufferInfo;
     } *params = args;
     VkCopyImageToBufferInfo2_host pCopyImageToBufferInfo_host;
     struct conversion_context ctx;
@@ -12789,7 +14591,7 @@ static NTSTATUS thunk32_vkCmdCopyImageToBuffer2KHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo;
+        const VkCopyImageToBufferInfo232 *pCopyImageToBufferInfo;
     } *params = args;
     VkCopyImageToBufferInfo2_host pCopyImageToBufferInfo_host;
     struct conversion_context ctx;
@@ -12856,7 +14658,7 @@ static NTSTATUS thunk32_vkCmdCopyMemoryToAccelerationStructureKHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyMemoryToAccelerationStructureInfoKHR *pInfo;
+        const VkCopyMemoryToAccelerationStructureInfoKHR32 *pInfo;
     } *params = args;
     VkCopyMemoryToAccelerationStructureInfoKHR_host pInfo_host;

@@ -12923,7 +14725,7 @@ static NTSTATUS thunk32_vkCmdCopyMemoryToMicromapEXT(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyMemoryToMicromapInfoEXT *pInfo;
+        const VkCopyMemoryToMicromapInfoEXT32 *pInfo;
     } *params = args;
     VkCopyMemoryToMicromapInfoEXT_host pInfo_host;

@@ -12955,7 +14757,7 @@ static NTSTATUS thunk32_vkCmdCopyMicromapEXT(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyMicromapInfoEXT *pInfo;
+        const VkCopyMicromapInfoEXT32 *pInfo;
     } *params = args;
     VkCopyMicromapInfoEXT_host pInfo_host;

@@ -12987,7 +14789,7 @@ static NTSTATUS thunk32_vkCmdCopyMicromapToMemoryEXT(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCopyMicromapToMemoryInfoEXT *pInfo;
+        const VkCopyMicromapToMemoryInfoEXT32 *pInfo;
     } *params = args;
     VkCopyMicromapToMemoryInfoEXT_host pInfo_host;

@@ -13055,7 +14857,7 @@ static NTSTATUS thunk32_vkCmdCuLaunchKernelNVX(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkCuLaunchInfoNVX *pLaunchInfo;
+        const VkCuLaunchInfoNVX32 *pLaunchInfo;
     } *params = args;
     VkCuLaunchInfoNVX_host pLaunchInfo_host;

@@ -13209,7 +15011,7 @@ static NTSTATUS thunk32_vkCmdDecompressMemoryNV(void *args)
     {
         VkCommandBuffer commandBuffer;
         uint32_t decompressRegionCount;
-        const VkDecompressMemoryRegionNV *pDecompressMemoryRegions;
+        const VkDecompressMemoryRegionNV32 *pDecompressMemoryRegions;
     } *params = args;
     const VkDecompressMemoryRegionNV_host *pDecompressMemoryRegions_host;
     struct conversion_context ctx;
@@ -14366,7 +16168,7 @@ static NTSTATUS thunk32_vkCmdExecuteGeneratedCommandsNV(void *args)
     {
         VkCommandBuffer commandBuffer;
         VkBool32 isPreprocessed;
-        const VkGeneratedCommandsInfoNV *pGeneratedCommandsInfo;
+        const VkGeneratedCommandsInfoNV32 *pGeneratedCommandsInfo;
     } *params = args;
     VkGeneratedCommandsInfoNV_host pGeneratedCommandsInfo_host;
     struct conversion_context ctx;
@@ -14593,9 +16395,9 @@ static NTSTATUS thunk32_vkCmdPipelineBarrier(void *args)
         uint32_t memoryBarrierCount;
         const VkMemoryBarrier *pMemoryBarriers;
         uint32_t bufferMemoryBarrierCount;
-        const VkBufferMemoryBarrier *pBufferMemoryBarriers;
+        const VkBufferMemoryBarrier32 *pBufferMemoryBarriers;
         uint32_t imageMemoryBarrierCount;
-        const VkImageMemoryBarrier *pImageMemoryBarriers;
+        const VkImageMemoryBarrier32 *pImageMemoryBarriers;
     } *params = args;
     const VkBufferMemoryBarrier_host *pBufferMemoryBarriers_host;
     const VkImageMemoryBarrier_host *pImageMemoryBarriers_host;
@@ -14632,7 +16434,7 @@ static NTSTATUS thunk32_vkCmdPipelineBarrier2(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkDependencyInfo *pDependencyInfo;
+        const VkDependencyInfo32 *pDependencyInfo;
     } *params = args;
     VkDependencyInfo_host pDependencyInfo_host;
     struct conversion_context ctx;
@@ -14667,7 +16469,7 @@ static NTSTATUS thunk32_vkCmdPipelineBarrier2KHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkDependencyInfo *pDependencyInfo;
+        const VkDependencyInfo32 *pDependencyInfo;
     } *params = args;
     VkDependencyInfo_host pDependencyInfo_host;
     struct conversion_context ctx;
@@ -14702,7 +16504,7 @@ static NTSTATUS thunk32_vkCmdPreprocessGeneratedCommandsNV(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkGeneratedCommandsInfoNV *pGeneratedCommandsInfo;
+        const VkGeneratedCommandsInfoNV32 *pGeneratedCommandsInfo;
     } *params = args;
     VkGeneratedCommandsInfoNV_host pGeneratedCommandsInfo_host;
     struct conversion_context ctx;
@@ -14775,7 +16577,7 @@ static NTSTATUS thunk32_vkCmdPushDescriptorSetKHR(void *args)
         VkPipelineLayout DECLSPEC_ALIGN(8) layout;
         uint32_t set;
         uint32_t descriptorWriteCount;
-        const VkWriteDescriptorSet *pDescriptorWrites;
+        const VkWriteDescriptorSet32 *pDescriptorWrites;
     } *params = args;
     const VkWriteDescriptorSet_host *pDescriptorWrites_host;
     struct conversion_context ctx;
@@ -15003,7 +16805,7 @@ static NTSTATUS thunk32_vkCmdResolveImage2(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkResolveImageInfo2 *pResolveImageInfo;
+        const VkResolveImageInfo232 *pResolveImageInfo;
     } *params = args;
     VkResolveImageInfo2_host pResolveImageInfo_host;

@@ -15035,7 +16837,7 @@ static NTSTATUS thunk32_vkCmdResolveImage2KHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkResolveImageInfo2 *pResolveImageInfo;
+        const VkResolveImageInfo232 *pResolveImageInfo;
     } *params = args;
     VkResolveImageInfo2_host pResolveImageInfo_host;

@@ -16226,7 +18028,7 @@ static NTSTATUS thunk32_vkCmdSetEvent2(void *args)
     {
         VkCommandBuffer commandBuffer;
         VkEvent DECLSPEC_ALIGN(8) event;
-        const VkDependencyInfo *pDependencyInfo;
+        const VkDependencyInfo32 *pDependencyInfo;
     } *params = args;
     VkDependencyInfo_host pDependencyInfo_host;
     struct conversion_context ctx;
@@ -16262,7 +18064,7 @@ static NTSTATUS thunk32_vkCmdSetEvent2KHR(void *args)
     {
         VkCommandBuffer commandBuffer;
         VkEvent DECLSPEC_ALIGN(8) event;
-        const VkDependencyInfo *pDependencyInfo;
+        const VkDependencyInfo32 *pDependencyInfo;
     } *params = args;
     VkDependencyInfo_host pDependencyInfo_host;
     struct conversion_context ctx;
@@ -16692,7 +18494,7 @@ static NTSTATUS thunk32_vkCmdSetPerformanceMarkerINTEL(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkPerformanceMarkerInfoINTEL *pMarkerInfo;
+        const VkPerformanceMarkerInfoINTEL32 *pMarkerInfo;
         VkResult result;
     } *params = args;
     VkPerformanceMarkerInfoINTEL_host pMarkerInfo_host;
@@ -16725,7 +18527,7 @@ static NTSTATUS thunk32_vkCmdSetPerformanceOverrideINTEL(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkPerformanceOverrideInfoINTEL *pOverrideInfo;
+        const VkPerformanceOverrideInfoINTEL32 *pOverrideInfo;
         VkResult result;
     } *params = args;
     VkPerformanceOverrideInfoINTEL_host pOverrideInfo_host;
@@ -17927,10 +19729,10 @@ static NTSTATUS thunk32_vkCmdTraceRaysIndirectKHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkStridedDeviceAddressRegionKHR *pRaygenShaderBindingTable;
-        const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable;
-        const VkStridedDeviceAddressRegionKHR *pHitShaderBindingTable;
-        const VkStridedDeviceAddressRegionKHR *pCallableShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR32 *pRaygenShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR32 *pMissShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR32 *pHitShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR32 *pCallableShaderBindingTable;
         VkDeviceAddress DECLSPEC_ALIGN(8) indirectDeviceAddress;
     } *params = args;
     VkStridedDeviceAddressRegionKHR_host pRaygenShaderBindingTable_host;
@@ -17969,10 +19771,10 @@ static NTSTATUS thunk32_vkCmdTraceRaysKHR(void *args)
     struct
     {
         VkCommandBuffer commandBuffer;
-        const VkStridedDeviceAddressRegionKHR *pRaygenShaderBindingTable;
-        const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable;
-        const VkStridedDeviceAddressRegionKHR *pHitShaderBindingTable;
-        const VkStridedDeviceAddressRegionKHR *pCallableShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR32 *pRaygenShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR32 *pMissShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR32 *pHitShaderBindingTable;
+        const VkStridedDeviceAddressRegionKHR32 *pCallableShaderBindingTable;
         uint32_t width;
         uint32_t height;
         uint32_t depth;
@@ -18096,9 +19898,9 @@ static NTSTATUS thunk32_vkCmdWaitEvents(void *args)
         uint32_t memoryBarrierCount;
         const VkMemoryBarrier *pMemoryBarriers;
         uint32_t bufferMemoryBarrierCount;
-        const VkBufferMemoryBarrier *pBufferMemoryBarriers;
+        const VkBufferMemoryBarrier32 *pBufferMemoryBarriers;
         uint32_t imageMemoryBarrierCount;
-        const VkImageMemoryBarrier *pImageMemoryBarriers;
+        const VkImageMemoryBarrier32 *pImageMemoryBarriers;
     } *params = args;
     const VkBufferMemoryBarrier_host *pBufferMemoryBarriers_host;
     const VkImageMemoryBarrier_host *pImageMemoryBarriers_host;
@@ -18137,7 +19939,7 @@ static NTSTATUS thunk32_vkCmdWaitEvents2(void *args)
         VkCommandBuffer commandBuffer;
         uint32_t eventCount;
         const VkEvent *pEvents;
-        const VkDependencyInfo *pDependencyInfos;
+        const VkDependencyInfo32 *pDependencyInfos;
     } *params = args;
     const VkDependencyInfo_host *pDependencyInfos_host;
     struct conversion_context ctx;
@@ -18174,7 +19976,7 @@ static NTSTATUS thunk32_vkCmdWaitEvents2KHR(void *args)
         VkCommandBuffer commandBuffer;
         uint32_t eventCount;
         const VkEvent *pEvents;
-        const VkDependencyInfo *pDependencyInfos;
+        const VkDependencyInfo32 *pDependencyInfos;
     } *params = args;
     const VkDependencyInfo_host *pDependencyInfos_host;
     struct conversion_context ctx;
@@ -18506,7 +20308,7 @@ static NTSTATUS thunk32_vkCopyAccelerationStructureKHR(void *args)
     {
         VkDevice device;
         VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
-        const VkCopyAccelerationStructureInfoKHR *pInfo;
+        const VkCopyAccelerationStructureInfoKHR32 *pInfo;
         VkResult result;
     } *params = args;
     VkCopyAccelerationStructureInfoKHR_host pInfo_host;
@@ -18540,7 +20342,7 @@ static NTSTATUS thunk32_vkCopyAccelerationStructureToMemoryKHR(void *args)
     {
         VkDevice device;
         VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
-        const VkCopyAccelerationStructureToMemoryInfoKHR *pInfo;
+        const VkCopyAccelerationStructureToMemoryInfoKHR32 *pInfo;
         VkResult result;
     } *params = args;
     VkCopyAccelerationStructureToMemoryInfoKHR_host pInfo_host;
@@ -18574,7 +20376,7 @@ static NTSTATUS thunk32_vkCopyMemoryToAccelerationStructureKHR(void *args)
     {
         VkDevice device;
         VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
-        const VkCopyMemoryToAccelerationStructureInfoKHR *pInfo;
+        const VkCopyMemoryToAccelerationStructureInfoKHR32 *pInfo;
         VkResult result;
     } *params = args;
     VkCopyMemoryToAccelerationStructureInfoKHR_host pInfo_host;
@@ -18608,7 +20410,7 @@ static NTSTATUS thunk32_vkCopyMemoryToMicromapEXT(void *args)
     {
         VkDevice device;
         VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
-        const VkCopyMemoryToMicromapInfoEXT *pInfo;
+        const VkCopyMemoryToMicromapInfoEXT32 *pInfo;
         VkResult result;
     } *params = args;
     VkCopyMemoryToMicromapInfoEXT_host pInfo_host;
@@ -18642,7 +20444,7 @@ static NTSTATUS thunk32_vkCopyMicromapEXT(void *args)
     {
         VkDevice device;
         VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
-        const VkCopyMicromapInfoEXT *pInfo;
+        const VkCopyMicromapInfoEXT32 *pInfo;
         VkResult result;
     } *params = args;
     VkCopyMicromapInfoEXT_host pInfo_host;
@@ -18676,7 +20478,7 @@ static NTSTATUS thunk32_vkCopyMicromapToMemoryEXT(void *args)
     {
         VkDevice device;
         VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
-        const VkCopyMicromapToMemoryInfoEXT *pInfo;
+        const VkCopyMicromapToMemoryInfoEXT32 *pInfo;
         VkResult result;
     } *params = args;
     VkCopyMicromapToMemoryInfoEXT_host pInfo_host;
@@ -18709,7 +20511,7 @@ static NTSTATUS thunk32_vkCreateAccelerationStructureKHR(void *args)
     struct
     {
         VkDevice device;
-        const VkAccelerationStructureCreateInfoKHR *pCreateInfo;
+        const VkAccelerationStructureCreateInfoKHR32 *pCreateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkAccelerationStructureKHR *pAccelerationStructure;
         VkResult result;
@@ -18744,7 +20546,7 @@ static NTSTATUS thunk32_vkCreateAccelerationStructureNV(void *args)
     struct
     {
         VkDevice device;
-        const VkAccelerationStructureCreateInfoNV *pCreateInfo;
+        const VkAccelerationStructureCreateInfoNV32 *pCreateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkAccelerationStructureNV *pAccelerationStructure;
         VkResult result;
@@ -18782,7 +20584,7 @@ static NTSTATUS thunk32_vkCreateBuffer(void *args)
     struct
     {
         VkDevice device;
-        const VkBufferCreateInfo *pCreateInfo;
+        const VkBufferCreateInfo32 *pCreateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkBuffer *pBuffer;
         VkResult result;
@@ -18820,7 +20622,7 @@ static NTSTATUS thunk32_vkCreateBufferView(void *args)
     struct
     {
         VkDevice device;
-        const VkBufferViewCreateInfo *pCreateInfo;
+        const VkBufferViewCreateInfo32 *pCreateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkBufferView *pView;
         VkResult result;
@@ -18896,7 +20698,7 @@ static NTSTATUS thunk32_vkCreateComputePipelines(void *args)
         VkDevice device;
         VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache;
         uint32_t createInfoCount;
-        const VkComputePipelineCreateInfo *pCreateInfos;
+        const VkComputePipelineCreateInfo32 *pCreateInfos;
         const VkAllocationCallbacks *pAllocator;
         VkPipeline *pPipelines;
         VkResult result;
@@ -18935,7 +20737,7 @@ static NTSTATUS thunk32_vkCreateCuFunctionNVX(void *args)
     struct
     {
         VkDevice device;
-        const VkCuFunctionCreateInfoNVX *pCreateInfo;
+        const VkCuFunctionCreateInfoNVX32 *pCreateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkCuFunctionNVX *pFunction;
         VkResult result;
@@ -19167,7 +20969,7 @@ static NTSTATUS thunk32_vkCreateDescriptorUpdateTemplate(void *args)
     struct
     {
         VkDevice device;
-        const VkDescriptorUpdateTemplateCreateInfo *pCreateInfo;
+        const VkDescriptorUpdateTemplateCreateInfo32 *pCreateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkDescriptorUpdateTemplate *pDescriptorUpdateTemplate;
         VkResult result;
@@ -19202,7 +21004,7 @@ static NTSTATUS thunk32_vkCreateDescriptorUpdateTemplateKHR(void *args)
     struct
     {
         VkDevice device;
-        const VkDescriptorUpdateTemplateCreateInfo *pCreateInfo;
+        const VkDescriptorUpdateTemplateCreateInfo32 *pCreateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkDescriptorUpdateTemplate *pDescriptorUpdateTemplate;
         VkResult result;
@@ -19347,7 +21149,7 @@ static NTSTATUS thunk32_vkCreateFramebuffer(void *args)
     struct
     {
         VkDevice device;
-        const VkFramebufferCreateInfo *pCreateInfo;
+        const VkFramebufferCreateInfo32 *pCreateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkFramebuffer *pFramebuffer;
         VkResult result;
@@ -19389,7 +21191,7 @@ static NTSTATUS thunk32_vkCreateGraphicsPipelines(void *args)
         VkDevice device;
         VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache;
         uint32_t createInfoCount;
-        const VkGraphicsPipelineCreateInfo *pCreateInfos;
+        const VkGraphicsPipelineCreateInfo32 *pCreateInfos;
         const VkAllocationCallbacks *pAllocator;
         VkPipeline *pPipelines;
         VkResult result;
@@ -19466,7 +21268,7 @@ static NTSTATUS thunk32_vkCreateImageView(void *args)
     struct
     {
         VkDevice device;
-        const VkImageViewCreateInfo *pCreateInfo;
+        const VkImageViewCreateInfo32 *pCreateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkImageView *pView;
         VkResult result;
@@ -19504,7 +21306,7 @@ static NTSTATUS thunk32_vkCreateIndirectCommandsLayoutNV(void *args)
     struct
     {
         VkDevice device;
-        const VkIndirectCommandsLayoutCreateInfoNV *pCreateInfo;
+        const VkIndirectCommandsLayoutCreateInfoNV32 *pCreateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkIndirectCommandsLayoutNV *pIndirectCommandsLayout;
         VkResult result;
@@ -19585,7 +21387,7 @@ static NTSTATUS thunk32_vkCreateMicromapEXT(void *args)
     struct
     {
         VkDevice device;
-        const VkMicromapCreateInfoEXT *pCreateInfo;
+        const VkMicromapCreateInfoEXT32 *pCreateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkMicromapEXT *pMicromap;
         VkResult result;
@@ -19826,7 +21628,7 @@ static NTSTATUS thunk32_vkCreateRayTracingPipelinesKHR(void *args)
         VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation;
         VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache;
         uint32_t createInfoCount;
-        const VkRayTracingPipelineCreateInfoKHR *pCreateInfos;
+        const VkRayTracingPipelineCreateInfoKHR32 *pCreateInfos;
         const VkAllocationCallbacks *pAllocator;
         VkPipeline *pPipelines;
         VkResult result;
@@ -19872,7 +21674,7 @@ static NTSTATUS thunk32_vkCreateRayTracingPipelinesNV(void *args)
         VkDevice device;
         VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache;
         uint32_t createInfoCount;
-        const VkRayTracingPipelineCreateInfoNV *pCreateInfos;
+        const VkRayTracingPipelineCreateInfoNV32 *pCreateInfos;
         const VkAllocationCallbacks *pAllocator;
         VkPipeline *pPipelines;
         VkResult result;
@@ -20192,7 +21994,7 @@ static NTSTATUS thunk32_vkCreateSwapchainKHR(void *args)
     struct
     {
         VkDevice device;
-        const VkSwapchainCreateInfoKHR *pCreateInfo;
+        const VkSwapchainCreateInfoKHR32 *pCreateInfo;
         const VkAllocationCallbacks *pAllocator;
         VkSwapchainKHR *pSwapchain;
         VkResult result;
@@ -20295,7 +22097,7 @@ static NTSTATUS thunk32_vkDebugMarkerSetObjectNameEXT(void *args)
     struct
     {
         VkDevice device;
-        const VkDebugMarkerObjectNameInfoEXT *pNameInfo;
+        const VkDebugMarkerObjectNameInfoEXT32 *pNameInfo;
         VkResult result;
     } *params = args;
     VkDebugMarkerObjectNameInfoEXT_host pNameInfo_host;
@@ -20330,7 +22132,7 @@ static NTSTATUS thunk32_vkDebugMarkerSetObjectTagEXT(void *args)
     struct
     {
         VkDevice device;
-        const VkDebugMarkerObjectTagInfoEXT *pTagInfo;
+        const VkDebugMarkerObjectTagInfoEXT32 *pTagInfo;
         VkResult result;
     } *params = args;
     VkDebugMarkerObjectTagInfoEXT_host pTagInfo_host;
@@ -21967,7 +23769,7 @@ static NTSTATUS thunk32_vkFlushMappedMemoryRanges(void *args)
     {
         VkDevice device;
         uint32_t memoryRangeCount;
-        const VkMappedMemoryRange *pMemoryRanges;
+        const VkMappedMemoryRange32 *pMemoryRanges;
         VkResult result;
     } *params = args;
     const VkMappedMemoryRange_host *pMemoryRanges_host;
@@ -22100,9 +23902,9 @@ static NTSTATUS thunk32_vkGetAccelerationStructureBuildSizesKHR(void *args)
     {
         VkDevice device;
         VkAccelerationStructureBuildTypeKHR buildType;
-        const VkAccelerationStructureBuildGeometryInfoKHR *pBuildInfo;
+        const VkAccelerationStructureBuildGeometryInfoKHR32 *pBuildInfo;
         const uint32_t *pMaxPrimitiveCounts;
-        VkAccelerationStructureBuildSizesInfoKHR *pSizeInfo;
+        VkAccelerationStructureBuildSizesInfoKHR32 *pSizeInfo;
     } *params = args;
     VkAccelerationStructureBuildGeometryInfoKHR_host pBuildInfo_host;
     VkAccelerationStructureBuildSizesInfoKHR_host pSizeInfo_host;
@@ -22140,7 +23942,7 @@ static NTSTATUS thunk32_vkGetAccelerationStructureDeviceAddressKHR(void *args)
     struct
     {
         VkDevice device;
-        const VkAccelerationStructureDeviceAddressInfoKHR *pInfo;
+        const VkAccelerationStructureDeviceAddressInfoKHR32 *pInfo;
         VkDeviceAddress result;
     } *params = args;
     VkAccelerationStructureDeviceAddressInfoKHR_host pInfo_host;
@@ -22206,8 +24008,8 @@ static NTSTATUS thunk32_vkGetAccelerationStructureMemoryRequirementsNV(void *arg
     struct
     {
         VkDevice device;
-        const VkAccelerationStructureMemoryRequirementsInfoNV *pInfo;
-        VkMemoryRequirements2KHR *pMemoryRequirements;
+        const VkAccelerationStructureMemoryRequirementsInfoNV32 *pInfo;
+        VkMemoryRequirements2KHR32 *pMemoryRequirements;
     } *params = args;
     VkAccelerationStructureMemoryRequirementsInfoNV_host pInfo_host;
     VkMemoryRequirements2KHR_host pMemoryRequirements_host;
@@ -22242,7 +24044,7 @@ static NTSTATUS thunk32_vkGetBufferDeviceAddress(void *args)
     struct
     {
         VkDevice device;
-        const VkBufferDeviceAddressInfo *pInfo;
+        const VkBufferDeviceAddressInfo32 *pInfo;
         VkDeviceAddress result;
     } *params = args;
     VkBufferDeviceAddressInfo_host pInfo_host;
@@ -22275,7 +24077,7 @@ static NTSTATUS thunk32_vkGetBufferDeviceAddressEXT(void *args)
     struct
     {
         VkDevice device;
-        const VkBufferDeviceAddressInfo *pInfo;
+        const VkBufferDeviceAddressInfo32 *pInfo;
         VkDeviceAddress result;
     } *params = args;
     VkBufferDeviceAddressInfo_host pInfo_host;
@@ -22308,7 +24110,7 @@ static NTSTATUS thunk32_vkGetBufferDeviceAddressKHR(void *args)
     struct
     {
         VkDevice device;
-        const VkBufferDeviceAddressInfo *pInfo;
+        const VkBufferDeviceAddressInfo32 *pInfo;
         VkDeviceAddress result;
     } *params = args;
     VkBufferDeviceAddressInfo_host pInfo_host;
@@ -22342,7 +24144,7 @@ static NTSTATUS thunk32_vkGetBufferMemoryRequirements(void *args)
     {
         VkDevice device;
         VkBuffer DECLSPEC_ALIGN(8) buffer;
-        VkMemoryRequirements *pMemoryRequirements;
+        VkMemoryRequirements32 *pMemoryRequirements;
     } *params = args;
     VkMemoryRequirements_host pMemoryRequirements_host;

@@ -22374,8 +24176,8 @@ static NTSTATUS thunk32_vkGetBufferMemoryRequirements2(void *args)
     struct
     {
         VkDevice device;
-        const VkBufferMemoryRequirementsInfo2 *pInfo;
-        VkMemoryRequirements2 *pMemoryRequirements;
+        const VkBufferMemoryRequirementsInfo232 *pInfo;
+        VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
     VkBufferMemoryRequirementsInfo2_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
@@ -22410,8 +24212,8 @@ static NTSTATUS thunk32_vkGetBufferMemoryRequirements2KHR(void *args)
     struct
     {
         VkDevice device;
-        const VkBufferMemoryRequirementsInfo2 *pInfo;
-        VkMemoryRequirements2 *pMemoryRequirements;
+        const VkBufferMemoryRequirementsInfo232 *pInfo;
+        VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
     VkBufferMemoryRequirementsInfo2_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
@@ -22446,7 +24248,7 @@ static NTSTATUS thunk32_vkGetBufferOpaqueCaptureAddress(void *args)
     struct
     {
         VkDevice device;
-        const VkBufferDeviceAddressInfo *pInfo;
+        const VkBufferDeviceAddressInfo32 *pInfo;
         uint64_t result;
     } *params = args;
     VkBufferDeviceAddressInfo_host pInfo_host;
@@ -22479,7 +24281,7 @@ static NTSTATUS thunk32_vkGetBufferOpaqueCaptureAddressKHR(void *args)
     struct
     {
         VkDevice device;
-        const VkBufferDeviceAddressInfo *pInfo;
+        const VkBufferDeviceAddressInfo32 *pInfo;
         uint64_t result;
     } *params = args;
     VkBufferDeviceAddressInfo_host pInfo_host;
@@ -22639,7 +24441,7 @@ static NTSTATUS thunk32_vkGetDescriptorSetLayoutHostMappingInfoVALVE(void *args)
     struct
     {
         VkDevice device;
-        const VkDescriptorSetBindingReferenceVALVE *pBindingReference;
+        const VkDescriptorSetBindingReferenceVALVE32 *pBindingReference;
         VkDescriptorSetLayoutHostMappingInfoVALVE *pHostMapping;
     } *params = args;
     VkDescriptorSetBindingReferenceVALVE_host pBindingReference_host;
@@ -22765,8 +24567,8 @@ static NTSTATUS thunk32_vkGetDeviceBufferMemoryRequirements(void *args)
     struct
     {
         VkDevice device;
-        const VkDeviceBufferMemoryRequirements *pInfo;
-        VkMemoryRequirements2 *pMemoryRequirements;
+        const VkDeviceBufferMemoryRequirements32 *pInfo;
+        VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
     VkDeviceBufferMemoryRequirements_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
@@ -22804,8 +24606,8 @@ static NTSTATUS thunk32_vkGetDeviceBufferMemoryRequirementsKHR(void *args)
     struct
     {
         VkDevice device;
-        const VkDeviceBufferMemoryRequirements *pInfo;
-        VkMemoryRequirements2 *pMemoryRequirements;
+        const VkDeviceBufferMemoryRequirements32 *pInfo;
+        VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
     VkDeviceBufferMemoryRequirements_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
@@ -22843,8 +24645,8 @@ static NTSTATUS thunk32_vkGetDeviceFaultInfoEXT(void *args)
     struct
     {
         VkDevice device;
-        VkDeviceFaultCountsEXT *pFaultCounts;
-        VkDeviceFaultInfoEXT *pFaultInfo;
+        VkDeviceFaultCountsEXT32 *pFaultCounts;
+        VkDeviceFaultInfoEXT32 *pFaultInfo;
         VkResult result;
     } *params = args;
     VkDeviceFaultCountsEXT_host pFaultCounts_host;
@@ -23018,7 +24820,7 @@ static NTSTATUS thunk32_vkGetDeviceImageMemoryRequirements(void *args)
     {
         VkDevice device;
         const VkDeviceImageMemoryRequirements *pInfo;
-        VkMemoryRequirements2 *pMemoryRequirements;
+        VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
     VkDeviceImageMemoryRequirements pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
@@ -23057,7 +24859,7 @@ static NTSTATUS thunk32_vkGetDeviceImageMemoryRequirementsKHR(void *args)
     {
         VkDevice device;
         const VkDeviceImageMemoryRequirements *pInfo;
-        VkMemoryRequirements2 *pMemoryRequirements;
+        VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
     VkDeviceImageMemoryRequirements pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
@@ -23097,7 +24899,7 @@ static NTSTATUS thunk32_vkGetDeviceImageSparseMemoryRequirements(void *args)
         VkDevice device;
         const VkDeviceImageMemoryRequirements *pInfo;
         uint32_t *pSparseMemoryRequirementCount;
-        VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements;
+        VkSparseImageMemoryRequirements232 *pSparseMemoryRequirements;
     } *params = args;
     VkDeviceImageMemoryRequirements pInfo_host;
     VkSparseImageMemoryRequirements2_host *pSparseMemoryRequirements_host;
@@ -23137,7 +24939,7 @@ static NTSTATUS thunk32_vkGetDeviceImageSparseMemoryRequirementsKHR(void *args)
         VkDevice device;
         const VkDeviceImageMemoryRequirements *pInfo;
         uint32_t *pSparseMemoryRequirementCount;
-        VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements;
+        VkSparseImageMemoryRequirements232 *pSparseMemoryRequirements;
     } *params = args;
     VkDeviceImageMemoryRequirements pInfo_host;
     VkSparseImageMemoryRequirements2_host *pSparseMemoryRequirements_host;
@@ -23206,7 +25008,7 @@ static NTSTATUS thunk32_vkGetDeviceMemoryOpaqueCaptureAddress(void *args)
     struct
     {
         VkDevice device;
-        const VkDeviceMemoryOpaqueCaptureAddressInfo *pInfo;
+        const VkDeviceMemoryOpaqueCaptureAddressInfo32 *pInfo;
         uint64_t result;
     } *params = args;
     VkDeviceMemoryOpaqueCaptureAddressInfo_host pInfo_host;
@@ -23239,7 +25041,7 @@ static NTSTATUS thunk32_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args)
     struct
     {
         VkDevice device;
-        const VkDeviceMemoryOpaqueCaptureAddressInfo *pInfo;
+        const VkDeviceMemoryOpaqueCaptureAddressInfo32 *pInfo;
         uint64_t result;
     } *params = args;
     VkDeviceMemoryOpaqueCaptureAddressInfo_host pInfo_host;
@@ -23398,7 +25200,7 @@ static NTSTATUS thunk32_vkGetDynamicRenderingTilePropertiesQCOM(void *args)
     struct
     {
         VkDevice device;
-        const VkRenderingInfo *pRenderingInfo;
+        const VkRenderingInfo32 *pRenderingInfo;
         VkTilePropertiesQCOM *pProperties;
         VkResult result;
     } *params = args;
@@ -23530,8 +25332,8 @@ static NTSTATUS thunk32_vkGetGeneratedCommandsMemoryRequirementsNV(void *args)
     struct
     {
         VkDevice device;
-        const VkGeneratedCommandsMemoryRequirementsInfoNV *pInfo;
-        VkMemoryRequirements2 *pMemoryRequirements;
+        const VkGeneratedCommandsMemoryRequirementsInfoNV32 *pInfo;
+        VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
     VkGeneratedCommandsMemoryRequirementsInfoNV_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
@@ -23567,7 +25369,7 @@ static NTSTATUS thunk32_vkGetImageMemoryRequirements(void *args)
     {
         VkDevice device;
         VkImage DECLSPEC_ALIGN(8) image;
-        VkMemoryRequirements *pMemoryRequirements;
+        VkMemoryRequirements32 *pMemoryRequirements;
     } *params = args;
     VkMemoryRequirements_host pMemoryRequirements_host;

@@ -23599,8 +25401,8 @@ static NTSTATUS thunk32_vkGetImageMemoryRequirements2(void *args)
     struct
     {
         VkDevice device;
-        const VkImageMemoryRequirementsInfo2 *pInfo;
-        VkMemoryRequirements2 *pMemoryRequirements;
+        const VkImageMemoryRequirementsInfo232 *pInfo;
+        VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
     VkImageMemoryRequirementsInfo2_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
@@ -23635,8 +25437,8 @@ static NTSTATUS thunk32_vkGetImageMemoryRequirements2KHR(void *args)
     struct
     {
         VkDevice device;
-        const VkImageMemoryRequirementsInfo2 *pInfo;
-        VkMemoryRequirements2 *pMemoryRequirements;
+        const VkImageMemoryRequirementsInfo232 *pInfo;
+        VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
     VkImageMemoryRequirementsInfo2_host pInfo_host;
     VkMemoryRequirements2_host pMemoryRequirements_host;
@@ -23673,7 +25475,7 @@ static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements(void *args)
         VkDevice device;
         VkImage DECLSPEC_ALIGN(8) image;
         uint32_t *pSparseMemoryRequirementCount;
-        VkSparseImageMemoryRequirements *pSparseMemoryRequirements;
+        VkSparseImageMemoryRequirements32 *pSparseMemoryRequirements;
     } *params = args;
     VkSparseImageMemoryRequirements_host *pSparseMemoryRequirements_host;
     struct conversion_context ctx;
@@ -23709,9 +25511,9 @@ static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements2(void *args)
     struct
     {
         VkDevice device;
-        const VkImageSparseMemoryRequirementsInfo2 *pInfo;
+        const VkImageSparseMemoryRequirementsInfo232 *pInfo;
         uint32_t *pSparseMemoryRequirementCount;
-        VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements;
+        VkSparseImageMemoryRequirements232 *pSparseMemoryRequirements;
     } *params = args;
     VkImageSparseMemoryRequirementsInfo2_host pInfo_host;
     VkSparseImageMemoryRequirements2_host *pSparseMemoryRequirements_host;
@@ -23749,9 +25551,9 @@ static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements2KHR(void *args)
     struct
     {
         VkDevice device;
-        const VkImageSparseMemoryRequirementsInfo2 *pInfo;
+        const VkImageSparseMemoryRequirementsInfo232 *pInfo;
         uint32_t *pSparseMemoryRequirementCount;
-        VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements;
+        VkSparseImageMemoryRequirements232 *pSparseMemoryRequirements;
     } *params = args;
     VkImageSparseMemoryRequirementsInfo2_host pInfo_host;
     VkSparseImageMemoryRequirements2_host *pSparseMemoryRequirements_host;
@@ -23791,7 +25593,7 @@ static NTSTATUS thunk32_vkGetImageSubresourceLayout(void *args)
         VkDevice device;
         VkImage DECLSPEC_ALIGN(8) image;
         const VkImageSubresource *pSubresource;
-        VkSubresourceLayout *pLayout;
+        VkSubresourceLayout32 *pLayout;
     } *params = args;
     VkSubresourceLayout_host pLayout_host;

@@ -23825,7 +25627,7 @@ static NTSTATUS thunk32_vkGetImageSubresourceLayout2EXT(void *args)
         VkDevice device;
         VkImage DECLSPEC_ALIGN(8) image;
         const VkImageSubresource2EXT *pSubresource;
-        VkSubresourceLayout2EXT *pLayout;
+        VkSubresourceLayout2EXT32 *pLayout;
     } *params = args;
     VkSubresourceLayout2EXT_host pLayout_host;

@@ -23859,7 +25661,7 @@ static NTSTATUS thunk32_vkGetImageViewAddressNVX(void *args)
     {
         VkDevice device;
         VkImageView DECLSPEC_ALIGN(8) imageView;
-        VkImageViewAddressPropertiesNVX *pProperties;
+        VkImageViewAddressPropertiesNVX32 *pProperties;
         VkResult result;
     } *params = args;
     VkImageViewAddressPropertiesNVX_host pProperties_host;
@@ -23893,7 +25695,7 @@ static NTSTATUS thunk32_vkGetImageViewHandleNVX(void *args)
     struct
     {
         VkDevice device;
-        const VkImageViewHandleInfoNVX *pInfo;
+        const VkImageViewHandleInfoNVX32 *pInfo;
         uint32_t result;
     } *params = args;
     VkImageViewHandleInfoNVX_host pInfo_host;
@@ -23960,8 +25762,8 @@ static NTSTATUS thunk32_vkGetMicromapBuildSizesEXT(void *args)
     {
         VkDevice device;
         VkAccelerationStructureBuildTypeKHR buildType;
-        const VkMicromapBuildInfoEXT *pBuildInfo;
-        VkMicromapBuildSizesInfoEXT *pSizeInfo;
+        const VkMicromapBuildInfoEXT32 *pBuildInfo;
+        VkMicromapBuildSizesInfoEXT32 *pSizeInfo;
     } *params = args;
     VkMicromapBuildInfoEXT_host pBuildInfo_host;
     VkMicromapBuildSizesInfoEXT_host pSizeInfo_host;
@@ -23997,7 +25799,7 @@ static NTSTATUS thunk32_vkGetPerformanceParameterINTEL(void *args)
     {
         VkDevice device;
         VkPerformanceParameterTypeINTEL parameter;
-        VkPerformanceValueINTEL *pValue;
+        VkPerformanceValueINTEL32 *pValue;
         VkResult result;
     } *params = args;
     VkPerformanceValueINTEL_host pValue_host;
@@ -24511,7 +26313,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties(void *args)
         VkImageTiling tiling;
         VkImageUsageFlags usage;
         VkImageCreateFlags flags;
-        VkImageFormatProperties *pImageFormatProperties;
+        VkImageFormatProperties32 *pImageFormatProperties;
         VkResult result;
     } *params = args;
     VkImageFormatProperties_host pImageFormatProperties_host;
@@ -24545,7 +26347,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties2(void *args)
     {
         VkPhysicalDevice physicalDevice;
         const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo;
-        VkImageFormatProperties2 *pImageFormatProperties;
+        VkImageFormatProperties232 *pImageFormatProperties;
         VkResult result;
     } *params = args;
     VkImageFormatProperties2_host pImageFormatProperties_host;
@@ -24580,7 +26382,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties2KHR(void *args)
     {
         VkPhysicalDevice physicalDevice;
         const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo;
-        VkImageFormatProperties2 *pImageFormatProperties;
+        VkImageFormatProperties232 *pImageFormatProperties;
         VkResult result;
     } *params = args;
     VkImageFormatProperties2_host pImageFormatProperties_host;
@@ -24614,7 +26416,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties(void *args)
     struct
     {
         VkPhysicalDevice physicalDevice;
-        VkPhysicalDeviceMemoryProperties *pMemoryProperties;
+        VkPhysicalDeviceMemoryProperties32 *pMemoryProperties;
     } *params = args;
     VkPhysicalDeviceMemoryProperties_host pMemoryProperties_host;

@@ -24646,7 +26448,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties2(void *args)
     struct
     {
         VkPhysicalDevice physicalDevice;
-        VkPhysicalDeviceMemoryProperties2 *pMemoryProperties;
+        VkPhysicalDeviceMemoryProperties232 *pMemoryProperties;
     } *params = args;
     VkPhysicalDeviceMemoryProperties2_host pMemoryProperties_host;
     struct conversion_context ctx;
@@ -24682,7 +26484,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties2KHR(void *args)
     struct
     {
         VkPhysicalDevice physicalDevice;
-        VkPhysicalDeviceMemoryProperties2 *pMemoryProperties;
+        VkPhysicalDeviceMemoryProperties232 *pMemoryProperties;
     } *params = args;
     VkPhysicalDeviceMemoryProperties2_host pMemoryProperties_host;
     struct conversion_context ctx;
@@ -24815,7 +26617,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceProperties(void *args)
     struct
     {
         VkPhysicalDevice physicalDevice;
-        VkPhysicalDeviceProperties *pProperties;
+        VkPhysicalDeviceProperties32 *pProperties;
     } *params = args;
     VkPhysicalDeviceProperties_host pProperties_host;

@@ -24847,7 +26649,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceProperties2(void *args)
     struct
     {
         VkPhysicalDevice physicalDevice;
-        VkPhysicalDeviceProperties2 *pProperties;
+        VkPhysicalDeviceProperties232 *pProperties;
     } *params = args;
     VkPhysicalDeviceProperties2_host pProperties_host;
     struct conversion_context ctx;
@@ -24883,7 +26685,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceProperties2KHR(void *args)
     struct
     {
         VkPhysicalDevice physicalDevice;
-        VkPhysicalDeviceProperties2 *pProperties;
+        VkPhysicalDeviceProperties232 *pProperties;
     } *params = args;
     VkPhysicalDeviceProperties2_host pProperties_host;
     struct conversion_context ctx;
@@ -25175,7 +26977,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args)
     struct
     {
         VkPhysicalDevice physicalDevice;
-        const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo;
+        const VkPhysicalDeviceSurfaceInfo2KHR32 *pSurfaceInfo;
         VkSurfaceCapabilities2KHR *pSurfaceCapabilities;
         VkResult result;
     } *params = args;
@@ -25243,7 +27045,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args)
     struct
     {
         VkPhysicalDevice physicalDevice;
-        const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo;
+        const VkPhysicalDeviceSurfaceInfo2KHR32 *pSurfaceInfo;
         uint32_t *pSurfaceFormatCount;
         VkSurfaceFormat2KHR *pSurfaceFormats;
         VkResult result;
@@ -25505,7 +27307,7 @@ static NTSTATUS thunk32_vkGetPipelineExecutableInternalRepresentationsKHR(void *
     struct
     {
         VkDevice device;
-        const VkPipelineExecutableInfoKHR *pExecutableInfo;
+        const VkPipelineExecutableInfoKHR32 *pExecutableInfo;
         uint32_t *pInternalRepresentationCount;
         VkPipelineExecutableInternalRepresentationKHR *pInternalRepresentations;
         VkResult result;
@@ -25540,7 +27342,7 @@ static NTSTATUS thunk32_vkGetPipelineExecutablePropertiesKHR(void *args)
     struct
     {
         VkDevice device;
-        const VkPipelineInfoKHR *pPipelineInfo;
+        const VkPipelineInfoKHR32 *pPipelineInfo;
         uint32_t *pExecutableCount;
         VkPipelineExecutablePropertiesKHR *pProperties;
         VkResult result;
@@ -25575,9 +27377,9 @@ static NTSTATUS thunk32_vkGetPipelineExecutableStatisticsKHR(void *args)
     struct
     {
         VkDevice device;
-        const VkPipelineExecutableInfoKHR *pExecutableInfo;
+        const VkPipelineExecutableInfoKHR32 *pExecutableInfo;
         uint32_t *pStatisticCount;
-        VkPipelineExecutableStatisticKHR *pStatistics;
+        VkPipelineExecutableStatisticKHR32 *pStatistics;
         VkResult result;
     } *params = args;
     VkPipelineExecutableInfoKHR_host pExecutableInfo_host;
@@ -25616,7 +27418,7 @@ static NTSTATUS thunk32_vkGetPipelinePropertiesEXT(void *args)
     struct
     {
         VkDevice device;
-        const VkPipelineInfoEXT *pPipelineInfo;
+        const VkPipelineInfoEXT32 *pPipelineInfo;
         VkBaseOutStructure *pPipelineProperties;
         VkResult result;
     } *params = args;
@@ -26248,7 +28050,7 @@ static NTSTATUS thunk32_vkInvalidateMappedMemoryRanges(void *args)
     {
         VkDevice device;
         uint32_t memoryRangeCount;
-        const VkMappedMemoryRange *pMemoryRanges;
+        const VkMappedMemoryRange32 *pMemoryRanges;
         VkResult result;
     } *params = args;
     const VkMappedMemoryRange_host *pMemoryRanges_host;
@@ -26416,7 +28218,7 @@ static NTSTATUS thunk32_vkQueueBindSparse(void *args)
     {
         VkQueue queue;
         uint32_t bindInfoCount;
-        const VkBindSparseInfo *pBindInfo;
+        const VkBindSparseInfo32 *pBindInfo;
         VkFence DECLSPEC_ALIGN(8) fence;
         VkResult result;
     } *params = args;
@@ -26623,7 +28425,7 @@ static NTSTATUS thunk32_vkQueueSubmit2(void *args)
     {
         VkQueue queue;
         uint32_t submitCount;
-        const VkSubmitInfo2 *pSubmits;
+        const VkSubmitInfo232 *pSubmits;
         VkFence DECLSPEC_ALIGN(8) fence;
         VkResult result;
     } *params = args;
@@ -26666,7 +28468,7 @@ static NTSTATUS thunk32_vkQueueSubmit2KHR(void *args)
     {
         VkQueue queue;
         uint32_t submitCount;
-        const VkSubmitInfo2 *pSubmits;
+        const VkSubmitInfo232 *pSubmits;
         VkFence DECLSPEC_ALIGN(8) fence;
         VkResult result;
     } *params = args;
@@ -27017,7 +28819,7 @@ static NTSTATUS thunk32_vkSetDebugUtilsObjectNameEXT(void *args)
     struct
     {
         VkDevice device;
-        const VkDebugUtilsObjectNameInfoEXT *pNameInfo;
+        const VkDebugUtilsObjectNameInfoEXT32 *pNameInfo;
         VkResult result;
     } *params = args;
     VkDebugUtilsObjectNameInfoEXT_host pNameInfo_host;
@@ -27052,7 +28854,7 @@ static NTSTATUS thunk32_vkSetDebugUtilsObjectTagEXT(void *args)
     struct
     {
         VkDevice device;
-        const VkDebugUtilsObjectTagInfoEXT *pTagInfo;
+        const VkDebugUtilsObjectTagInfoEXT32 *pTagInfo;
         VkResult result;
     } *params = args;
     VkDebugUtilsObjectTagInfoEXT_host pTagInfo_host;
@@ -27215,7 +29017,7 @@ static NTSTATUS thunk32_vkSignalSemaphore(void *args)
     struct
     {
         VkDevice device;
-        const VkSemaphoreSignalInfo *pSignalInfo;
+        const VkSemaphoreSignalInfo32 *pSignalInfo;
         VkResult result;
     } *params = args;
     VkSemaphoreSignalInfo_host pSignalInfo_host;
@@ -27248,7 +29050,7 @@ static NTSTATUS thunk32_vkSignalSemaphoreKHR(void *args)
     struct
     {
         VkDevice device;
-        const VkSemaphoreSignalInfo *pSignalInfo;
+        const VkSemaphoreSignalInfo32 *pSignalInfo;
         VkResult result;
     } *params = args;
     VkSemaphoreSignalInfo_host pSignalInfo_host;
@@ -27288,7 +29090,7 @@ static NTSTATUS thunk32_vkSubmitDebugUtilsMessageEXT(void *args)
         VkInstance instance;
         VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity;
         VkDebugUtilsMessageTypeFlagsEXT messageTypes;
-        const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData;
+        const VkDebugUtilsMessengerCallbackDataEXT32 *pCallbackData;
     } *params = args;
     VkDebugUtilsMessengerCallbackDataEXT_host pCallbackData_host;
     struct conversion_context ctx;
@@ -27509,9 +29311,9 @@ static NTSTATUS thunk32_vkUpdateDescriptorSets(void *args)
     {
         VkDevice device;
         uint32_t descriptorWriteCount;
-        const VkWriteDescriptorSet *pDescriptorWrites;
+        const VkWriteDescriptorSet32 *pDescriptorWrites;
         uint32_t descriptorCopyCount;
-        const VkCopyDescriptorSet *pDescriptorCopies;
+        const VkCopyDescriptorSet32 *pDescriptorCopies;
     } *params = args;
     const VkWriteDescriptorSet_host *pDescriptorWrites_host;
     const VkCopyDescriptorSet_host *pDescriptorCopies_host;

[PATCH 8/8] winevulkan: Get rid of *_host types.

[Jacek Caban]

From: Jacek Caban

Use WINE_VK_HOST instead.
---
 dlls/winevulkan/make_vulkan      |   73 +-
 dlls/winevulkan/vulkan.c         |   16 +-
 dlls/winevulkan/vulkan_private.h |    1 +
 dlls/winevulkan/vulkan_thunks.c  |  962 +++++------
 dlls/winevulkan/vulkan_thunks.h  | 2764 ++----------------------------
 5 files changed, 662 insertions(+), 3154 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 5ab4e44778a..191a0a3be03 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -673,7 +673,7 @@ class VkFunction(object):
             return True
         return self.name in DIRECT_CALL_FUNCTIONS

-    def pfn(self, prefix="p", call_conv=None, conv=False):
+    def pfn(self, prefix="p", call_conv=None):
         """ Create function pointer. """

if call_conv:
@@ -686,8 +686,6 @@ class VkFunction(object):
                 pfn += param.const + " "

pfn += param.type
-            if conv and param.needs_host_type():
-                pfn += "_host"

if param.is_pointer():
                 pfn += " " + param.pointer
@@ -720,7 +718,7 @@ class VkFunction(object):
             proto += " {0}(".format(self.name)

# Add all the parameters.
-        proto += ", ".join([p.definition(is_thunk=is_thunk) for p in self.params])
+        proto += ", ".join([p.definition() for p in self.params])

if is_thunk and self.extra_param:
             proto += ", void *" + self.extra_param
@@ -756,15 +754,14 @@ class VkFunction(object):
         # Declare any tmp parameters for conversion.
         for p in self.params:
             if p.needs_variable(conv, unwrap):
-                host_type = p.type + "_host" if conv and p.needs_host_type() else p.type
                 if p.is_dynamic_array():
                     body += "    {2}{0} *{1}_host;\n".format(
-                        host_type, p.name, "const " if p.is_const() else "")
+                        p.type, p.name, "const " if p.is_const() else "")
                 elif p.optional:
-                    body += "    {0} *{1}_host = NULL;\n".format(host_type, p.name)
+                    body += "    {0} *{1}_host = NULL;\n".format(p.type, p.name)
                     needs_alloc = True
                 else:
-                    body += "    {0} {1}_host;\n".format(host_type, p.name)
+                    body += "    {0} {1}_host;\n".format(p.type, p.name)
             if p.needs_alloc(conv, unwrap):
                 needs_alloc = True

@@ -864,7 +861,7 @@ class VkFunction(object):
             thunk += "    struct\n"
             thunk += "    {\n"
             for p in self.params:
-                thunk += "        {0};\n".format(p.definition(is_thunk=True, is_member=True))
+                thunk += "        {0};\n".format(p.definition(conv=True, is_member=True))
             if self.extra_param:
                 thunk += "        void *{0};\n".format(self.extra_param)
             if self.type != "void":
@@ -1386,7 +1383,7 @@ class VkMember(VkVariable):
         else:
             return "{0}{1} = {2}{1};\n".format(output, self.name, input)

-    def definition(self, align=False, conv=False, postfix=""):
+    def definition(self, align=False, conv=False):
         """ Generate prototype for given function.

Args:
@@ -1404,8 +1401,6 @@ class VkMember(VkVariable):
         text += self.type
         if conv and self.needs_host_type():
             text += "32"
-        elif postfix and self.needs_host_type():
-            text += postfix

if self.is_pointer():
             text += " {0}{1}".format(self.pointer, self.name)
@@ -1606,7 +1601,7 @@ class VkParam(VkVariable):
                 return "    convert_{0}_host_to_{3}({4}{2}_host, {1}{2});\n".format(
                     self.type, prefix, self.name, win_type, ref_part)

-    def definition(self, postfix=None, is_member=False, is_thunk=False):
+    def definition(self, postfix=None, is_member=False, conv=False):
         """ Return prototype for the parameter. E.g. 'const char *foo' """

proto = ""
@@ -1615,8 +1610,8 @@ class VkParam(VkVariable):

proto += self.type
         name = self.name
-        if is_thunk and self.needs_host_type():
-            proto += "32" if is_member else "_host"
+        if conv and self.needs_host_type():
+            proto += "32"

if is_member and self.needs_alignment():
             proto += " DECLSPEC_ALIGN(8)"
@@ -1866,7 +1861,7 @@ class VkStruct(Sequence):

return decoupled_structs

-    def definition(self, align=False, conv=False, postfix=None):
+    def definition(self, align=False, conv=False):
         """ Convert structure to textual definition.

Args:
@@ -1878,13 +1873,7 @@ class VkStruct(Sequence):
         if self.is_alias():
             return ""

-        if postfix:
-            suffix = postfix
-        elif conv:
-            suffix = "32"
-        else:
-            suffix = ""
-
+        suffix = "32" if conv else ""
         if self.union:
             text = "typedef union {0}".format(self.name)
         else:
@@ -1895,9 +1884,9 @@ class VkStruct(Sequence):

for m in self:
             if align and m.needs_alignment():
-                text += "    {0};\n".format(m.definition(align=align, conv=conv, postfix=postfix))
+                text += "    {0};\n".format(m.definition(align=align, conv=conv))
             else:
-                text += "    {0};\n".format(m.definition(conv=conv, postfix=postfix))
+                text += "    {0};\n".format(m.definition(conv=conv))

text += "}} {0}{1};\n".format(self.name, suffix)

@@ -2119,7 +2108,6 @@ class StructConversionFunction(object):
             body += "#if !defined(USE_STRUCT_CONVERSION)\n"

needs_alloc = self.direction != Direction.OUTPUT and self.operand.needs_alloc(self.conv, self.unwrap)
-        host_type = self.type + "_host" if self.operand.needs_host_type() else self.type
         win_type = self.type
         if self.conv and self.operand.needs_host_type():
             win_type += "32"
@@ -2130,9 +2118,9 @@ class StructConversionFunction(object):
             body += "static inline void {0}(".format(self.name)

if self.direction == Direction.OUTPUT:
-                params = ["const {0} *in".format(host_type), "{0} *out".format(win_type)]
+                params = ["const {0} *in".format(self.type), "{0} *out".format(win_type)]
             else:
-                params = ["const {0} *in".format(win_type), "{0} *out".format(host_type)]
+                params = ["const {0} *in".format(win_type), "{0} *out".format(self.type)]

# Generate parameter list
             if needs_alloc:
@@ -2190,13 +2178,12 @@ class StructConversionFunction(object):
                     continue

stype = next(x for x in ext.members if x.name == "sType").values
-                host_type = ext.name + "_host" if self.conv and ext.needs_host_type() else ext.name
                 win_type = ext.name + "32" if self.conv and ext.needs_host_type() else ext.name
                 if self.direction == Direction.INPUT:
                     in_type = "const " + win_type
-                    out_type = host_type
+                    out_type = ext.name
                 else:
-                    in_type = "const " + host_type
+                    in_type = "const " + ext.name
                     out_type = win_type

body += "        case {0}:\n".format(stype)
@@ -2288,10 +2275,6 @@ class ArrayConversionFunction(object):

needs_alloc = self.direction != Direction.OUTPUT and self.array.needs_alloc(self.conv, self.unwrap)

-        if self.conv and self.array.is_struct() and self.array.struct.needs_host_type():
-            host_type = "{0}_host".format(self.type)
-        else:
-            host_type = self.type
         win_type = self.type
         if self.conv and self.array.needs_host_type():
             win_type += "32"
@@ -2300,12 +2283,12 @@ class ArrayConversionFunction(object):
         pointer_part = self.array.pointer if self.array.pointer else "*"

if self.direction == Direction.OUTPUT:
-            params = ["const {0} {1}in".format(host_type, pointer_part),
+            params = ["const {0} {1}in".format(self.type, pointer_part),
                       "{0} {1}out".format(win_type, pointer_part), "uint32_t count"]
             return_type = None
         else:
             params = ["const {0} {1}in".format(win_type, pointer_part), "uint32_t count"]
-            return_type = host_type
+            return_type = self.type

needs_copy = not self.array.is_struct() or self.direction != Direction.INPUT or \
             not self.array.struct.returnedonly or "pNext" in self.array.struct
@@ -2595,18 +2578,6 @@ class VkGenerator(object):

f.write("#define WINE_VK_VERSION VK_API_VERSION_{0}_{1}\n\n".format(WINE_VK_VERSION[0], WINE_VK_VERSION[1]))

-        for struct in self.host_structs:
-            if struct.is_alias():
-                continue
-            f.write("#if defined(USE_STRUCT_CONVERSION)\n")
-            f.write(struct.definition(align=False, postfix="_host"))
-            f.write("#else\n")
-            f.write("typedef {0} {0}_host;\n".format(struct.name))
-            for aliasee in struct.aliased_by:
-                f.write("typedef {0}_host {1}_host;\n".format(struct.name, aliasee.name))
-            f.write("#endif\n\n")
-        f.write("\n")
-
         # Generate prototypes for device and instance functions requiring a custom implementation.
         f.write("/* Functions for which we have custom implementations outside of the thunks. */\n")
         for vk_func in self.registry.funcs.values():
@@ -2626,7 +2597,7 @@ class VkGenerator(object):
                 LOGGER.debug("skipping {0} in vulkan_device_funcs".format(vk_func.name))
                 continue

-            f.write("    {0};\n".format(vk_func.pfn(conv=True)))
+            f.write("    {0};\n".format(vk_func.pfn()))
         f.write("};\n\n")

f.write("/* For use by vkInstance and children */\n")
@@ -2639,7 +2610,7 @@ class VkGenerator(object):
                 LOGGER.debug("skipping {0} in vulkan_instance_funcs".format(vk_func.name))
                 continue

-            f.write("    {0};\n".format(vk_func.pfn(conv=True)))
+            f.write("    {0};\n".format(vk_func.pfn()))
         f.write("};\n\n")

f.write("#define ALL_VK_DEVICE_FUNCS() \\n")
diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 0fa71a31c2f..4f949d0b42d 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -97,7 +97,7 @@ static uint64_t wine_vk_get_wrapper(struct wine_instance *instance, uint64_t nat

static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagBitsEXT severity,
     VkDebugUtilsMessageTypeFlagsEXT message_types,
-    const VkDebugUtilsMessengerCallbackDataEXT_host *callback_data,
+    const VkDebugUtilsMessengerCallbackDataEXT *callback_data,
     void *user_data)
 {
     struct wine_vk_debug_utils_params params;
@@ -609,7 +609,7 @@ static void wine_vk_instance_free(struct wine_instance *instance)
     free(instance);
 }

-VkResult wine_vkAllocateCommandBuffers(VkDevice handle, const VkCommandBufferAllocateInfo_host *allocate_info,
+VkResult wine_vkAllocateCommandBuffers(VkDevice handle, const VkCommandBufferAllocateInfo *allocate_info,
                                        VkCommandBuffer *buffers )
 {
     struct wine_device *device = wine_device_from_handle(handle);
@@ -622,7 +622,7 @@ VkResult wine_vkAllocateCommandBuffers(VkDevice handle, const VkCommandBufferAll

for (i = 0; i < allocate_info->commandBufferCount; i++)
     {
-        VkCommandBufferAllocateInfo_host allocate_info_host;
+        VkCommandBufferAllocateInfo allocate_info_host;

/* TODO: future extensions (none yet) may require pNext conversion. */
         allocate_info_host.pNext = allocate_info->pNext;
@@ -679,7 +679,7 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre

if (TRACE_ON(vulkan))
     {
-        VkPhysicalDeviceProperties_host properties;
+        VkPhysicalDeviceProperties properties;

phys_dev->instance->funcs.p_vkGetPhysicalDeviceProperties(phys_dev->phys_dev, &properties);

@@ -1163,7 +1163,7 @@ void wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR(VkPhysicalDevice phys_d

VkResult wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice phys_dev_handle,
                                                         const VkPhysicalDeviceImageFormatInfo2 *format_info,
-                                                        VkImageFormatProperties2_host *properties)
+                                                        VkImageFormatProperties2 *properties)
 {
     struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(phys_dev_handle);
     VkExternalImageFormatProperties *external_image_properties;
@@ -1186,7 +1186,7 @@ VkResult wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice phys_de

VkResult wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice phys_dev_handle,
                                                            const VkPhysicalDeviceImageFormatInfo2 *format_info,
-                                                           VkImageFormatProperties2_host *properties)
+                                                           VkImageFormatProperties2 *properties)
 {
     struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(phys_dev_handle);
     VkExternalImageFormatProperties *external_image_properties;
@@ -1454,12 +1454,12 @@ VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice handle,
 }

VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice handle,
-                                                         const VkPhysicalDeviceSurfaceInfo2KHR_host *surface_info,
+                                                         const VkPhysicalDeviceSurfaceInfo2KHR *surface_info,
                                                          VkSurfaceCapabilities2KHR *capabilities)
 {
     struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle);
     struct wine_surface *surface = wine_surface_from_handle(surface_info->surface);
-    VkPhysicalDeviceSurfaceInfo2KHR_host host_info;
+    VkPhysicalDeviceSurfaceInfo2KHR host_info;
     VkResult res;

host_info.sType = surface_info->sType;
diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h
index adc067462ce..9c151ab32d8 100644
--- a/dlls/winevulkan/vulkan_private.h
+++ b/dlls/winevulkan/vulkan_private.h
@@ -24,6 +24,7 @@
 #if defined(__i386__)
 #define USE_STRUCT_CONVERSION
 #endif
+#define WINE_VK_HOST
 #define VK_NO_PROTOTYPES

#include <pthread.h>
diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c
index a6266b73c25..0d97069a2aa 100644
--- a/dlls/winevulkan/vulkan_thunks.c
+++ b/dlls/winevulkan/vulkan_thunks.c
@@ -1851,7 +1851,7 @@ static uint64_t wine_vk_unwrap_handle(uint32_t type, uint64_t handle)
 }

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAcquireNextImageInfoKHR_win32_to_host(const VkAcquireNextImageInfoKHR32 *in, VkAcquireNextImageInfoKHR_host *out)
+static inline void convert_VkAcquireNextImageInfoKHR_win32_to_host(const VkAcquireNextImageInfoKHR32 *in, VkAcquireNextImageInfoKHR *out)
 {
     if (!in) return;

@@ -1866,7 +1866,7 @@ static inline void convert_VkAcquireNextImageInfoKHR_win32_to_host(const VkAcqui
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAcquireProfilingLockInfoKHR_win32_to_host(const VkAcquireProfilingLockInfoKHR32 *in, VkAcquireProfilingLockInfoKHR_host *out)
+static inline void convert_VkAcquireProfilingLockInfoKHR_win32_to_host(const VkAcquireProfilingLockInfoKHR32 *in, VkAcquireProfilingLockInfoKHR *out)
 {
     if (!in) return;

@@ -1878,7 +1878,7 @@ static inline void convert_VkAcquireProfilingLockInfoKHR_win32_to_host(const VkA
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCommandBufferAllocateInfo_win32_to_unwrapped_host(const VkCommandBufferAllocateInfo32 *in, VkCommandBufferAllocateInfo_host *out)
+static inline void convert_VkCommandBufferAllocateInfo_win32_to_unwrapped_host(const VkCommandBufferAllocateInfo32 *in, VkCommandBufferAllocateInfo *out)
 {
     if (!in) return;

@@ -1891,7 +1891,7 @@ static inline void convert_VkCommandBufferAllocateInfo_win32_to_unwrapped_host(c
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDescriptorSetAllocateInfo_win32_to_host(const VkDescriptorSetAllocateInfo32 *in, VkDescriptorSetAllocateInfo_host *out)
+static inline void convert_VkDescriptorSetAllocateInfo_win32_to_host(const VkDescriptorSetAllocateInfo32 *in, VkDescriptorSetAllocateInfo *out)
 {
     if (!in) return;

@@ -1904,7 +1904,7 @@ static inline void convert_VkDescriptorSetAllocateInfo_win32_to_host(const VkDes
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryAllocateInfo_win32_to_host(struct conversion_context *ctx, const VkMemoryAllocateInfo32 *in, VkMemoryAllocateInfo_host *out)
+static inline void convert_VkMemoryAllocateInfo_win32_to_host(struct conversion_context *ctx, const VkMemoryAllocateInfo32 *in, VkMemoryAllocateInfo *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -1922,7 +1922,7 @@ static inline void convert_VkMemoryAllocateInfo_win32_to_host(struct conversion_
         {
         case VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV:
         {
-            VkDedicatedAllocationMemoryAllocateInfoNV_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkDedicatedAllocationMemoryAllocateInfoNV *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkDedicatedAllocationMemoryAllocateInfoNV32 *in_ext = (const VkDedicatedAllocationMemoryAllocateInfoNV32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV;
             out_ext->pNext = NULL;
@@ -1983,7 +1983,7 @@ static inline void convert_VkMemoryAllocateInfo_win32_to_host(struct conversion_
         }
         case VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO:
         {
-            VkMemoryDedicatedAllocateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkMemoryDedicatedAllocateInfo *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkMemoryDedicatedAllocateInfo32 *in_ext = (const VkMemoryDedicatedAllocateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO;
             out_ext->pNext = NULL;
@@ -2018,7 +2018,7 @@ static inline void convert_VkMemoryAllocateInfo_win32_to_host(struct conversion_
         }
         case VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO:
         {
-            VkMemoryOpaqueCaptureAddressAllocateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkMemoryOpaqueCaptureAddressAllocateInfo *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkMemoryOpaqueCaptureAddressAllocateInfo32 *in_ext = (const VkMemoryOpaqueCaptureAddressAllocateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO;
             out_ext->pNext = NULL;
@@ -2036,7 +2036,7 @@ static inline void convert_VkMemoryAllocateInfo_win32_to_host(struct conversion_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCommandBufferInheritanceInfo_win32_to_host(const VkCommandBufferInheritanceInfo32 *in, VkCommandBufferInheritanceInfo_host *out)
+static inline void convert_VkCommandBufferInheritanceInfo_win32_to_host(const VkCommandBufferInheritanceInfo32 *in, VkCommandBufferInheritanceInfo *out)
 {
     if (!in) return;

@@ -2052,9 +2052,9 @@ static inline void convert_VkCommandBufferInheritanceInfo_win32_to_host(const Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkCommandBufferInheritanceInfo_host *convert_VkCommandBufferInheritanceInfo_array_win32_to_host(struct conversion_context *ctx, const VkCommandBufferInheritanceInfo32 *in, uint32_t count)
+static inline const VkCommandBufferInheritanceInfo *convert_VkCommandBufferInheritanceInfo_array_win32_to_host(struct conversion_context *ctx, const VkCommandBufferInheritanceInfo32 *in, uint32_t count)
 {
-    VkCommandBufferInheritanceInfo_host *out;
+    VkCommandBufferInheritanceInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2070,7 +2070,7 @@ static inline const VkCommandBufferInheritanceInfo_host *convert_VkCommandBuffer
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCommandBufferBeginInfo_win32_to_host(struct conversion_context *ctx, const VkCommandBufferBeginInfo32 *in, VkCommandBufferBeginInfo_host *out)
+static inline void convert_VkCommandBufferBeginInfo_win32_to_host(struct conversion_context *ctx, const VkCommandBufferBeginInfo32 *in, VkCommandBufferBeginInfo *out)
 {
     if (!in) return;

@@ -2082,7 +2082,7 @@ static inline void convert_VkCommandBufferBeginInfo_win32_to_host(struct convers
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBindAccelerationStructureMemoryInfoNV_win32_to_host(const VkBindAccelerationStructureMemoryInfoNV32 *in, VkBindAccelerationStructureMemoryInfoNV_host *out)
+static inline void convert_VkBindAccelerationStructureMemoryInfoNV_win32_to_host(const VkBindAccelerationStructureMemoryInfoNV32 *in, VkBindAccelerationStructureMemoryInfoNV *out)
 {
     if (!in) return;

@@ -2097,9 +2097,9 @@ static inline void convert_VkBindAccelerationStructureMemoryInfoNV_win32_to_host
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBindAccelerationStructureMemoryInfoNV_host *convert_VkBindAccelerationStructureMemoryInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkBindAccelerationStructureMemoryInfoNV32 *in, uint32_t count)
+static inline const VkBindAccelerationStructureMemoryInfoNV *convert_VkBindAccelerationStructureMemoryInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkBindAccelerationStructureMemoryInfoNV32 *in, uint32_t count)
 {
-    VkBindAccelerationStructureMemoryInfoNV_host *out;
+    VkBindAccelerationStructureMemoryInfoNV *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2115,7 +2115,7 @@ static inline const VkBindAccelerationStructureMemoryInfoNV_host *convert_VkBind
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBindBufferMemoryInfo_win32_to_host(const VkBindBufferMemoryInfo32 *in, VkBindBufferMemoryInfo_host *out)
+static inline void convert_VkBindBufferMemoryInfo_win32_to_host(const VkBindBufferMemoryInfo32 *in, VkBindBufferMemoryInfo *out)
 {
     if (!in) return;

@@ -2128,9 +2128,9 @@ static inline void convert_VkBindBufferMemoryInfo_win32_to_host(const VkBindBuff
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBindBufferMemoryInfo_host *convert_VkBindBufferMemoryInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindBufferMemoryInfo32 *in, uint32_t count)
+static inline const VkBindBufferMemoryInfo *convert_VkBindBufferMemoryInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindBufferMemoryInfo32 *in, uint32_t count)
 {
-    VkBindBufferMemoryInfo_host *out;
+    VkBindBufferMemoryInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2146,7 +2146,7 @@ static inline const VkBindBufferMemoryInfo_host *convert_VkBindBufferMemoryInfo_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBindImageMemoryInfo_win32_to_host(struct conversion_context *ctx, const VkBindImageMemoryInfo32 *in, VkBindImageMemoryInfo_host *out)
+static inline void convert_VkBindImageMemoryInfo_win32_to_host(struct conversion_context *ctx, const VkBindImageMemoryInfo32 *in, VkBindImageMemoryInfo *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -2179,7 +2179,7 @@ static inline void convert_VkBindImageMemoryInfo_win32_to_host(struct conversion
         }
         case VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR:
         {
-            VkBindImageMemorySwapchainInfoKHR_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkBindImageMemorySwapchainInfoKHR *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkBindImageMemorySwapchainInfoKHR32 *in_ext = (const VkBindImageMemorySwapchainInfoKHR32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR;
             out_ext->pNext = NULL;
@@ -2209,9 +2209,9 @@ static inline void convert_VkBindImageMemoryInfo_win32_to_host(struct conversion
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBindImageMemoryInfo_host *convert_VkBindImageMemoryInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindImageMemoryInfo32 *in, uint32_t count)
+static inline const VkBindImageMemoryInfo *convert_VkBindImageMemoryInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindImageMemoryInfo32 *in, uint32_t count)
 {
-    VkBindImageMemoryInfo_host *out;
+    VkBindImageMemoryInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2227,7 +2227,7 @@ static inline const VkBindImageMemoryInfo_host *convert_VkBindImageMemoryInfo_ar
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureGeometryKHR_win32_to_host(const VkAccelerationStructureGeometryKHR32 *in, VkAccelerationStructureGeometryKHR_host *out)
+static inline void convert_VkAccelerationStructureGeometryKHR_win32_to_host(const VkAccelerationStructureGeometryKHR32 *in, VkAccelerationStructureGeometryKHR *out)
 {
     if (!in) return;

@@ -2240,9 +2240,9 @@ static inline void convert_VkAccelerationStructureGeometryKHR_win32_to_host(cons
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkAccelerationStructureGeometryKHR_host *convert_VkAccelerationStructureGeometryKHR_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureGeometryKHR32 *in, uint32_t count)
+static inline const VkAccelerationStructureGeometryKHR *convert_VkAccelerationStructureGeometryKHR_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureGeometryKHR32 *in, uint32_t count)
 {
-    VkAccelerationStructureGeometryKHR_host *out;
+    VkAccelerationStructureGeometryKHR *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2258,9 +2258,9 @@ static inline const VkAccelerationStructureGeometryKHR_host *convert_VkAccelerat
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkAccelerationStructureGeometryKHR_host * const*convert_VkAccelerationStructureGeometryKHR_pointer_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureGeometryKHR32 * const*in, uint32_t count)
+static inline const VkAccelerationStructureGeometryKHR * const*convert_VkAccelerationStructureGeometryKHR_pointer_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureGeometryKHR32 * const*in, uint32_t count)
 {
-    VkAccelerationStructureGeometryKHR_host **out;
+    VkAccelerationStructureGeometryKHR **out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2282,7 +2282,7 @@ static inline const VkAccelerationStructureGeometryKHR_host * const*convert_VkAc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureBuildGeometryInfoKHR32 *in, VkAccelerationStructureBuildGeometryInfoKHR_host *out)
+static inline void convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureBuildGeometryInfoKHR32 *in, VkAccelerationStructureBuildGeometryInfoKHR *out)
 {
     if (!in) return;

@@ -2301,9 +2301,9 @@ static inline void convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkAccelerationStructureBuildGeometryInfoKHR_host *convert_VkAccelerationStructureBuildGeometryInfoKHR_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureBuildGeometryInfoKHR32 *in, uint32_t count)
+static inline const VkAccelerationStructureBuildGeometryInfoKHR *convert_VkAccelerationStructureBuildGeometryInfoKHR_array_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureBuildGeometryInfoKHR32 *in, uint32_t count)
 {
-    VkAccelerationStructureBuildGeometryInfoKHR_host *out;
+    VkAccelerationStructureBuildGeometryInfoKHR *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2319,7 +2319,7 @@ static inline const VkAccelerationStructureBuildGeometryInfoKHR_host *convert_Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMicromapBuildInfoEXT_win32_to_host(const VkMicromapBuildInfoEXT32 *in, VkMicromapBuildInfoEXT_host *out)
+static inline void convert_VkMicromapBuildInfoEXT_win32_to_host(const VkMicromapBuildInfoEXT32 *in, VkMicromapBuildInfoEXT *out)
 {
     if (!in) return;

@@ -2340,9 +2340,9 @@ static inline void convert_VkMicromapBuildInfoEXT_win32_to_host(const VkMicromap
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkMicromapBuildInfoEXT_host *convert_VkMicromapBuildInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkMicromapBuildInfoEXT32 *in, uint32_t count)
+static inline const VkMicromapBuildInfoEXT *convert_VkMicromapBuildInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkMicromapBuildInfoEXT32 *in, uint32_t count)
 {
-    VkMicromapBuildInfoEXT_host *out;
+    VkMicromapBuildInfoEXT *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2358,7 +2358,7 @@ static inline const VkMicromapBuildInfoEXT_host *convert_VkMicromapBuildInfoEXT_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkConditionalRenderingBeginInfoEXT_win32_to_host(const VkConditionalRenderingBeginInfoEXT32 *in, VkConditionalRenderingBeginInfoEXT_host *out)
+static inline void convert_VkConditionalRenderingBeginInfoEXT_win32_to_host(const VkConditionalRenderingBeginInfoEXT32 *in, VkConditionalRenderingBeginInfoEXT *out)
 {
     if (!in) return;

@@ -2371,7 +2371,7 @@ static inline void convert_VkConditionalRenderingBeginInfoEXT_win32_to_host(cons
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRenderPassBeginInfo_win32_to_host(const VkRenderPassBeginInfo32 *in, VkRenderPassBeginInfo_host *out)
+static inline void convert_VkRenderPassBeginInfo_win32_to_host(const VkRenderPassBeginInfo32 *in, VkRenderPassBeginInfo *out)
 {
     if (!in) return;

@@ -2386,7 +2386,7 @@ static inline void convert_VkRenderPassBeginInfo_win32_to_host(const VkRenderPas
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRenderingAttachmentInfo_win32_to_host(const VkRenderingAttachmentInfo32 *in, VkRenderingAttachmentInfo_host *out)
+static inline void convert_VkRenderingAttachmentInfo_win32_to_host(const VkRenderingAttachmentInfo32 *in, VkRenderingAttachmentInfo *out)
 {
     if (!in) return;

@@ -2404,9 +2404,9 @@ static inline void convert_VkRenderingAttachmentInfo_win32_to_host(const VkRende
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkRenderingAttachmentInfo_host *convert_VkRenderingAttachmentInfo_array_win32_to_host(struct conversion_context *ctx, const VkRenderingAttachmentInfo32 *in, uint32_t count)
+static inline const VkRenderingAttachmentInfo *convert_VkRenderingAttachmentInfo_array_win32_to_host(struct conversion_context *ctx, const VkRenderingAttachmentInfo32 *in, uint32_t count)
 {
-    VkRenderingAttachmentInfo_host *out;
+    VkRenderingAttachmentInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2422,7 +2422,7 @@ static inline const VkRenderingAttachmentInfo_host *convert_VkRenderingAttachmen
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRenderingInfo_win32_to_host(struct conversion_context *ctx, const VkRenderingInfo32 *in, VkRenderingInfo_host *out)
+static inline void convert_VkRenderingInfo_win32_to_host(struct conversion_context *ctx, const VkRenderingInfo32 *in, VkRenderingInfo *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -2471,7 +2471,7 @@ static inline void convert_VkRenderingInfo_win32_to_host(struct conversion_conte
         }
         case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR:
         {
-            VkRenderingFragmentShadingRateAttachmentInfoKHR_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkRenderingFragmentShadingRateAttachmentInfoKHR *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkRenderingFragmentShadingRateAttachmentInfoKHR32 *in_ext = (const VkRenderingFragmentShadingRateAttachmentInfoKHR32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR;
             out_ext->pNext = NULL;
@@ -2484,7 +2484,7 @@ static inline void convert_VkRenderingInfo_win32_to_host(struct conversion_conte
         }
         case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT:
         {
-            VkRenderingFragmentDensityMapAttachmentInfoEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkRenderingFragmentDensityMapAttachmentInfoEXT *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkRenderingFragmentDensityMapAttachmentInfoEXT32 *in_ext = (const VkRenderingFragmentDensityMapAttachmentInfoEXT32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT;
             out_ext->pNext = NULL;
@@ -2515,7 +2515,7 @@ static inline void convert_VkRenderingInfo_win32_to_host(struct conversion_conte
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBlitImageInfo2_win32_to_host(const VkBlitImageInfo232 *in, VkBlitImageInfo2_host *out)
+static inline void convert_VkBlitImageInfo2_win32_to_host(const VkBlitImageInfo232 *in, VkBlitImageInfo2 *out)
 {
     if (!in) return;

@@ -2532,7 +2532,7 @@ static inline void convert_VkBlitImageInfo2_win32_to_host(const VkBlitImageInfo2
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGeometryTrianglesNV_win32_to_host(const VkGeometryTrianglesNV32 *in, VkGeometryTrianglesNV_host *out)
+static inline void convert_VkGeometryTrianglesNV_win32_to_host(const VkGeometryTrianglesNV32 *in, VkGeometryTrianglesNV *out)
 {
     if (!in) return;

@@ -2553,7 +2553,7 @@ static inline void convert_VkGeometryTrianglesNV_win32_to_host(const VkGeometryT
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGeometryAABBNV_win32_to_host(const VkGeometryAABBNV32 *in, VkGeometryAABBNV_host *out)
+static inline void convert_VkGeometryAABBNV_win32_to_host(const VkGeometryAABBNV32 *in, VkGeometryAABBNV *out)
 {
     if (!in) return;

@@ -2567,7 +2567,7 @@ static inline void convert_VkGeometryAABBNV_win32_to_host(const VkGeometryAABBNV
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGeometryDataNV_win32_to_host(const VkGeometryDataNV32 *in, VkGeometryDataNV_host *out)
+static inline void convert_VkGeometryDataNV_win32_to_host(const VkGeometryDataNV32 *in, VkGeometryDataNV *out)
 {
     if (!in) return;

@@ -2577,7 +2577,7 @@ static inline void convert_VkGeometryDataNV_win32_to_host(const VkGeometryDataNV
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGeometryNV_win32_to_host(const VkGeometryNV32 *in, VkGeometryNV_host *out)
+static inline void convert_VkGeometryNV_win32_to_host(const VkGeometryNV32 *in, VkGeometryNV *out)
 {
     if (!in) return;

@@ -2590,9 +2590,9 @@ static inline void convert_VkGeometryNV_win32_to_host(const VkGeometryNV32 *in,
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkGeometryNV_host *convert_VkGeometryNV_array_win32_to_host(struct conversion_context *ctx, const VkGeometryNV32 *in, uint32_t count)
+static inline const VkGeometryNV *convert_VkGeometryNV_array_win32_to_host(struct conversion_context *ctx, const VkGeometryNV32 *in, uint32_t count)
 {
-    VkGeometryNV_host *out;
+    VkGeometryNV *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2608,7 +2608,7 @@ static inline const VkGeometryNV_host *convert_VkGeometryNV_array_win32_to_host(
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureInfoNV_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureInfoNV32 *in, VkAccelerationStructureInfoNV_host *out)
+static inline void convert_VkAccelerationStructureInfoNV_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureInfoNV32 *in, VkAccelerationStructureInfoNV *out)
 {
     if (!in) return;

@@ -2623,7 +2623,7 @@ static inline void convert_VkAccelerationStructureInfoNV_win32_to_host(struct co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyAccelerationStructureInfoKHR_win32_to_host(const VkCopyAccelerationStructureInfoKHR32 *in, VkCopyAccelerationStructureInfoKHR_host *out)
+static inline void convert_VkCopyAccelerationStructureInfoKHR_win32_to_host(const VkCopyAccelerationStructureInfoKHR32 *in, VkCopyAccelerationStructureInfoKHR *out)
 {
     if (!in) return;

@@ -2636,7 +2636,7 @@ static inline void convert_VkCopyAccelerationStructureInfoKHR_win32_to_host(cons
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyAccelerationStructureToMemoryInfoKHR_win32_to_host(const VkCopyAccelerationStructureToMemoryInfoKHR32 *in, VkCopyAccelerationStructureToMemoryInfoKHR_host *out)
+static inline void convert_VkCopyAccelerationStructureToMemoryInfoKHR_win32_to_host(const VkCopyAccelerationStructureToMemoryInfoKHR32 *in, VkCopyAccelerationStructureToMemoryInfoKHR *out)
 {
     if (!in) return;

@@ -2649,7 +2649,7 @@ static inline void convert_VkCopyAccelerationStructureToMemoryInfoKHR_win32_to_h
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferCopy_win32_to_host(const VkBufferCopy32 *in, VkBufferCopy_host *out)
+static inline void convert_VkBufferCopy_win32_to_host(const VkBufferCopy32 *in, VkBufferCopy *out)
 {
     if (!in) return;

@@ -2660,9 +2660,9 @@ static inline void convert_VkBufferCopy_win32_to_host(const VkBufferCopy32 *in,
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferCopy_host *convert_VkBufferCopy_array_win32_to_host(struct conversion_context *ctx, const VkBufferCopy32 *in, uint32_t count)
+static inline const VkBufferCopy *convert_VkBufferCopy_array_win32_to_host(struct conversion_context *ctx, const VkBufferCopy32 *in, uint32_t count)
 {
-    VkBufferCopy_host *out;
+    VkBufferCopy *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2678,7 +2678,7 @@ static inline const VkBufferCopy_host *convert_VkBufferCopy_array_win32_to_host(
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferCopy2_win32_to_host(const VkBufferCopy232 *in, VkBufferCopy2_host *out)
+static inline void convert_VkBufferCopy2_win32_to_host(const VkBufferCopy232 *in, VkBufferCopy2 *out)
 {
     if (!in) return;

@@ -2691,9 +2691,9 @@ static inline void convert_VkBufferCopy2_win32_to_host(const VkBufferCopy232 *in
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferCopy2_host *convert_VkBufferCopy2_array_win32_to_host(struct conversion_context *ctx, const VkBufferCopy232 *in, uint32_t count)
+static inline const VkBufferCopy2 *convert_VkBufferCopy2_array_win32_to_host(struct conversion_context *ctx, const VkBufferCopy232 *in, uint32_t count)
 {
-    VkBufferCopy2_host *out;
+    VkBufferCopy2 *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2709,7 +2709,7 @@ static inline const VkBufferCopy2_host *convert_VkBufferCopy2_array_win32_to_hos
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyBufferInfo2_win32_to_host(struct conversion_context *ctx, const VkCopyBufferInfo232 *in, VkCopyBufferInfo2_host *out)
+static inline void convert_VkCopyBufferInfo2_win32_to_host(struct conversion_context *ctx, const VkCopyBufferInfo232 *in, VkCopyBufferInfo2 *out)
 {
     if (!in) return;

@@ -2723,7 +2723,7 @@ static inline void convert_VkCopyBufferInfo2_win32_to_host(struct conversion_con
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferImageCopy_win32_to_host(const VkBufferImageCopy32 *in, VkBufferImageCopy_host *out)
+static inline void convert_VkBufferImageCopy_win32_to_host(const VkBufferImageCopy32 *in, VkBufferImageCopy *out)
 {
     if (!in) return;

@@ -2737,9 +2737,9 @@ static inline void convert_VkBufferImageCopy_win32_to_host(const VkBufferImageCo
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferImageCopy_host *convert_VkBufferImageCopy_array_win32_to_host(struct conversion_context *ctx, const VkBufferImageCopy32 *in, uint32_t count)
+static inline const VkBufferImageCopy *convert_VkBufferImageCopy_array_win32_to_host(struct conversion_context *ctx, const VkBufferImageCopy32 *in, uint32_t count)
 {
-    VkBufferImageCopy_host *out;
+    VkBufferImageCopy *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2755,7 +2755,7 @@ static inline const VkBufferImageCopy_host *convert_VkBufferImageCopy_array_win3
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferImageCopy2_win32_to_host(const VkBufferImageCopy232 *in, VkBufferImageCopy2_host *out)
+static inline void convert_VkBufferImageCopy2_win32_to_host(const VkBufferImageCopy232 *in, VkBufferImageCopy2 *out)
 {
     if (!in) return;

@@ -2771,9 +2771,9 @@ static inline void convert_VkBufferImageCopy2_win32_to_host(const VkBufferImageC
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferImageCopy2_host *convert_VkBufferImageCopy2_array_win32_to_host(struct conversion_context *ctx, const VkBufferImageCopy232 *in, uint32_t count)
+static inline const VkBufferImageCopy2 *convert_VkBufferImageCopy2_array_win32_to_host(struct conversion_context *ctx, const VkBufferImageCopy232 *in, uint32_t count)
 {
-    VkBufferImageCopy2_host *out;
+    VkBufferImageCopy2 *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2789,7 +2789,7 @@ static inline const VkBufferImageCopy2_host *convert_VkBufferImageCopy2_array_wi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyBufferToImageInfo2_win32_to_host(struct conversion_context *ctx, const VkCopyBufferToImageInfo232 *in, VkCopyBufferToImageInfo2_host *out)
+static inline void convert_VkCopyBufferToImageInfo2_win32_to_host(struct conversion_context *ctx, const VkCopyBufferToImageInfo232 *in, VkCopyBufferToImageInfo2 *out)
 {
     if (!in) return;

@@ -2804,7 +2804,7 @@ static inline void convert_VkCopyBufferToImageInfo2_win32_to_host(struct convers
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyImageInfo2_win32_to_host(const VkCopyImageInfo232 *in, VkCopyImageInfo2_host *out)
+static inline void convert_VkCopyImageInfo2_win32_to_host(const VkCopyImageInfo232 *in, VkCopyImageInfo2 *out)
 {
     if (!in) return;

@@ -2820,7 +2820,7 @@ static inline void convert_VkCopyImageInfo2_win32_to_host(const VkCopyImageInfo2
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyImageToBufferInfo2_win32_to_host(struct conversion_context *ctx, const VkCopyImageToBufferInfo232 *in, VkCopyImageToBufferInfo2_host *out)
+static inline void convert_VkCopyImageToBufferInfo2_win32_to_host(struct conversion_context *ctx, const VkCopyImageToBufferInfo232 *in, VkCopyImageToBufferInfo2 *out)
 {
     if (!in) return;

@@ -2835,7 +2835,7 @@ static inline void convert_VkCopyImageToBufferInfo2_win32_to_host(struct convers
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyMemoryToAccelerationStructureInfoKHR_win32_to_host(const VkCopyMemoryToAccelerationStructureInfoKHR32 *in, VkCopyMemoryToAccelerationStructureInfoKHR_host *out)
+static inline void convert_VkCopyMemoryToAccelerationStructureInfoKHR_win32_to_host(const VkCopyMemoryToAccelerationStructureInfoKHR32 *in, VkCopyMemoryToAccelerationStructureInfoKHR *out)
 {
     if (!in) return;

@@ -2848,7 +2848,7 @@ static inline void convert_VkCopyMemoryToAccelerationStructureInfoKHR_win32_to_h
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyMemoryToMicromapInfoEXT_win32_to_host(const VkCopyMemoryToMicromapInfoEXT32 *in, VkCopyMemoryToMicromapInfoEXT_host *out)
+static inline void convert_VkCopyMemoryToMicromapInfoEXT_win32_to_host(const VkCopyMemoryToMicromapInfoEXT32 *in, VkCopyMemoryToMicromapInfoEXT *out)
 {
     if (!in) return;

@@ -2861,7 +2861,7 @@ static inline void convert_VkCopyMemoryToMicromapInfoEXT_win32_to_host(const VkC
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyMicromapInfoEXT_win32_to_host(const VkCopyMicromapInfoEXT32 *in, VkCopyMicromapInfoEXT_host *out)
+static inline void convert_VkCopyMicromapInfoEXT_win32_to_host(const VkCopyMicromapInfoEXT32 *in, VkCopyMicromapInfoEXT *out)
 {
     if (!in) return;

@@ -2874,7 +2874,7 @@ static inline void convert_VkCopyMicromapInfoEXT_win32_to_host(const VkCopyMicro
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyMicromapToMemoryInfoEXT_win32_to_host(const VkCopyMicromapToMemoryInfoEXT32 *in, VkCopyMicromapToMemoryInfoEXT_host *out)
+static inline void convert_VkCopyMicromapToMemoryInfoEXT_win32_to_host(const VkCopyMicromapToMemoryInfoEXT32 *in, VkCopyMicromapToMemoryInfoEXT *out)
 {
     if (!in) return;

@@ -2887,7 +2887,7 @@ static inline void convert_VkCopyMicromapToMemoryInfoEXT_win32_to_host(const VkC
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCuLaunchInfoNVX_win32_to_host(const VkCuLaunchInfoNVX32 *in, VkCuLaunchInfoNVX_host *out)
+static inline void convert_VkCuLaunchInfoNVX_win32_to_host(const VkCuLaunchInfoNVX32 *in, VkCuLaunchInfoNVX *out)
 {
     if (!in) return;

@@ -2909,7 +2909,7 @@ static inline void convert_VkCuLaunchInfoNVX_win32_to_host(const VkCuLaunchInfoN
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDecompressMemoryRegionNV_win32_to_host(const VkDecompressMemoryRegionNV32 *in, VkDecompressMemoryRegionNV_host *out)
+static inline void convert_VkDecompressMemoryRegionNV_win32_to_host(const VkDecompressMemoryRegionNV32 *in, VkDecompressMemoryRegionNV *out)
 {
     if (!in) return;

@@ -2922,9 +2922,9 @@ static inline void convert_VkDecompressMemoryRegionNV_win32_to_host(const VkDeco
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkDecompressMemoryRegionNV_host *convert_VkDecompressMemoryRegionNV_array_win32_to_host(struct conversion_context *ctx, const VkDecompressMemoryRegionNV32 *in, uint32_t count)
+static inline const VkDecompressMemoryRegionNV *convert_VkDecompressMemoryRegionNV_array_win32_to_host(struct conversion_context *ctx, const VkDecompressMemoryRegionNV32 *in, uint32_t count)
 {
-    VkDecompressMemoryRegionNV_host *out;
+    VkDecompressMemoryRegionNV *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -2976,7 +2976,7 @@ static inline const VkCommandBuffer *convert_VkCommandBuffer_array_win32_to_host
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkIndirectCommandsStreamNV_win32_to_host(const VkIndirectCommandsStreamNV32 *in, VkIndirectCommandsStreamNV_host *out)
+static inline void convert_VkIndirectCommandsStreamNV_win32_to_host(const VkIndirectCommandsStreamNV32 *in, VkIndirectCommandsStreamNV *out)
 {
     if (!in) return;

@@ -2986,9 +2986,9 @@ static inline void convert_VkIndirectCommandsStreamNV_win32_to_host(const VkIndi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkIndirectCommandsStreamNV_host *convert_VkIndirectCommandsStreamNV_array_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsStreamNV32 *in, uint32_t count)
+static inline const VkIndirectCommandsStreamNV *convert_VkIndirectCommandsStreamNV_array_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsStreamNV32 *in, uint32_t count)
 {
-    VkIndirectCommandsStreamNV_host *out;
+    VkIndirectCommandsStreamNV *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -3004,7 +3004,7 @@ static inline const VkIndirectCommandsStreamNV_host *convert_VkIndirectCommandsS
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGeneratedCommandsInfoNV_win32_to_host(struct conversion_context *ctx, const VkGeneratedCommandsInfoNV32 *in, VkGeneratedCommandsInfoNV_host *out)
+static inline void convert_VkGeneratedCommandsInfoNV_win32_to_host(struct conversion_context *ctx, const VkGeneratedCommandsInfoNV32 *in, VkGeneratedCommandsInfoNV *out)
 {
     if (!in) return;

@@ -3027,7 +3027,7 @@ static inline void convert_VkGeneratedCommandsInfoNV_win32_to_host(struct conver
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferMemoryBarrier_win32_to_host(const VkBufferMemoryBarrier32 *in, VkBufferMemoryBarrier_host *out)
+static inline void convert_VkBufferMemoryBarrier_win32_to_host(const VkBufferMemoryBarrier32 *in, VkBufferMemoryBarrier *out)
 {
     if (!in) return;

@@ -3044,9 +3044,9 @@ static inline void convert_VkBufferMemoryBarrier_win32_to_host(const VkBufferMem
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferMemoryBarrier_host *convert_VkBufferMemoryBarrier_array_win32_to_host(struct conversion_context *ctx, const VkBufferMemoryBarrier32 *in, uint32_t count)
+static inline const VkBufferMemoryBarrier *convert_VkBufferMemoryBarrier_array_win32_to_host(struct conversion_context *ctx, const VkBufferMemoryBarrier32 *in, uint32_t count)
 {
-    VkBufferMemoryBarrier_host *out;
+    VkBufferMemoryBarrier *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -3062,7 +3062,7 @@ static inline const VkBufferMemoryBarrier_host *convert_VkBufferMemoryBarrier_ar
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageMemoryBarrier_win32_to_host(const VkImageMemoryBarrier32 *in, VkImageMemoryBarrier_host *out)
+static inline void convert_VkImageMemoryBarrier_win32_to_host(const VkImageMemoryBarrier32 *in, VkImageMemoryBarrier *out)
 {
     if (!in) return;

@@ -3080,9 +3080,9 @@ static inline void convert_VkImageMemoryBarrier_win32_to_host(const VkImageMemor
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkImageMemoryBarrier_host *convert_VkImageMemoryBarrier_array_win32_to_host(struct conversion_context *ctx, const VkImageMemoryBarrier32 *in, uint32_t count)
+static inline const VkImageMemoryBarrier *convert_VkImageMemoryBarrier_array_win32_to_host(struct conversion_context *ctx, const VkImageMemoryBarrier32 *in, uint32_t count)
 {
-    VkImageMemoryBarrier_host *out;
+    VkImageMemoryBarrier *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -3098,7 +3098,7 @@ static inline const VkImageMemoryBarrier_host *convert_VkImageMemoryBarrier_arra
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferMemoryBarrier2_win32_to_host(const VkBufferMemoryBarrier232 *in, VkBufferMemoryBarrier2_host *out)
+static inline void convert_VkBufferMemoryBarrier2_win32_to_host(const VkBufferMemoryBarrier232 *in, VkBufferMemoryBarrier2 *out)
 {
     if (!in) return;

@@ -3117,9 +3117,9 @@ static inline void convert_VkBufferMemoryBarrier2_win32_to_host(const VkBufferMe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferMemoryBarrier2_host *convert_VkBufferMemoryBarrier2_array_win32_to_host(struct conversion_context *ctx, const VkBufferMemoryBarrier232 *in, uint32_t count)
+static inline const VkBufferMemoryBarrier2 *convert_VkBufferMemoryBarrier2_array_win32_to_host(struct conversion_context *ctx, const VkBufferMemoryBarrier232 *in, uint32_t count)
 {
-    VkBufferMemoryBarrier2_host *out;
+    VkBufferMemoryBarrier2 *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -3135,7 +3135,7 @@ static inline const VkBufferMemoryBarrier2_host *convert_VkBufferMemoryBarrier2_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageMemoryBarrier2_win32_to_host(const VkImageMemoryBarrier232 *in, VkImageMemoryBarrier2_host *out)
+static inline void convert_VkImageMemoryBarrier2_win32_to_host(const VkImageMemoryBarrier232 *in, VkImageMemoryBarrier2 *out)
 {
     if (!in) return;

@@ -3155,9 +3155,9 @@ static inline void convert_VkImageMemoryBarrier2_win32_to_host(const VkImageMemo
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkImageMemoryBarrier2_host *convert_VkImageMemoryBarrier2_array_win32_to_host(struct conversion_context *ctx, const VkImageMemoryBarrier232 *in, uint32_t count)
+static inline const VkImageMemoryBarrier2 *convert_VkImageMemoryBarrier2_array_win32_to_host(struct conversion_context *ctx, const VkImageMemoryBarrier232 *in, uint32_t count)
 {
-    VkImageMemoryBarrier2_host *out;
+    VkImageMemoryBarrier2 *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -3173,7 +3173,7 @@ static inline const VkImageMemoryBarrier2_host *convert_VkImageMemoryBarrier2_ar
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDependencyInfo_win32_to_host(struct conversion_context *ctx, const VkDependencyInfo32 *in, VkDependencyInfo_host *out)
+static inline void convert_VkDependencyInfo_win32_to_host(struct conversion_context *ctx, const VkDependencyInfo32 *in, VkDependencyInfo *out)
 {
     if (!in) return;

@@ -3190,7 +3190,7 @@ static inline void convert_VkDependencyInfo_win32_to_host(struct conversion_cont
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDescriptorImageInfo_win32_to_host(const VkDescriptorImageInfo32 *in, VkDescriptorImageInfo_host *out)
+static inline void convert_VkDescriptorImageInfo_win32_to_host(const VkDescriptorImageInfo32 *in, VkDescriptorImageInfo *out)
 {
     if (!in) return;

@@ -3201,9 +3201,9 @@ static inline void convert_VkDescriptorImageInfo_win32_to_host(const VkDescripto
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkDescriptorImageInfo_host *convert_VkDescriptorImageInfo_array_win32_to_host(struct conversion_context *ctx, const VkDescriptorImageInfo32 *in, uint32_t count)
+static inline const VkDescriptorImageInfo *convert_VkDescriptorImageInfo_array_win32_to_host(struct conversion_context *ctx, const VkDescriptorImageInfo32 *in, uint32_t count)
 {
-    VkDescriptorImageInfo_host *out;
+    VkDescriptorImageInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -3219,7 +3219,7 @@ static inline const VkDescriptorImageInfo_host *convert_VkDescriptorImageInfo_ar
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDescriptorBufferInfo_win32_to_host(const VkDescriptorBufferInfo32 *in, VkDescriptorBufferInfo_host *out)
+static inline void convert_VkDescriptorBufferInfo_win32_to_host(const VkDescriptorBufferInfo32 *in, VkDescriptorBufferInfo *out)
 {
     if (!in) return;

@@ -3230,9 +3230,9 @@ static inline void convert_VkDescriptorBufferInfo_win32_to_host(const VkDescript
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkDescriptorBufferInfo_host *convert_VkDescriptorBufferInfo_array_win32_to_host(struct conversion_context *ctx, const VkDescriptorBufferInfo32 *in, uint32_t count)
+static inline const VkDescriptorBufferInfo *convert_VkDescriptorBufferInfo_array_win32_to_host(struct conversion_context *ctx, const VkDescriptorBufferInfo32 *in, uint32_t count)
 {
-    VkDescriptorBufferInfo_host *out;
+    VkDescriptorBufferInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -3248,7 +3248,7 @@ static inline const VkDescriptorBufferInfo_host *convert_VkDescriptorBufferInfo_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkWriteDescriptorSet_win32_to_host(struct conversion_context *ctx, const VkWriteDescriptorSet32 *in, VkWriteDescriptorSet_host *out)
+static inline void convert_VkWriteDescriptorSet_win32_to_host(struct conversion_context *ctx, const VkWriteDescriptorSet32 *in, VkWriteDescriptorSet *out)
 {
     if (!in) return;

@@ -3266,9 +3266,9 @@ static inline void convert_VkWriteDescriptorSet_win32_to_host(struct conversion_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkWriteDescriptorSet_host *convert_VkWriteDescriptorSet_array_win32_to_host(struct conversion_context *ctx, const VkWriteDescriptorSet32 *in, uint32_t count)
+static inline const VkWriteDescriptorSet *convert_VkWriteDescriptorSet_array_win32_to_host(struct conversion_context *ctx, const VkWriteDescriptorSet32 *in, uint32_t count)
 {
-    VkWriteDescriptorSet_host *out;
+    VkWriteDescriptorSet *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -3284,7 +3284,7 @@ static inline const VkWriteDescriptorSet_host *convert_VkWriteDescriptorSet_arra
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkResolveImageInfo2_win32_to_host(const VkResolveImageInfo232 *in, VkResolveImageInfo2_host *out)
+static inline void convert_VkResolveImageInfo2_win32_to_host(const VkResolveImageInfo232 *in, VkResolveImageInfo2 *out)
 {
     if (!in) return;

@@ -3300,7 +3300,7 @@ static inline void convert_VkResolveImageInfo2_win32_to_host(const VkResolveImag
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPerformanceMarkerInfoINTEL_win32_to_host(const VkPerformanceMarkerInfoINTEL32 *in, VkPerformanceMarkerInfoINTEL_host *out)
+static inline void convert_VkPerformanceMarkerInfoINTEL_win32_to_host(const VkPerformanceMarkerInfoINTEL32 *in, VkPerformanceMarkerInfoINTEL *out)
 {
     if (!in) return;

@@ -3311,7 +3311,7 @@ static inline void convert_VkPerformanceMarkerInfoINTEL_win32_to_host(const VkPe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPerformanceOverrideInfoINTEL_win32_to_host(const VkPerformanceOverrideInfoINTEL32 *in, VkPerformanceOverrideInfoINTEL_host *out)
+static inline void convert_VkPerformanceOverrideInfoINTEL_win32_to_host(const VkPerformanceOverrideInfoINTEL32 *in, VkPerformanceOverrideInfoINTEL *out)
 {
     if (!in) return;

@@ -3324,7 +3324,7 @@ static inline void convert_VkPerformanceOverrideInfoINTEL_win32_to_host(const Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkStridedDeviceAddressRegionKHR_win32_to_host(const VkStridedDeviceAddressRegionKHR32 *in, VkStridedDeviceAddressRegionKHR_host *out)
+static inline void convert_VkStridedDeviceAddressRegionKHR_win32_to_host(const VkStridedDeviceAddressRegionKHR32 *in, VkStridedDeviceAddressRegionKHR *out)
 {
     if (!in) return;

@@ -3335,9 +3335,9 @@ static inline void convert_VkStridedDeviceAddressRegionKHR_win32_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkDependencyInfo_host *convert_VkDependencyInfo_array_win32_to_host(struct conversion_context *ctx, const VkDependencyInfo32 *in, uint32_t count)
+static inline const VkDependencyInfo *convert_VkDependencyInfo_array_win32_to_host(struct conversion_context *ctx, const VkDependencyInfo32 *in, uint32_t count)
 {
-    VkDependencyInfo_host *out;
+    VkDependencyInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -3353,7 +3353,7 @@ static inline const VkDependencyInfo_host *convert_VkDependencyInfo_array_win32_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureCreateInfoKHR_win32_to_host(const VkAccelerationStructureCreateInfoKHR32 *in, VkAccelerationStructureCreateInfoKHR_host *out)
+static inline void convert_VkAccelerationStructureCreateInfoKHR_win32_to_host(const VkAccelerationStructureCreateInfoKHR32 *in, VkAccelerationStructureCreateInfoKHR *out)
 {
     if (!in) return;

@@ -3369,7 +3369,7 @@ static inline void convert_VkAccelerationStructureCreateInfoKHR_win32_to_host(co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureCreateInfoNV32 *in, VkAccelerationStructureCreateInfoNV_host *out)
+static inline void convert_VkAccelerationStructureCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureCreateInfoNV32 *in, VkAccelerationStructureCreateInfoNV *out)
 {
     if (!in) return;

@@ -3381,7 +3381,7 @@ static inline void convert_VkAccelerationStructureCreateInfoNV_win32_to_host(str
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferCreateInfo_win32_to_host(struct conversion_context *ctx, const VkBufferCreateInfo32 *in, VkBufferCreateInfo_host *out)
+static inline void convert_VkBufferCreateInfo_win32_to_host(struct conversion_context *ctx, const VkBufferCreateInfo32 *in, VkBufferCreateInfo *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -3425,7 +3425,7 @@ static inline void convert_VkBufferCreateInfo_win32_to_host(struct conversion_co
         }
         case VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO:
         {
-            VkBufferOpaqueCaptureAddressCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkBufferOpaqueCaptureAddressCreateInfo *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkBufferOpaqueCaptureAddressCreateInfo32 *in_ext = (const VkBufferOpaqueCaptureAddressCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO;
             out_ext->pNext = NULL;
@@ -3436,7 +3436,7 @@ static inline void convert_VkBufferCreateInfo_win32_to_host(struct conversion_co
         }
         case VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT:
         {
-            VkBufferDeviceAddressCreateInfoEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkBufferDeviceAddressCreateInfoEXT *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkBufferDeviceAddressCreateInfoEXT32 *in_ext = (const VkBufferDeviceAddressCreateInfoEXT32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT;
             out_ext->pNext = NULL;
@@ -3454,7 +3454,7 @@ static inline void convert_VkBufferCreateInfo_win32_to_host(struct conversion_co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferViewCreateInfo_win32_to_host(const VkBufferViewCreateInfo32 *in, VkBufferViewCreateInfo_host *out)
+static inline void convert_VkBufferViewCreateInfo_win32_to_host(const VkBufferViewCreateInfo32 *in, VkBufferViewCreateInfo *out)
 {
     if (!in) return;

@@ -3469,7 +3469,7 @@ static inline void convert_VkBufferViewCreateInfo_win32_to_host(const VkBufferVi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineCreationFeedback_host_to_win32(const VkPipelineCreationFeedback_host *in, VkPipelineCreationFeedback32 *out)
+static inline void convert_VkPipelineCreationFeedback_host_to_win32(const VkPipelineCreationFeedback *in, VkPipelineCreationFeedback32 *out)
 {
     if (!in) return;

@@ -3479,9 +3479,9 @@ static inline void convert_VkPipelineCreationFeedback_host_to_win32(const VkPipe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkPipelineCreationFeedback_host *convert_VkPipelineCreationFeedback_array_win32_to_host(struct conversion_context *ctx, const VkPipelineCreationFeedback32 *in, uint32_t count)
+static inline VkPipelineCreationFeedback *convert_VkPipelineCreationFeedback_array_win32_to_host(struct conversion_context *ctx, const VkPipelineCreationFeedback32 *in, uint32_t count)
 {
-    VkPipelineCreationFeedback_host *out;
+    VkPipelineCreationFeedback *out;
     if (!in || !count) return NULL;

out = conversion_context_alloc(ctx, count * sizeof(*out));
@@ -3491,7 +3491,7 @@ static inline VkPipelineCreationFeedback_host *convert_VkPipelineCreationFeedbac
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineCreationFeedback_array_host_to_win32(const VkPipelineCreationFeedback_host *in, VkPipelineCreationFeedback32 *out, uint32_t count)
+static inline void convert_VkPipelineCreationFeedback_array_host_to_win32(const VkPipelineCreationFeedback *in, VkPipelineCreationFeedback32 *out, uint32_t count)
 {
     unsigned int i;

@@ -3607,7 +3607,7 @@ static inline void convert_VkPipelineShaderStageCreateInfo_win64_to_host(struct
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineShaderStageCreateInfo_win32_to_host(struct conversion_context *ctx, const VkPipelineShaderStageCreateInfo32 *in, VkPipelineShaderStageCreateInfo_host *out)
+static inline void convert_VkPipelineShaderStageCreateInfo_win32_to_host(struct conversion_context *ctx, const VkPipelineShaderStageCreateInfo32 *in, VkPipelineShaderStageCreateInfo *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -3641,7 +3641,7 @@ static inline void convert_VkPipelineShaderStageCreateInfo_win32_to_host(struct
         }
         case VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT:
         {
-            VkShaderModuleValidationCacheCreateInfoEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkShaderModuleValidationCacheCreateInfoEXT *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkShaderModuleValidationCacheCreateInfoEXT32 *in_ext = (const VkShaderModuleValidationCacheCreateInfoEXT32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT;
             out_ext->pNext = NULL;
@@ -3652,7 +3652,7 @@ static inline void convert_VkPipelineShaderStageCreateInfo_win32_to_host(struct
         }
         case VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT:
         {
-            VkDebugUtilsObjectNameInfoEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkDebugUtilsObjectNameInfoEXT *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkDebugUtilsObjectNameInfoEXT32 *in_ext = (const VkDebugUtilsObjectNameInfoEXT32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT;
             out_ext->pNext = NULL;
@@ -3724,7 +3724,7 @@ static inline void convert_VkComputePipelineCreateInfo_win64_to_host(struct conv
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conversion_context *ctx, const VkComputePipelineCreateInfo32 *in, VkComputePipelineCreateInfo_host *out)
+static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conversion_context *ctx, const VkComputePipelineCreateInfo32 *in, VkComputePipelineCreateInfo *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -3745,7 +3745,7 @@ static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conv
         {
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
-            VkPipelineCreationFeedbackCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPipelineCreationFeedbackCreateInfo *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkPipelineCreationFeedbackCreateInfo32 *in_ext = (const VkPipelineCreationFeedbackCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             out_ext->pNext = NULL;
@@ -3758,7 +3758,7 @@ static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI:
         {
-            VkSubpassShadingPipelineCreateInfoHUAWEI_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkSubpassShadingPipelineCreateInfoHUAWEI *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkSubpassShadingPipelineCreateInfoHUAWEI32 *in_ext = (const VkSubpassShadingPipelineCreateInfoHUAWEI32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI;
             out_ext->pNext = NULL;
@@ -3802,7 +3802,7 @@ static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conv
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkComputePipelineCreateInfo_host_to_win32(const VkComputePipelineCreateInfo_host *in, const VkComputePipelineCreateInfo32 *out)
+static inline void convert_VkComputePipelineCreateInfo_host_to_win32(const VkComputePipelineCreateInfo *in, const VkComputePipelineCreateInfo32 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -3817,7 +3817,7 @@ static inline void convert_VkComputePipelineCreateInfo_host_to_win32(const VkCom
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
             VkPipelineCreationFeedbackCreateInfo32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
-            const VkPipelineCreationFeedbackCreateInfo_host *in_ext = (const VkPipelineCreationFeedbackCreateInfo_host *)in_header;
+            const VkPipelineCreationFeedbackCreateInfo *in_ext = (const VkPipelineCreationFeedbackCreateInfo *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             convert_VkPipelineCreationFeedback_array_host_to_win32(in_ext->pPipelineCreationFeedback, out_ext->pPipelineCreationFeedback, 1);
             convert_VkPipelineCreationFeedback_array_host_to_win32(in_ext->pPipelineStageCreationFeedbacks, out_ext->pPipelineStageCreationFeedbacks, in_ext->pipelineStageCreationFeedbackCount);
@@ -3850,9 +3850,9 @@ static inline const VkComputePipelineCreateInfo *convert_VkComputePipelineCreate
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkComputePipelineCreateInfo_host *convert_VkComputePipelineCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkComputePipelineCreateInfo32 *in, uint32_t count)
+static inline const VkComputePipelineCreateInfo *convert_VkComputePipelineCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkComputePipelineCreateInfo32 *in, uint32_t count)
 {
-    VkComputePipelineCreateInfo_host *out;
+    VkComputePipelineCreateInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -3868,7 +3868,7 @@ static inline const VkComputePipelineCreateInfo_host *convert_VkComputePipelineC
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkComputePipelineCreateInfo_array_host_to_win32(const VkComputePipelineCreateInfo_host *in, const VkComputePipelineCreateInfo32 *out, uint32_t count)
+static inline void convert_VkComputePipelineCreateInfo_array_host_to_win32(const VkComputePipelineCreateInfo *in, const VkComputePipelineCreateInfo32 *out, uint32_t count)
 {
     unsigned int i;

@@ -3882,7 +3882,7 @@ static inline void convert_VkComputePipelineCreateInfo_array_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCuFunctionCreateInfoNVX_win32_to_host(const VkCuFunctionCreateInfoNVX32 *in, VkCuFunctionCreateInfoNVX_host *out)
+static inline void convert_VkCuFunctionCreateInfoNVX_win32_to_host(const VkCuFunctionCreateInfoNVX32 *in, VkCuFunctionCreateInfoNVX *out)
 {
     if (!in) return;

@@ -3894,7 +3894,7 @@ static inline void convert_VkCuFunctionCreateInfoNVX_win32_to_host(const VkCuFun
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDescriptorUpdateTemplateCreateInfo_win32_to_host(const VkDescriptorUpdateTemplateCreateInfo32 *in, VkDescriptorUpdateTemplateCreateInfo_host *out)
+static inline void convert_VkDescriptorUpdateTemplateCreateInfo_win32_to_host(const VkDescriptorUpdateTemplateCreateInfo32 *in, VkDescriptorUpdateTemplateCreateInfo *out)
 {
     if (!in) return;

@@ -7578,7 +7578,7 @@ static inline void convert_VkDeviceCreateInfo_win32_to_host(struct conversion_co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkFramebufferCreateInfo_win32_to_host(const VkFramebufferCreateInfo32 *in, VkFramebufferCreateInfo_host *out)
+static inline void convert_VkFramebufferCreateInfo_win32_to_host(const VkFramebufferCreateInfo32 *in, VkFramebufferCreateInfo *out)
 {
     if (!in) return;

@@ -7613,9 +7613,9 @@ static inline const VkPipelineShaderStageCreateInfo *convert_VkPipelineShaderSta
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkPipelineShaderStageCreateInfo_host *convert_VkPipelineShaderStageCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkPipelineShaderStageCreateInfo32 *in, uint32_t count)
+static inline const VkPipelineShaderStageCreateInfo *convert_VkPipelineShaderStageCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkPipelineShaderStageCreateInfo32 *in, uint32_t count)
 {
-    VkPipelineShaderStageCreateInfo_host *out;
+    VkPipelineShaderStageCreateInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -7645,7 +7645,7 @@ static inline void convert_VkGraphicsShaderGroupCreateInfoNV_win64_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGraphicsShaderGroupCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkGraphicsShaderGroupCreateInfoNV32 *in, VkGraphicsShaderGroupCreateInfoNV_host *out)
+static inline void convert_VkGraphicsShaderGroupCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkGraphicsShaderGroupCreateInfoNV32 *in, VkGraphicsShaderGroupCreateInfoNV *out)
 {
     if (!in) return;

@@ -7677,9 +7677,9 @@ static inline const VkGraphicsShaderGroupCreateInfoNV *convert_VkGraphicsShaderG
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkGraphicsShaderGroupCreateInfoNV_host *convert_VkGraphicsShaderGroupCreateInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkGraphicsShaderGroupCreateInfoNV32 *in, uint32_t count)
+static inline const VkGraphicsShaderGroupCreateInfoNV *convert_VkGraphicsShaderGroupCreateInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkGraphicsShaderGroupCreateInfoNV32 *in, uint32_t count)
 {
-    VkGraphicsShaderGroupCreateInfoNV_host *out;
+    VkGraphicsShaderGroupCreateInfoNV *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -7900,7 +7900,7 @@ static inline void convert_VkGraphicsPipelineCreateInfo_win64_to_host(struct con
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGraphicsPipelineCreateInfo_win32_to_host(struct conversion_context *ctx, const VkGraphicsPipelineCreateInfo32 *in, VkGraphicsPipelineCreateInfo_host *out)
+static inline void convert_VkGraphicsPipelineCreateInfo_win32_to_host(struct conversion_context *ctx, const VkGraphicsPipelineCreateInfo32 *in, VkGraphicsPipelineCreateInfo *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -7933,7 +7933,7 @@ static inline void convert_VkGraphicsPipelineCreateInfo_win32_to_host(struct con
         {
         case VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV:
         {
-            VkGraphicsPipelineShaderGroupsCreateInfoNV_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkGraphicsPipelineShaderGroupsCreateInfoNV *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkGraphicsPipelineShaderGroupsCreateInfoNV32 *in_ext = (const VkGraphicsPipelineShaderGroupsCreateInfoNV32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV;
             out_ext->pNext = NULL;
@@ -7972,7 +7972,7 @@ static inline void convert_VkGraphicsPipelineCreateInfo_win32_to_host(struct con
         }
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
-            VkPipelineCreationFeedbackCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPipelineCreationFeedbackCreateInfo *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkPipelineCreationFeedbackCreateInfo32 *in_ext = (const VkPipelineCreationFeedbackCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             out_ext->pNext = NULL;
@@ -8105,7 +8105,7 @@ static inline void convert_VkGraphicsPipelineCreateInfo_win32_to_host(struct con
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGraphicsPipelineCreateInfo_host_to_win32(const VkGraphicsPipelineCreateInfo_host *in, const VkGraphicsPipelineCreateInfo32 *out)
+static inline void convert_VkGraphicsPipelineCreateInfo_host_to_win32(const VkGraphicsPipelineCreateInfo *in, const VkGraphicsPipelineCreateInfo32 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -8120,7 +8120,7 @@ static inline void convert_VkGraphicsPipelineCreateInfo_host_to_win32(const VkGr
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
             VkPipelineCreationFeedbackCreateInfo32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
-            const VkPipelineCreationFeedbackCreateInfo_host *in_ext = (const VkPipelineCreationFeedbackCreateInfo_host *)in_header;
+            const VkPipelineCreationFeedbackCreateInfo *in_ext = (const VkPipelineCreationFeedbackCreateInfo *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             convert_VkPipelineCreationFeedback_array_host_to_win32(in_ext->pPipelineCreationFeedback, out_ext->pPipelineCreationFeedback, 1);
             convert_VkPipelineCreationFeedback_array_host_to_win32(in_ext->pPipelineStageCreationFeedbacks, out_ext->pPipelineStageCreationFeedbacks, in_ext->pipelineStageCreationFeedbackCount);
@@ -8153,9 +8153,9 @@ static inline const VkGraphicsPipelineCreateInfo *convert_VkGraphicsPipelineCrea
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkGraphicsPipelineCreateInfo_host *convert_VkGraphicsPipelineCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkGraphicsPipelineCreateInfo32 *in, uint32_t count)
+static inline const VkGraphicsPipelineCreateInfo *convert_VkGraphicsPipelineCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkGraphicsPipelineCreateInfo32 *in, uint32_t count)
 {
-    VkGraphicsPipelineCreateInfo_host *out;
+    VkGraphicsPipelineCreateInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -8171,7 +8171,7 @@ static inline const VkGraphicsPipelineCreateInfo_host *convert_VkGraphicsPipelin
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGraphicsPipelineCreateInfo_array_host_to_win32(const VkGraphicsPipelineCreateInfo_host *in, const VkGraphicsPipelineCreateInfo32 *out, uint32_t count)
+static inline void convert_VkGraphicsPipelineCreateInfo_array_host_to_win32(const VkGraphicsPipelineCreateInfo *in, const VkGraphicsPipelineCreateInfo32 *out, uint32_t count)
 {
     unsigned int i;

@@ -8236,7 +8236,7 @@ static inline void convert_VkImageCreateInfo_win32_to_host(struct conversion_con
         }
         case VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHR:
         {
-            VkImageSwapchainCreateInfoKHR_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkImageSwapchainCreateInfoKHR *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkImageSwapchainCreateInfoKHR32 *in_ext = (const VkImageSwapchainCreateInfoKHR32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHR;
             out_ext->pNext = NULL;
@@ -8301,7 +8301,7 @@ static inline void convert_VkImageCreateInfo_win32_to_host(struct conversion_con
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageViewCreateInfo_win32_to_host(struct conversion_context *ctx, const VkImageViewCreateInfo32 *in, VkImageViewCreateInfo_host *out)
+static inline void convert_VkImageViewCreateInfo_win32_to_host(struct conversion_context *ctx, const VkImageViewCreateInfo32 *in, VkImageViewCreateInfo *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -8334,7 +8334,7 @@ static inline void convert_VkImageViewCreateInfo_win32_to_host(struct conversion
         }
         case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO:
         {
-            VkSamplerYcbcrConversionInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkSamplerYcbcrConversionInfo *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkSamplerYcbcrConversionInfo32 *in_ext = (const VkSamplerYcbcrConversionInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO;
             out_ext->pNext = NULL;
@@ -8387,7 +8387,7 @@ static inline void convert_VkImageViewCreateInfo_win32_to_host(struct conversion
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkIndirectCommandsLayoutTokenNV_win32_to_host(const VkIndirectCommandsLayoutTokenNV32 *in, VkIndirectCommandsLayoutTokenNV_host *out)
+static inline void convert_VkIndirectCommandsLayoutTokenNV_win32_to_host(const VkIndirectCommandsLayoutTokenNV32 *in, VkIndirectCommandsLayoutTokenNV *out)
 {
     if (!in) return;

@@ -8410,9 +8410,9 @@ static inline void convert_VkIndirectCommandsLayoutTokenNV_win32_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkIndirectCommandsLayoutTokenNV_host *convert_VkIndirectCommandsLayoutTokenNV_array_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsLayoutTokenNV32 *in, uint32_t count)
+static inline const VkIndirectCommandsLayoutTokenNV *convert_VkIndirectCommandsLayoutTokenNV_array_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsLayoutTokenNV32 *in, uint32_t count)
 {
-    VkIndirectCommandsLayoutTokenNV_host *out;
+    VkIndirectCommandsLayoutTokenNV *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -8428,7 +8428,7 @@ static inline const VkIndirectCommandsLayoutTokenNV_host *convert_VkIndirectComm
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkIndirectCommandsLayoutCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsLayoutCreateInfoNV32 *in, VkIndirectCommandsLayoutCreateInfoNV_host *out)
+static inline void convert_VkIndirectCommandsLayoutCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkIndirectCommandsLayoutCreateInfoNV32 *in, VkIndirectCommandsLayoutCreateInfoNV *out)
 {
     if (!in) return;

@@ -8614,7 +8614,7 @@ static inline void convert_VkInstanceCreateInfo_win32_to_host(struct conversion_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMicromapCreateInfoEXT_win32_to_host(const VkMicromapCreateInfoEXT32 *in, VkMicromapCreateInfoEXT_host *out)
+static inline void convert_VkMicromapCreateInfoEXT_win32_to_host(const VkMicromapCreateInfoEXT32 *in, VkMicromapCreateInfoEXT *out)
 {
     if (!in) return;

@@ -8652,7 +8652,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoKHR_win64_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRayTracingPipelineCreateInfoKHR_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoKHR32 *in, VkRayTracingPipelineCreateInfoKHR_host *out)
+static inline void convert_VkRayTracingPipelineCreateInfoKHR_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoKHR32 *in, VkRayTracingPipelineCreateInfoKHR *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -8680,7 +8680,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoKHR_win32_to_host(struc
         {
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
-            VkPipelineCreationFeedbackCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPipelineCreationFeedbackCreateInfo *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkPipelineCreationFeedbackCreateInfo32 *in_ext = (const VkPipelineCreationFeedbackCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             out_ext->pNext = NULL;
@@ -8714,7 +8714,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoKHR_win32_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRayTracingPipelineCreateInfoKHR_host_to_win32(const VkRayTracingPipelineCreateInfoKHR_host *in, const VkRayTracingPipelineCreateInfoKHR32 *out)
+static inline void convert_VkRayTracingPipelineCreateInfoKHR_host_to_win32(const VkRayTracingPipelineCreateInfoKHR *in, const VkRayTracingPipelineCreateInfoKHR32 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -8729,7 +8729,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoKHR_host_to_win32(const
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
             VkPipelineCreationFeedbackCreateInfo32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
-            const VkPipelineCreationFeedbackCreateInfo_host *in_ext = (const VkPipelineCreationFeedbackCreateInfo_host *)in_header;
+            const VkPipelineCreationFeedbackCreateInfo *in_ext = (const VkPipelineCreationFeedbackCreateInfo *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             convert_VkPipelineCreationFeedback_array_host_to_win32(in_ext->pPipelineCreationFeedback, out_ext->pPipelineCreationFeedback, 1);
             convert_VkPipelineCreationFeedback_array_host_to_win32(in_ext->pPipelineStageCreationFeedbacks, out_ext->pPipelineStageCreationFeedbacks, in_ext->pipelineStageCreationFeedbackCount);
@@ -8762,9 +8762,9 @@ static inline const VkRayTracingPipelineCreateInfoKHR *convert_VkRayTracingPipel
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkRayTracingPipelineCreateInfoKHR_host *convert_VkRayTracingPipelineCreateInfoKHR_array_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoKHR32 *in, uint32_t count)
+static inline const VkRayTracingPipelineCreateInfoKHR *convert_VkRayTracingPipelineCreateInfoKHR_array_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoKHR32 *in, uint32_t count)
 {
-    VkRayTracingPipelineCreateInfoKHR_host *out;
+    VkRayTracingPipelineCreateInfoKHR *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -8780,7 +8780,7 @@ static inline const VkRayTracingPipelineCreateInfoKHR_host *convert_VkRayTracing
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRayTracingPipelineCreateInfoKHR_array_host_to_win32(const VkRayTracingPipelineCreateInfoKHR_host *in, const VkRayTracingPipelineCreateInfoKHR32 *out, uint32_t count)
+static inline void convert_VkRayTracingPipelineCreateInfoKHR_array_host_to_win32(const VkRayTracingPipelineCreateInfoKHR *in, const VkRayTracingPipelineCreateInfoKHR32 *out, uint32_t count)
 {
     unsigned int i;

@@ -8813,7 +8813,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoNV_win64_to_host(struct
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRayTracingPipelineCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoNV32 *in, VkRayTracingPipelineCreateInfoNV_host *out)
+static inline void convert_VkRayTracingPipelineCreateInfoNV_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoNV32 *in, VkRayTracingPipelineCreateInfoNV *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -8838,7 +8838,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoNV_win32_to_host(struct
         {
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
-            VkPipelineCreationFeedbackCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPipelineCreationFeedbackCreateInfo *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkPipelineCreationFeedbackCreateInfo32 *in_ext = (const VkPipelineCreationFeedbackCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             out_ext->pNext = NULL;
@@ -8858,7 +8858,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoNV_win32_to_host(struct
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRayTracingPipelineCreateInfoNV_host_to_win32(const VkRayTracingPipelineCreateInfoNV_host *in, const VkRayTracingPipelineCreateInfoNV32 *out)
+static inline void convert_VkRayTracingPipelineCreateInfoNV_host_to_win32(const VkRayTracingPipelineCreateInfoNV *in, const VkRayTracingPipelineCreateInfoNV32 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -8873,7 +8873,7 @@ static inline void convert_VkRayTracingPipelineCreateInfoNV_host_to_win32(const
         case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
         {
             VkPipelineCreationFeedbackCreateInfo32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
-            const VkPipelineCreationFeedbackCreateInfo_host *in_ext = (const VkPipelineCreationFeedbackCreateInfo_host *)in_header;
+            const VkPipelineCreationFeedbackCreateInfo *in_ext = (const VkPipelineCreationFeedbackCreateInfo *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO;
             convert_VkPipelineCreationFeedback_array_host_to_win32(in_ext->pPipelineCreationFeedback, out_ext->pPipelineCreationFeedback, 1);
             convert_VkPipelineCreationFeedback_array_host_to_win32(in_ext->pPipelineStageCreationFeedbacks, out_ext->pPipelineStageCreationFeedbacks, in_ext->pipelineStageCreationFeedbackCount);
@@ -8906,9 +8906,9 @@ static inline const VkRayTracingPipelineCreateInfoNV *convert_VkRayTracingPipeli
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkRayTracingPipelineCreateInfoNV_host *convert_VkRayTracingPipelineCreateInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoNV32 *in, uint32_t count)
+static inline const VkRayTracingPipelineCreateInfoNV *convert_VkRayTracingPipelineCreateInfoNV_array_win32_to_host(struct conversion_context *ctx, const VkRayTracingPipelineCreateInfoNV32 *in, uint32_t count)
 {
-    VkRayTracingPipelineCreateInfoNV_host *out;
+    VkRayTracingPipelineCreateInfoNV *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -8924,7 +8924,7 @@ static inline const VkRayTracingPipelineCreateInfoNV_host *convert_VkRayTracingP
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkRayTracingPipelineCreateInfoNV_array_host_to_win32(const VkRayTracingPipelineCreateInfoNV_host *in, const VkRayTracingPipelineCreateInfoNV32 *out, uint32_t count)
+static inline void convert_VkRayTracingPipelineCreateInfoNV_array_host_to_win32(const VkRayTracingPipelineCreateInfoNV *in, const VkRayTracingPipelineCreateInfoNV32 *out, uint32_t count)
 {
     unsigned int i;

@@ -8970,7 +8970,7 @@ static inline void convert_VkSamplerCreateInfo_win32_to_host(struct conversion_c
         {
         case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO:
         {
-            VkSamplerYcbcrConversionInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkSamplerYcbcrConversionInfo *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkSamplerYcbcrConversionInfo32 *in_ext = (const VkSamplerYcbcrConversionInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO;
             out_ext->pNext = NULL;
@@ -9051,7 +9051,7 @@ static inline void convert_VkSemaphoreCreateInfo_win32_to_host(struct conversion
         }
         case VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO:
         {
-            VkSemaphoreTypeCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkSemaphoreTypeCreateInfo *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkSemaphoreTypeCreateInfo32 *in_ext = (const VkSemaphoreTypeCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO;
             out_ext->pNext = NULL;
@@ -9089,7 +9089,7 @@ static inline void convert_VkShaderModuleCreateInfo_win32_to_host(struct convers
         {
         case VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT:
         {
-            VkShaderModuleValidationCacheCreateInfoEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkShaderModuleValidationCacheCreateInfoEXT *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkShaderModuleValidationCacheCreateInfoEXT32 *in_ext = (const VkShaderModuleValidationCacheCreateInfoEXT32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT;
             out_ext->pNext = NULL;
@@ -9133,7 +9133,7 @@ static inline void convert_VkSwapchainCreateInfoKHR_win64_to_host(const VkSwapch
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSwapchainCreateInfoKHR_win32_to_host(const VkSwapchainCreateInfoKHR32 *in, VkSwapchainCreateInfoKHR_host *out)
+static inline void convert_VkSwapchainCreateInfoKHR_win32_to_host(const VkSwapchainCreateInfoKHR32 *in, VkSwapchainCreateInfoKHR *out)
 {
     if (!in) return;

@@ -9172,7 +9172,7 @@ static inline void convert_VkDebugMarkerObjectNameInfoEXT_win64_to_host(const Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDebugMarkerObjectNameInfoEXT_win32_to_host(const VkDebugMarkerObjectNameInfoEXT32 *in, VkDebugMarkerObjectNameInfoEXT_host *out)
+static inline void convert_VkDebugMarkerObjectNameInfoEXT_win32_to_host(const VkDebugMarkerObjectNameInfoEXT32 *in, VkDebugMarkerObjectNameInfoEXT *out)
 {
     if (!in) return;

@@ -9200,7 +9200,7 @@ static inline void convert_VkDebugMarkerObjectTagInfoEXT_win64_to_host(const VkD
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDebugMarkerObjectTagInfoEXT_win32_to_host(const VkDebugMarkerObjectTagInfoEXT32 *in, VkDebugMarkerObjectTagInfoEXT_host *out)
+static inline void convert_VkDebugMarkerObjectTagInfoEXT_win32_to_host(const VkDebugMarkerObjectTagInfoEXT32 *in, VkDebugMarkerObjectTagInfoEXT *out)
 {
     if (!in) return;

@@ -9215,7 +9215,7 @@ static inline void convert_VkDebugMarkerObjectTagInfoEXT_win32_to_host(const VkD
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMappedMemoryRange_win32_to_host(const VkMappedMemoryRange32 *in, VkMappedMemoryRange_host *out)
+static inline void convert_VkMappedMemoryRange_win32_to_host(const VkMappedMemoryRange32 *in, VkMappedMemoryRange *out)
 {
     if (!in) return;

@@ -9228,9 +9228,9 @@ static inline void convert_VkMappedMemoryRange_win32_to_host(const VkMappedMemor
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkMappedMemoryRange_host *convert_VkMappedMemoryRange_array_win32_to_host(struct conversion_context *ctx, const VkMappedMemoryRange32 *in, uint32_t count)
+static inline const VkMappedMemoryRange *convert_VkMappedMemoryRange_array_win32_to_host(struct conversion_context *ctx, const VkMappedMemoryRange32 *in, uint32_t count)
 {
-    VkMappedMemoryRange_host *out;
+    VkMappedMemoryRange *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -9246,7 +9246,7 @@ static inline const VkMappedMemoryRange_host *convert_VkMappedMemoryRange_array_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureBuildSizesInfoKHR_win32_to_host(const VkAccelerationStructureBuildSizesInfoKHR32 *in, VkAccelerationStructureBuildSizesInfoKHR_host *out)
+static inline void convert_VkAccelerationStructureBuildSizesInfoKHR_win32_to_host(const VkAccelerationStructureBuildSizesInfoKHR32 *in, VkAccelerationStructureBuildSizesInfoKHR *out)
 {
     if (!in) return;

@@ -9259,7 +9259,7 @@ static inline void convert_VkAccelerationStructureBuildSizesInfoKHR_win32_to_hos
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureBuildSizesInfoKHR_host_to_win32(const VkAccelerationStructureBuildSizesInfoKHR_host *in, VkAccelerationStructureBuildSizesInfoKHR32 *out)
+static inline void convert_VkAccelerationStructureBuildSizesInfoKHR_host_to_win32(const VkAccelerationStructureBuildSizesInfoKHR *in, VkAccelerationStructureBuildSizesInfoKHR32 *out)
 {
     if (!in) return;

@@ -9270,7 +9270,7 @@ static inline void convert_VkAccelerationStructureBuildSizesInfoKHR_host_to_win3
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureDeviceAddressInfoKHR_win32_to_host(const VkAccelerationStructureDeviceAddressInfoKHR32 *in, VkAccelerationStructureDeviceAddressInfoKHR_host *out)
+static inline void convert_VkAccelerationStructureDeviceAddressInfoKHR_win32_to_host(const VkAccelerationStructureDeviceAddressInfoKHR32 *in, VkAccelerationStructureDeviceAddressInfoKHR *out)
 {
     if (!in) return;

@@ -9281,7 +9281,7 @@ static inline void convert_VkAccelerationStructureDeviceAddressInfoKHR_win32_to_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkAccelerationStructureMemoryRequirementsInfoNV_win32_to_host(const VkAccelerationStructureMemoryRequirementsInfoNV32 *in, VkAccelerationStructureMemoryRequirementsInfoNV_host *out)
+static inline void convert_VkAccelerationStructureMemoryRequirementsInfoNV_win32_to_host(const VkAccelerationStructureMemoryRequirementsInfoNV32 *in, VkAccelerationStructureMemoryRequirementsInfoNV *out)
 {
     if (!in) return;

@@ -9293,7 +9293,7 @@ static inline void convert_VkAccelerationStructureMemoryRequirementsInfoNV_win32
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryRequirements_host_to_win32(const VkMemoryRequirements_host *in, VkMemoryRequirements32 *out)
+static inline void convert_VkMemoryRequirements_host_to_win32(const VkMemoryRequirements *in, VkMemoryRequirements32 *out)
 {
     if (!in) return;

@@ -9304,7 +9304,7 @@ static inline void convert_VkMemoryRequirements_host_to_win32(const VkMemoryRequ
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryRequirements2KHR_win32_to_host(const VkMemoryRequirements2KHR32 *in, VkMemoryRequirements2KHR_host *out)
+static inline void convert_VkMemoryRequirements2KHR_win32_to_host(const VkMemoryRequirements2KHR32 *in, VkMemoryRequirements2KHR *out)
 {
     if (!in) return;

@@ -9314,7 +9314,7 @@ static inline void convert_VkMemoryRequirements2KHR_win32_to_host(const VkMemory
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryRequirements2KHR_host_to_win32(const VkMemoryRequirements2KHR_host *in, VkMemoryRequirements2KHR32 *out)
+static inline void convert_VkMemoryRequirements2KHR_host_to_win32(const VkMemoryRequirements2KHR *in, VkMemoryRequirements2KHR32 *out)
 {
     if (!in) return;

@@ -9323,7 +9323,7 @@ static inline void convert_VkMemoryRequirements2KHR_host_to_win32(const VkMemory
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferDeviceAddressInfo_win32_to_host(const VkBufferDeviceAddressInfo32 *in, VkBufferDeviceAddressInfo_host *out)
+static inline void convert_VkBufferDeviceAddressInfo_win32_to_host(const VkBufferDeviceAddressInfo32 *in, VkBufferDeviceAddressInfo *out)
 {
     if (!in) return;

@@ -9334,7 +9334,7 @@ static inline void convert_VkBufferDeviceAddressInfo_win32_to_host(const VkBuffe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBufferMemoryRequirementsInfo2_win32_to_host(const VkBufferMemoryRequirementsInfo232 *in, VkBufferMemoryRequirementsInfo2_host *out)
+static inline void convert_VkBufferMemoryRequirementsInfo2_win32_to_host(const VkBufferMemoryRequirementsInfo232 *in, VkBufferMemoryRequirementsInfo2 *out)
 {
     if (!in) return;

@@ -9345,7 +9345,7 @@ static inline void convert_VkBufferMemoryRequirementsInfo2_win32_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryRequirements2_win32_to_host(const VkMemoryRequirements232 *in, VkMemoryRequirements2_host *out)
+static inline void convert_VkMemoryRequirements2_win32_to_host(const VkMemoryRequirements232 *in, VkMemoryRequirements2 *out)
 {
     if (!in) return;

@@ -9355,7 +9355,7 @@ static inline void convert_VkMemoryRequirements2_win32_to_host(const VkMemoryReq
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryRequirements2_host_to_win32(const VkMemoryRequirements2_host *in, VkMemoryRequirements232 *out)
+static inline void convert_VkMemoryRequirements2_host_to_win32(const VkMemoryRequirements2 *in, VkMemoryRequirements232 *out)
 {
     if (!in) return;

@@ -9364,7 +9364,7 @@ static inline void convert_VkMemoryRequirements2_host_to_win32(const VkMemoryReq
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDescriptorSetBindingReferenceVALVE_win32_to_host(const VkDescriptorSetBindingReferenceVALVE32 *in, VkDescriptorSetBindingReferenceVALVE_host *out)
+static inline void convert_VkDescriptorSetBindingReferenceVALVE_win32_to_host(const VkDescriptorSetBindingReferenceVALVE32 *in, VkDescriptorSetBindingReferenceVALVE *out)
 {
     if (!in) return;

@@ -9376,9 +9376,9 @@ static inline void convert_VkDescriptorSetBindingReferenceVALVE_win32_to_host(co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBufferCreateInfo_host *convert_VkBufferCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkBufferCreateInfo32 *in, uint32_t count)
+static inline const VkBufferCreateInfo *convert_VkBufferCreateInfo_array_win32_to_host(struct conversion_context *ctx, const VkBufferCreateInfo32 *in, uint32_t count)
 {
-    VkBufferCreateInfo_host *out;
+    VkBufferCreateInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -9394,7 +9394,7 @@ static inline const VkBufferCreateInfo_host *convert_VkBufferCreateInfo_array_wi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceBufferMemoryRequirements_win32_to_host(struct conversion_context *ctx, const VkDeviceBufferMemoryRequirements32 *in, VkDeviceBufferMemoryRequirements_host *out)
+static inline void convert_VkDeviceBufferMemoryRequirements_win32_to_host(struct conversion_context *ctx, const VkDeviceBufferMemoryRequirements32 *in, VkDeviceBufferMemoryRequirements *out)
 {
     if (!in) return;

@@ -9405,7 +9405,7 @@ static inline void convert_VkDeviceBufferMemoryRequirements_win32_to_host(struct
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultCountsEXT_win32_to_host(const VkDeviceFaultCountsEXT32 *in, VkDeviceFaultCountsEXT_host *out)
+static inline void convert_VkDeviceFaultCountsEXT_win32_to_host(const VkDeviceFaultCountsEXT32 *in, VkDeviceFaultCountsEXT *out)
 {
     if (!in) return;

@@ -9418,7 +9418,7 @@ static inline void convert_VkDeviceFaultCountsEXT_win32_to_host(const VkDeviceFa
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultCountsEXT_host_to_win32(const VkDeviceFaultCountsEXT_host *in, VkDeviceFaultCountsEXT32 *out)
+static inline void convert_VkDeviceFaultCountsEXT_host_to_win32(const VkDeviceFaultCountsEXT *in, VkDeviceFaultCountsEXT32 *out)
 {
     if (!in) return;

@@ -9429,7 +9429,7 @@ static inline void convert_VkDeviceFaultCountsEXT_host_to_win32(const VkDeviceFa
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultAddressInfoEXT_win32_to_host(const VkDeviceFaultAddressInfoEXT32 *in, VkDeviceFaultAddressInfoEXT_host *out)
+static inline void convert_VkDeviceFaultAddressInfoEXT_win32_to_host(const VkDeviceFaultAddressInfoEXT32 *in, VkDeviceFaultAddressInfoEXT *out)
 {
     if (!in) return;

@@ -9440,7 +9440,7 @@ static inline void convert_VkDeviceFaultAddressInfoEXT_win32_to_host(const VkDev
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultAddressInfoEXT_host_to_win32(const VkDeviceFaultAddressInfoEXT_host *in, VkDeviceFaultAddressInfoEXT32 *out)
+static inline void convert_VkDeviceFaultAddressInfoEXT_host_to_win32(const VkDeviceFaultAddressInfoEXT *in, VkDeviceFaultAddressInfoEXT32 *out)
 {
     if (!in) return;

@@ -9451,9 +9451,9 @@ static inline void convert_VkDeviceFaultAddressInfoEXT_host_to_win32(const VkDev
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkDeviceFaultAddressInfoEXT_host *convert_VkDeviceFaultAddressInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultAddressInfoEXT32 *in, uint32_t count)
+static inline VkDeviceFaultAddressInfoEXT *convert_VkDeviceFaultAddressInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultAddressInfoEXT32 *in, uint32_t count)
 {
-    VkDeviceFaultAddressInfoEXT_host *out;
+    VkDeviceFaultAddressInfoEXT *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -9469,7 +9469,7 @@ static inline VkDeviceFaultAddressInfoEXT_host *convert_VkDeviceFaultAddressInfo
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultAddressInfoEXT_array_host_to_win32(const VkDeviceFaultAddressInfoEXT_host *in, VkDeviceFaultAddressInfoEXT32 *out, uint32_t count)
+static inline void convert_VkDeviceFaultAddressInfoEXT_array_host_to_win32(const VkDeviceFaultAddressInfoEXT *in, VkDeviceFaultAddressInfoEXT32 *out, uint32_t count)
 {
     unsigned int i;

@@ -9483,7 +9483,7 @@ static inline void convert_VkDeviceFaultAddressInfoEXT_array_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultVendorInfoEXT_win32_to_host(const VkDeviceFaultVendorInfoEXT32 *in, VkDeviceFaultVendorInfoEXT_host *out)
+static inline void convert_VkDeviceFaultVendorInfoEXT_win32_to_host(const VkDeviceFaultVendorInfoEXT32 *in, VkDeviceFaultVendorInfoEXT *out)
 {
     if (!in) return;

@@ -9494,7 +9494,7 @@ static inline void convert_VkDeviceFaultVendorInfoEXT_win32_to_host(const VkDevi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultVendorInfoEXT_host_to_win32(const VkDeviceFaultVendorInfoEXT_host *in, VkDeviceFaultVendorInfoEXT32 *out)
+static inline void convert_VkDeviceFaultVendorInfoEXT_host_to_win32(const VkDeviceFaultVendorInfoEXT *in, VkDeviceFaultVendorInfoEXT32 *out)
 {
     if (!in) return;

@@ -9505,9 +9505,9 @@ static inline void convert_VkDeviceFaultVendorInfoEXT_host_to_win32(const VkDevi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkDeviceFaultVendorInfoEXT_host *convert_VkDeviceFaultVendorInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultVendorInfoEXT32 *in, uint32_t count)
+static inline VkDeviceFaultVendorInfoEXT *convert_VkDeviceFaultVendorInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultVendorInfoEXT32 *in, uint32_t count)
 {
-    VkDeviceFaultVendorInfoEXT_host *out;
+    VkDeviceFaultVendorInfoEXT *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -9523,7 +9523,7 @@ static inline VkDeviceFaultVendorInfoEXT_host *convert_VkDeviceFaultVendorInfoEX
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultVendorInfoEXT_array_host_to_win32(const VkDeviceFaultVendorInfoEXT_host *in, VkDeviceFaultVendorInfoEXT32 *out, uint32_t count)
+static inline void convert_VkDeviceFaultVendorInfoEXT_array_host_to_win32(const VkDeviceFaultVendorInfoEXT *in, VkDeviceFaultVendorInfoEXT32 *out, uint32_t count)
 {
     unsigned int i;

@@ -9537,7 +9537,7 @@ static inline void convert_VkDeviceFaultVendorInfoEXT_array_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultInfoEXT_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultInfoEXT32 *in, VkDeviceFaultInfoEXT_host *out)
+static inline void convert_VkDeviceFaultInfoEXT_win32_to_host(struct conversion_context *ctx, const VkDeviceFaultInfoEXT32 *in, VkDeviceFaultInfoEXT *out)
 {
     if (!in) return;

@@ -9551,7 +9551,7 @@ static inline void convert_VkDeviceFaultInfoEXT_win32_to_host(struct conversion_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceFaultInfoEXT_host_to_win32(const VkDeviceFaultInfoEXT_host *in, VkDeviceFaultInfoEXT32 *out)
+static inline void convert_VkDeviceFaultInfoEXT_host_to_win32(const VkDeviceFaultInfoEXT *in, VkDeviceFaultInfoEXT32 *out)
 {
     if (!in) return;

@@ -9593,7 +9593,7 @@ static inline void convert_VkDeviceImageMemoryRequirements_win32_to_host(struct
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryRequirements_host_to_win32(const VkSparseImageMemoryRequirements_host *in, VkSparseImageMemoryRequirements32 *out)
+static inline void convert_VkSparseImageMemoryRequirements_host_to_win32(const VkSparseImageMemoryRequirements *in, VkSparseImageMemoryRequirements32 *out)
 {
     if (!in) return;

@@ -9606,7 +9606,7 @@ static inline void convert_VkSparseImageMemoryRequirements_host_to_win32(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryRequirements2_win32_to_host(const VkSparseImageMemoryRequirements232 *in, VkSparseImageMemoryRequirements2_host *out)
+static inline void convert_VkSparseImageMemoryRequirements2_win32_to_host(const VkSparseImageMemoryRequirements232 *in, VkSparseImageMemoryRequirements2 *out)
 {
     if (!in) return;

@@ -9616,7 +9616,7 @@ static inline void convert_VkSparseImageMemoryRequirements2_win32_to_host(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryRequirements2_host_to_win32(const VkSparseImageMemoryRequirements2_host *in, VkSparseImageMemoryRequirements232 *out)
+static inline void convert_VkSparseImageMemoryRequirements2_host_to_win32(const VkSparseImageMemoryRequirements2 *in, VkSparseImageMemoryRequirements232 *out)
 {
     if (!in) return;

@@ -9625,9 +9625,9 @@ static inline void convert_VkSparseImageMemoryRequirements2_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkSparseImageMemoryRequirements2_host *convert_VkSparseImageMemoryRequirements2_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryRequirements232 *in, uint32_t count)
+static inline VkSparseImageMemoryRequirements2 *convert_VkSparseImageMemoryRequirements2_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryRequirements232 *in, uint32_t count)
 {
-    VkSparseImageMemoryRequirements2_host *out;
+    VkSparseImageMemoryRequirements2 *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -9643,7 +9643,7 @@ static inline VkSparseImageMemoryRequirements2_host *convert_VkSparseImageMemory
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryRequirements2_array_host_to_win32(const VkSparseImageMemoryRequirements2_host *in, VkSparseImageMemoryRequirements232 *out, uint32_t count)
+static inline void convert_VkSparseImageMemoryRequirements2_array_host_to_win32(const VkSparseImageMemoryRequirements2 *in, VkSparseImageMemoryRequirements232 *out, uint32_t count)
 {
     unsigned int i;

@@ -9657,7 +9657,7 @@ static inline void convert_VkSparseImageMemoryRequirements2_array_host_to_win32(
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win32_to_host(const VkDeviceMemoryOpaqueCaptureAddressInfo32 *in, VkDeviceMemoryOpaqueCaptureAddressInfo_host *out)
+static inline void convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win32_to_host(const VkDeviceMemoryOpaqueCaptureAddressInfo32 *in, VkDeviceMemoryOpaqueCaptureAddressInfo *out)
 {
     if (!in) return;

@@ -9668,7 +9668,7 @@ static inline void convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win32_to_host(
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkGeneratedCommandsMemoryRequirementsInfoNV_win32_to_host(const VkGeneratedCommandsMemoryRequirementsInfoNV32 *in, VkGeneratedCommandsMemoryRequirementsInfoNV_host *out)
+static inline void convert_VkGeneratedCommandsMemoryRequirementsInfoNV_win32_to_host(const VkGeneratedCommandsMemoryRequirementsInfoNV32 *in, VkGeneratedCommandsMemoryRequirementsInfoNV *out)
 {
     if (!in) return;

@@ -9682,7 +9682,7 @@ static inline void convert_VkGeneratedCommandsMemoryRequirementsInfoNV_win32_to_
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageMemoryRequirementsInfo2_win32_to_host(const VkImageMemoryRequirementsInfo232 *in, VkImageMemoryRequirementsInfo2_host *out)
+static inline void convert_VkImageMemoryRequirementsInfo2_win32_to_host(const VkImageMemoryRequirementsInfo232 *in, VkImageMemoryRequirementsInfo2 *out)
 {
     if (!in) return;

@@ -9693,7 +9693,7 @@ static inline void convert_VkImageMemoryRequirementsInfo2_win32_to_host(const Vk
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryRequirements_array_host_to_win32(const VkSparseImageMemoryRequirements_host *in, VkSparseImageMemoryRequirements32 *out, uint32_t count)
+static inline void convert_VkSparseImageMemoryRequirements_array_host_to_win32(const VkSparseImageMemoryRequirements *in, VkSparseImageMemoryRequirements32 *out, uint32_t count)
 {
     unsigned int i;

@@ -9707,7 +9707,7 @@ static inline void convert_VkSparseImageMemoryRequirements_array_host_to_win32(c
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageSparseMemoryRequirementsInfo2_win32_to_host(const VkImageSparseMemoryRequirementsInfo232 *in, VkImageSparseMemoryRequirementsInfo2_host *out)
+static inline void convert_VkImageSparseMemoryRequirementsInfo2_win32_to_host(const VkImageSparseMemoryRequirementsInfo232 *in, VkImageSparseMemoryRequirementsInfo2 *out)
 {
     if (!in) return;

@@ -9718,7 +9718,7 @@ static inline void convert_VkImageSparseMemoryRequirementsInfo2_win32_to_host(co
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSubresourceLayout_host_to_win32(const VkSubresourceLayout_host *in, VkSubresourceLayout32 *out)
+static inline void convert_VkSubresourceLayout_host_to_win32(const VkSubresourceLayout *in, VkSubresourceLayout32 *out)
 {
     if (!in) return;

@@ -9731,7 +9731,7 @@ static inline void convert_VkSubresourceLayout_host_to_win32(const VkSubresource
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSubresourceLayout2EXT_win32_to_host(const VkSubresourceLayout2EXT32 *in, VkSubresourceLayout2EXT_host *out)
+static inline void convert_VkSubresourceLayout2EXT_win32_to_host(const VkSubresourceLayout2EXT32 *in, VkSubresourceLayout2EXT *out)
 {
     if (!in) return;

@@ -9741,7 +9741,7 @@ static inline void convert_VkSubresourceLayout2EXT_win32_to_host(const VkSubreso
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSubresourceLayout2EXT_host_to_win32(const VkSubresourceLayout2EXT_host *in, VkSubresourceLayout2EXT32 *out)
+static inline void convert_VkSubresourceLayout2EXT_host_to_win32(const VkSubresourceLayout2EXT *in, VkSubresourceLayout2EXT32 *out)
 {
     if (!in) return;

@@ -9750,7 +9750,7 @@ static inline void convert_VkSubresourceLayout2EXT_host_to_win32(const VkSubreso
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageViewAddressPropertiesNVX_win32_to_host(const VkImageViewAddressPropertiesNVX32 *in, VkImageViewAddressPropertiesNVX_host *out)
+static inline void convert_VkImageViewAddressPropertiesNVX_win32_to_host(const VkImageViewAddressPropertiesNVX32 *in, VkImageViewAddressPropertiesNVX *out)
 {
     if (!in) return;

@@ -9760,7 +9760,7 @@ static inline void convert_VkImageViewAddressPropertiesNVX_win32_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageViewAddressPropertiesNVX_host_to_win32(const VkImageViewAddressPropertiesNVX_host *in, VkImageViewAddressPropertiesNVX32 *out)
+static inline void convert_VkImageViewAddressPropertiesNVX_host_to_win32(const VkImageViewAddressPropertiesNVX *in, VkImageViewAddressPropertiesNVX32 *out)
 {
     if (!in) return;

@@ -9770,7 +9770,7 @@ static inline void convert_VkImageViewAddressPropertiesNVX_host_to_win32(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageViewHandleInfoNVX_win32_to_host(const VkImageViewHandleInfoNVX32 *in, VkImageViewHandleInfoNVX_host *out)
+static inline void convert_VkImageViewHandleInfoNVX_win32_to_host(const VkImageViewHandleInfoNVX32 *in, VkImageViewHandleInfoNVX *out)
 {
     if (!in) return;

@@ -9783,7 +9783,7 @@ static inline void convert_VkImageViewHandleInfoNVX_win32_to_host(const VkImageV
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMicromapBuildSizesInfoEXT_win32_to_host(const VkMicromapBuildSizesInfoEXT32 *in, VkMicromapBuildSizesInfoEXT_host *out)
+static inline void convert_VkMicromapBuildSizesInfoEXT_win32_to_host(const VkMicromapBuildSizesInfoEXT32 *in, VkMicromapBuildSizesInfoEXT *out)
 {
     if (!in) return;

@@ -9796,7 +9796,7 @@ static inline void convert_VkMicromapBuildSizesInfoEXT_win32_to_host(const VkMic
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMicromapBuildSizesInfoEXT_host_to_win32(const VkMicromapBuildSizesInfoEXT_host *in, VkMicromapBuildSizesInfoEXT32 *out)
+static inline void convert_VkMicromapBuildSizesInfoEXT_host_to_win32(const VkMicromapBuildSizesInfoEXT *in, VkMicromapBuildSizesInfoEXT32 *out)
 {
     if (!in) return;

@@ -9807,7 +9807,7 @@ static inline void convert_VkMicromapBuildSizesInfoEXT_host_to_win32(const VkMic
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPerformanceValueINTEL_win32_to_host(const VkPerformanceValueINTEL32 *in, VkPerformanceValueINTEL_host *out)
+static inline void convert_VkPerformanceValueINTEL_win32_to_host(const VkPerformanceValueINTEL32 *in, VkPerformanceValueINTEL *out)
 {
     if (!in) return;

@@ -9817,7 +9817,7 @@ static inline void convert_VkPerformanceValueINTEL_win32_to_host(const VkPerform
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPerformanceValueINTEL_host_to_win32(const VkPerformanceValueINTEL_host *in, VkPerformanceValueINTEL32 *out)
+static inline void convert_VkPerformanceValueINTEL_host_to_win32(const VkPerformanceValueINTEL *in, VkPerformanceValueINTEL32 *out)
 {
     if (!in) return;

@@ -9844,7 +9844,7 @@ static inline void convert_VkPhysicalDeviceExternalSemaphoreInfo_win32_to_host(s
         {
         case VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO:
         {
-            VkSemaphoreTypeCreateInfo_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkSemaphoreTypeCreateInfo *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkSemaphoreTypeCreateInfo32 *in_ext = (const VkSemaphoreTypeCreateInfo32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO;
             out_ext->pNext = NULL;
@@ -9863,7 +9863,7 @@ static inline void convert_VkPhysicalDeviceExternalSemaphoreInfo_win32_to_host(s
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageFormatProperties_host_to_win32(const VkImageFormatProperties_host *in, VkImageFormatProperties32 *out)
+static inline void convert_VkImageFormatProperties_host_to_win32(const VkImageFormatProperties *in, VkImageFormatProperties32 *out)
 {
     if (!in) return;

@@ -9876,7 +9876,7 @@ static inline void convert_VkImageFormatProperties_host_to_win32(const VkImageFo
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageFormatProperties2_win32_to_host(const VkImageFormatProperties232 *in, VkImageFormatProperties2_host *out)
+static inline void convert_VkImageFormatProperties2_win32_to_host(const VkImageFormatProperties232 *in, VkImageFormatProperties2 *out)
 {
     if (!in) return;

@@ -9886,7 +9886,7 @@ static inline void convert_VkImageFormatProperties2_win32_to_host(const VkImageF
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkImageFormatProperties2_host_to_win32(const VkImageFormatProperties2_host *in, VkImageFormatProperties232 *out)
+static inline void convert_VkImageFormatProperties2_host_to_win32(const VkImageFormatProperties2 *in, VkImageFormatProperties232 *out)
 {
     if (!in) return;

@@ -9895,7 +9895,7 @@ static inline void convert_VkImageFormatProperties2_host_to_win32(const VkImageF
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryHeap_host_to_win32(const VkMemoryHeap_host *in, VkMemoryHeap32 *out)
+static inline void convert_VkMemoryHeap_host_to_win32(const VkMemoryHeap *in, VkMemoryHeap32 *out)
 {
     if (!in) return;

@@ -9905,7 +9905,7 @@ static inline void convert_VkMemoryHeap_host_to_win32(const VkMemoryHeap_host *i
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryHeap_array_host_to_win32(const VkMemoryHeap_host *in, VkMemoryHeap32 *out, uint32_t count)
+static inline void convert_VkMemoryHeap_array_host_to_win32(const VkMemoryHeap *in, VkMemoryHeap32 *out, uint32_t count)
 {
     unsigned int i;

@@ -9919,7 +9919,7 @@ static inline void convert_VkMemoryHeap_array_host_to_win32(const VkMemoryHeap_h
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win32(const VkPhysicalDeviceMemoryProperties_host *in, VkPhysicalDeviceMemoryProperties32 *out)
+static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win32(const VkPhysicalDeviceMemoryProperties *in, VkPhysicalDeviceMemoryProperties32 *out)
 {
     if (!in) return;

@@ -9931,7 +9931,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceMemoryProperties2_win32_to_host(struct conversion_context *ctx, const VkPhysicalDeviceMemoryProperties232 *in, VkPhysicalDeviceMemoryProperties2_host *out)
+static inline void convert_VkPhysicalDeviceMemoryProperties2_win32_to_host(struct conversion_context *ctx, const VkPhysicalDeviceMemoryProperties232 *in, VkPhysicalDeviceMemoryProperties2 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -9947,7 +9947,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties2_win32_to_host(struc
         {
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT:
         {
-            VkPhysicalDeviceMemoryBudgetPropertiesEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceMemoryBudgetPropertiesEXT *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -9963,7 +9963,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties2_win32_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceMemoryProperties2_host_to_win32(const VkPhysicalDeviceMemoryProperties2_host *in, VkPhysicalDeviceMemoryProperties232 *out)
+static inline void convert_VkPhysicalDeviceMemoryProperties2_host_to_win32(const VkPhysicalDeviceMemoryProperties2 *in, VkPhysicalDeviceMemoryProperties232 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -9979,7 +9979,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties2_host_to_win32(const
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT:
         {
             VkPhysicalDeviceMemoryBudgetPropertiesEXT32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT);
-            const VkPhysicalDeviceMemoryBudgetPropertiesEXT_host *in_ext = (const VkPhysicalDeviceMemoryBudgetPropertiesEXT_host *)in_header;
+            const VkPhysicalDeviceMemoryBudgetPropertiesEXT *in_ext = (const VkPhysicalDeviceMemoryBudgetPropertiesEXT *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT;
             memcpy(out_ext->heapBudget, in_ext->heapBudget, VK_MAX_MEMORY_HEAPS * sizeof(VkDeviceSize));
             memcpy(out_ext->heapUsage, in_ext->heapUsage, VK_MAX_MEMORY_HEAPS * sizeof(VkDeviceSize));
@@ -9994,7 +9994,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties2_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceLimits_host_to_win32(const VkPhysicalDeviceLimits_host *in, VkPhysicalDeviceLimits32 *out)
+static inline void convert_VkPhysicalDeviceLimits_host_to_win32(const VkPhysicalDeviceLimits *in, VkPhysicalDeviceLimits32 *out)
 {
     if (!in) return;

@@ -10108,7 +10108,7 @@ static inline void convert_VkPhysicalDeviceLimits_host_to_win32(const VkPhysical
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceProperties_host_to_win32(const VkPhysicalDeviceProperties_host *in, VkPhysicalDeviceProperties32 *out)
+static inline void convert_VkPhysicalDeviceProperties_host_to_win32(const VkPhysicalDeviceProperties *in, VkPhysicalDeviceProperties32 *out)
 {
     if (!in) return;

@@ -10125,7 +10125,7 @@ static inline void convert_VkPhysicalDeviceProperties_host_to_win32(const VkPhys
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conversion_context *ctx, const VkPhysicalDeviceProperties232 *in, VkPhysicalDeviceProperties2_host *out)
+static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conversion_context *ctx, const VkPhysicalDeviceProperties232 *in, VkPhysicalDeviceProperties2 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -10267,7 +10267,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES:
         {
-            VkPhysicalDeviceMaintenance3Properties_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceMaintenance3Properties *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10276,7 +10276,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES:
         {
-            VkPhysicalDeviceMaintenance4Properties_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceMaintenance4Properties *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10294,7 +10294,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT:
         {
-            VkPhysicalDeviceExternalMemoryHostPropertiesEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceExternalMemoryHostPropertiesEXT *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10339,7 +10339,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES:
         {
-            VkPhysicalDeviceTimelineSemaphoreProperties_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceTimelineSemaphoreProperties *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10375,7 +10375,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT:
         {
-            VkPhysicalDeviceTransformFeedbackPropertiesEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceTransformFeedbackPropertiesEXT *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10393,7 +10393,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV:
         {
-            VkPhysicalDeviceMemoryDecompressionPropertiesNV_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceMemoryDecompressionPropertiesNV *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10429,7 +10429,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR:
         {
-            VkPhysicalDeviceAccelerationStructurePropertiesKHR_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceAccelerationStructurePropertiesKHR *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10447,7 +10447,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV:
         {
-            VkPhysicalDeviceRayTracingPropertiesNV_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceRayTracingPropertiesNV *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10510,7 +10510,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES:
         {
-            VkPhysicalDeviceTexelBufferAlignmentProperties_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceTexelBufferAlignmentProperties *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10546,7 +10546,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES:
         {
-            VkPhysicalDeviceVulkan11Properties_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceVulkan11Properties *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10555,7 +10555,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES:
         {
-            VkPhysicalDeviceVulkan12Properties_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceVulkan12Properties *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10564,7 +10564,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES:
         {
-            VkPhysicalDeviceVulkan13Properties_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceVulkan13Properties *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10593,7 +10593,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT:
         {
-            VkPhysicalDeviceRobustness2PropertiesEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceRobustness2PropertiesEXT *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10706,7 +10706,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
         }
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM:
         {
-            VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM;
             out_ext->pNext = NULL;
             out_header->pNext = (void *)out_ext;
@@ -10731,7 +10731,7 @@ static inline void convert_VkPhysicalDeviceProperties2_win32_to_host(struct conv
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhysicalDeviceProperties2_host *in, VkPhysicalDeviceProperties232 *out)
+static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhysicalDeviceProperties2 *in, VkPhysicalDeviceProperties232 *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -10906,7 +10906,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES:
         {
             VkPhysicalDeviceMaintenance3Properties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES);
-            const VkPhysicalDeviceMaintenance3Properties_host *in_ext = (const VkPhysicalDeviceMaintenance3Properties_host *)in_header;
+            const VkPhysicalDeviceMaintenance3Properties *in_ext = (const VkPhysicalDeviceMaintenance3Properties *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES;
             out_ext->maxPerSetDescriptors = in_ext->maxPerSetDescriptors;
             out_ext->maxMemoryAllocationSize = in_ext->maxMemoryAllocationSize;
@@ -10916,7 +10916,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES:
         {
             VkPhysicalDeviceMaintenance4Properties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES);
-            const VkPhysicalDeviceMaintenance4Properties_host *in_ext = (const VkPhysicalDeviceMaintenance4Properties_host *)in_header;
+            const VkPhysicalDeviceMaintenance4Properties *in_ext = (const VkPhysicalDeviceMaintenance4Properties *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES;
             out_ext->maxBufferSize = in_ext->maxBufferSize;
             out_header = (void *)out_ext;
@@ -10950,7 +10950,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT:
         {
             VkPhysicalDeviceExternalMemoryHostPropertiesEXT32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT);
-            const VkPhysicalDeviceExternalMemoryHostPropertiesEXT_host *in_ext = (const VkPhysicalDeviceExternalMemoryHostPropertiesEXT_host *)in_header;
+            const VkPhysicalDeviceExternalMemoryHostPropertiesEXT *in_ext = (const VkPhysicalDeviceExternalMemoryHostPropertiesEXT *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT;
             out_ext->minImportedHostPointerAlignment = in_ext->minImportedHostPointerAlignment;
             out_header = (void *)out_ext;
@@ -11039,7 +11039,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES:
         {
             VkPhysicalDeviceTimelineSemaphoreProperties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES);
-            const VkPhysicalDeviceTimelineSemaphoreProperties_host *in_ext = (const VkPhysicalDeviceTimelineSemaphoreProperties_host *)in_header;
+            const VkPhysicalDeviceTimelineSemaphoreProperties *in_ext = (const VkPhysicalDeviceTimelineSemaphoreProperties *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES;
             out_ext->maxTimelineSemaphoreValueDifference = in_ext->maxTimelineSemaphoreValueDifference;
             out_header = (void *)out_ext;
@@ -11081,7 +11081,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT:
         {
             VkPhysicalDeviceTransformFeedbackPropertiesEXT32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT);
-            const VkPhysicalDeviceTransformFeedbackPropertiesEXT_host *in_ext = (const VkPhysicalDeviceTransformFeedbackPropertiesEXT_host *)in_header;
+            const VkPhysicalDeviceTransformFeedbackPropertiesEXT *in_ext = (const VkPhysicalDeviceTransformFeedbackPropertiesEXT *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT;
             out_ext->maxTransformFeedbackStreams = in_ext->maxTransformFeedbackStreams;
             out_ext->maxTransformFeedbackBuffers = in_ext->maxTransformFeedbackBuffers;
@@ -11108,7 +11108,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV:
         {
             VkPhysicalDeviceMemoryDecompressionPropertiesNV32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV);
-            const VkPhysicalDeviceMemoryDecompressionPropertiesNV_host *in_ext = (const VkPhysicalDeviceMemoryDecompressionPropertiesNV_host *)in_header;
+            const VkPhysicalDeviceMemoryDecompressionPropertiesNV *in_ext = (const VkPhysicalDeviceMemoryDecompressionPropertiesNV *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV;
             out_ext->decompressionMethods = in_ext->decompressionMethods;
             out_ext->maxDecompressionIndirectCount = in_ext->maxDecompressionIndirectCount;
@@ -11186,7 +11186,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR:
         {
             VkPhysicalDeviceAccelerationStructurePropertiesKHR32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR);
-            const VkPhysicalDeviceAccelerationStructurePropertiesKHR_host *in_ext = (const VkPhysicalDeviceAccelerationStructurePropertiesKHR_host *)in_header;
+            const VkPhysicalDeviceAccelerationStructurePropertiesKHR *in_ext = (const VkPhysicalDeviceAccelerationStructurePropertiesKHR *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR;
             out_ext->maxGeometryCount = in_ext->maxGeometryCount;
             out_ext->maxInstanceCount = in_ext->maxInstanceCount;
@@ -11218,7 +11218,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV:
         {
             VkPhysicalDeviceRayTracingPropertiesNV32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV);
-            const VkPhysicalDeviceRayTracingPropertiesNV_host *in_ext = (const VkPhysicalDeviceRayTracingPropertiesNV_host *)in_header;
+            const VkPhysicalDeviceRayTracingPropertiesNV *in_ext = (const VkPhysicalDeviceRayTracingPropertiesNV *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV;
             out_ext->shaderGroupHandleSize = in_ext->shaderGroupHandleSize;
             out_ext->maxRecursionDepth = in_ext->maxRecursionDepth;
@@ -11294,7 +11294,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES:
         {
             VkPhysicalDeviceTexelBufferAlignmentProperties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES);
-            const VkPhysicalDeviceTexelBufferAlignmentProperties_host *in_ext = (const VkPhysicalDeviceTexelBufferAlignmentProperties_host *)in_header;
+            const VkPhysicalDeviceTexelBufferAlignmentProperties *in_ext = (const VkPhysicalDeviceTexelBufferAlignmentProperties *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES;
             out_ext->storageTexelBufferOffsetAlignmentBytes = in_ext->storageTexelBufferOffsetAlignmentBytes;
             out_ext->storageTexelBufferOffsetSingleTexelAlignment = in_ext->storageTexelBufferOffsetSingleTexelAlignment;
@@ -11336,7 +11336,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES:
         {
             VkPhysicalDeviceVulkan11Properties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES);
-            const VkPhysicalDeviceVulkan11Properties_host *in_ext = (const VkPhysicalDeviceVulkan11Properties_host *)in_header;
+            const VkPhysicalDeviceVulkan11Properties *in_ext = (const VkPhysicalDeviceVulkan11Properties *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES;
             memcpy(out_ext->deviceUUID, in_ext->deviceUUID, VK_UUID_SIZE * sizeof(uint8_t));
             memcpy(out_ext->driverUUID, in_ext->driverUUID, VK_UUID_SIZE * sizeof(uint8_t));
@@ -11359,7 +11359,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES:
         {
             VkPhysicalDeviceVulkan12Properties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES);
-            const VkPhysicalDeviceVulkan12Properties_host *in_ext = (const VkPhysicalDeviceVulkan12Properties_host *)in_header;
+            const VkPhysicalDeviceVulkan12Properties *in_ext = (const VkPhysicalDeviceVulkan12Properties *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES;
             out_ext->driverID = in_ext->driverID;
             memcpy(out_ext->driverName, in_ext->driverName, VK_MAX_DRIVER_NAME_SIZE * sizeof(char));
@@ -11419,7 +11419,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES:
         {
             VkPhysicalDeviceVulkan13Properties32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES);
-            const VkPhysicalDeviceVulkan13Properties_host *in_ext = (const VkPhysicalDeviceVulkan13Properties_host *)in_header;
+            const VkPhysicalDeviceVulkan13Properties *in_ext = (const VkPhysicalDeviceVulkan13Properties *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES;
             out_ext->minSubgroupSize = in_ext->minSubgroupSize;
             out_ext->maxSubgroupSize = in_ext->maxSubgroupSize;
@@ -11490,7 +11490,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT:
         {
             VkPhysicalDeviceRobustness2PropertiesEXT32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT);
-            const VkPhysicalDeviceRobustness2PropertiesEXT_host *in_ext = (const VkPhysicalDeviceRobustness2PropertiesEXT_host *)in_header;
+            const VkPhysicalDeviceRobustness2PropertiesEXT *in_ext = (const VkPhysicalDeviceRobustness2PropertiesEXT *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT;
             out_ext->robustStorageBufferAccessSizeAlignment = in_ext->robustStorageBufferAccessSizeAlignment;
             out_ext->robustUniformBufferAccessSizeAlignment = in_ext->robustUniformBufferAccessSizeAlignment;
@@ -11663,7 +11663,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM:
         {
             VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM32 *out_ext = find_next_struct(out_header, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM);
-            const VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM_host *in_ext = (const VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM_host *)in_header;
+            const VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM *in_ext = (const VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM;
             out_ext->shaderCoreMask = in_ext->shaderCoreMask;
             out_ext->shaderCoreCount = in_ext->shaderCoreCount;
@@ -11688,7 +11688,7 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_unwrapped_host(const VkPhysicalDeviceSurfaceInfo2KHR32 *in, VkPhysicalDeviceSurfaceInfo2KHR_host *out)
+static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_unwrapped_host(const VkPhysicalDeviceSurfaceInfo2KHR32 *in, VkPhysicalDeviceSurfaceInfo2KHR *out)
 {
     if (!in) return;

@@ -11710,7 +11710,7 @@ static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win64_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(const VkPhysicalDeviceSurfaceInfo2KHR32 *in, VkPhysicalDeviceSurfaceInfo2KHR_host *out)
+static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(const VkPhysicalDeviceSurfaceInfo2KHR32 *in, VkPhysicalDeviceSurfaceInfo2KHR *out)
 {
     if (!in) return;

@@ -11721,7 +11721,7 @@ static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(const V
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineExecutableInfoKHR_win32_to_host(const VkPipelineExecutableInfoKHR32 *in, VkPipelineExecutableInfoKHR_host *out)
+static inline void convert_VkPipelineExecutableInfoKHR_win32_to_host(const VkPipelineExecutableInfoKHR32 *in, VkPipelineExecutableInfoKHR *out)
 {
     if (!in) return;

@@ -11733,7 +11733,7 @@ static inline void convert_VkPipelineExecutableInfoKHR_win32_to_host(const VkPip
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineInfoKHR_win32_to_host(const VkPipelineInfoKHR32 *in, VkPipelineInfoKHR_host *out)
+static inline void convert_VkPipelineInfoKHR_win32_to_host(const VkPipelineInfoKHR32 *in, VkPipelineInfoKHR *out)
 {
     if (!in) return;

@@ -11744,7 +11744,7 @@ static inline void convert_VkPipelineInfoKHR_win32_to_host(const VkPipelineInfoK
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineExecutableStatisticKHR_win32_to_host(const VkPipelineExecutableStatisticKHR32 *in, VkPipelineExecutableStatisticKHR_host *out)
+static inline void convert_VkPipelineExecutableStatisticKHR_win32_to_host(const VkPipelineExecutableStatisticKHR32 *in, VkPipelineExecutableStatisticKHR *out)
 {
     if (!in) return;

@@ -11754,7 +11754,7 @@ static inline void convert_VkPipelineExecutableStatisticKHR_win32_to_host(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineExecutableStatisticKHR_host_to_win32(const VkPipelineExecutableStatisticKHR_host *in, VkPipelineExecutableStatisticKHR32 *out)
+static inline void convert_VkPipelineExecutableStatisticKHR_host_to_win32(const VkPipelineExecutableStatisticKHR *in, VkPipelineExecutableStatisticKHR32 *out)
 {
     if (!in) return;

@@ -11766,9 +11766,9 @@ static inline void convert_VkPipelineExecutableStatisticKHR_host_to_win32(const
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline VkPipelineExecutableStatisticKHR_host *convert_VkPipelineExecutableStatisticKHR_array_win32_to_host(struct conversion_context *ctx, const VkPipelineExecutableStatisticKHR32 *in, uint32_t count)
+static inline VkPipelineExecutableStatisticKHR *convert_VkPipelineExecutableStatisticKHR_array_win32_to_host(struct conversion_context *ctx, const VkPipelineExecutableStatisticKHR32 *in, uint32_t count)
 {
-    VkPipelineExecutableStatisticKHR_host *out;
+    VkPipelineExecutableStatisticKHR *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -11784,7 +11784,7 @@ static inline VkPipelineExecutableStatisticKHR_host *convert_VkPipelineExecutabl
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineExecutableStatisticKHR_array_host_to_win32(const VkPipelineExecutableStatisticKHR_host *in, VkPipelineExecutableStatisticKHR32 *out, uint32_t count)
+static inline void convert_VkPipelineExecutableStatisticKHR_array_host_to_win32(const VkPipelineExecutableStatisticKHR *in, VkPipelineExecutableStatisticKHR32 *out, uint32_t count)
 {
     unsigned int i;

@@ -11798,7 +11798,7 @@ static inline void convert_VkPipelineExecutableStatisticKHR_array_host_to_win32(
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkPipelineInfoEXT_win32_to_host(const VkPipelineInfoEXT32 *in, VkPipelineInfoEXT_host *out)
+static inline void convert_VkPipelineInfoEXT_win32_to_host(const VkPipelineInfoEXT32 *in, VkPipelineInfoEXT *out)
 {
     if (!in) return;

@@ -11809,7 +11809,7 @@ static inline void convert_VkPipelineInfoEXT_win32_to_host(const VkPipelineInfoE
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseMemoryBind_win32_to_host(const VkSparseMemoryBind32 *in, VkSparseMemoryBind_host *out)
+static inline void convert_VkSparseMemoryBind_win32_to_host(const VkSparseMemoryBind32 *in, VkSparseMemoryBind *out)
 {
     if (!in) return;

@@ -11822,9 +11822,9 @@ static inline void convert_VkSparseMemoryBind_win32_to_host(const VkSparseMemory
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSparseMemoryBind_host *convert_VkSparseMemoryBind_array_win32_to_host(struct conversion_context *ctx, const VkSparseMemoryBind32 *in, uint32_t count)
+static inline const VkSparseMemoryBind *convert_VkSparseMemoryBind_array_win32_to_host(struct conversion_context *ctx, const VkSparseMemoryBind32 *in, uint32_t count)
 {
-    VkSparseMemoryBind_host *out;
+    VkSparseMemoryBind *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -11840,7 +11840,7 @@ static inline const VkSparseMemoryBind_host *convert_VkSparseMemoryBind_array_wi
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseBufferMemoryBindInfo_win32_to_host(struct conversion_context *ctx, const VkSparseBufferMemoryBindInfo32 *in, VkSparseBufferMemoryBindInfo_host *out)
+static inline void convert_VkSparseBufferMemoryBindInfo_win32_to_host(struct conversion_context *ctx, const VkSparseBufferMemoryBindInfo32 *in, VkSparseBufferMemoryBindInfo *out)
 {
     if (!in) return;

@@ -11851,9 +11851,9 @@ static inline void convert_VkSparseBufferMemoryBindInfo_win32_to_host(struct con
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSparseBufferMemoryBindInfo_host *convert_VkSparseBufferMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseBufferMemoryBindInfo32 *in, uint32_t count)
+static inline const VkSparseBufferMemoryBindInfo *convert_VkSparseBufferMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseBufferMemoryBindInfo32 *in, uint32_t count)
 {
-    VkSparseBufferMemoryBindInfo_host *out;
+    VkSparseBufferMemoryBindInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -11869,7 +11869,7 @@ static inline const VkSparseBufferMemoryBindInfo_host *convert_VkSparseBufferMem
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageOpaqueMemoryBindInfo_win32_to_host(struct conversion_context *ctx, const VkSparseImageOpaqueMemoryBindInfo32 *in, VkSparseImageOpaqueMemoryBindInfo_host *out)
+static inline void convert_VkSparseImageOpaqueMemoryBindInfo_win32_to_host(struct conversion_context *ctx, const VkSparseImageOpaqueMemoryBindInfo32 *in, VkSparseImageOpaqueMemoryBindInfo *out)
 {
     if (!in) return;

@@ -11880,9 +11880,9 @@ static inline void convert_VkSparseImageOpaqueMemoryBindInfo_win32_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSparseImageOpaqueMemoryBindInfo_host *convert_VkSparseImageOpaqueMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageOpaqueMemoryBindInfo32 *in, uint32_t count)
+static inline const VkSparseImageOpaqueMemoryBindInfo *convert_VkSparseImageOpaqueMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageOpaqueMemoryBindInfo32 *in, uint32_t count)
 {
-    VkSparseImageOpaqueMemoryBindInfo_host *out;
+    VkSparseImageOpaqueMemoryBindInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -11898,7 +11898,7 @@ static inline const VkSparseImageOpaqueMemoryBindInfo_host *convert_VkSparseImag
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryBind_win32_to_host(const VkSparseImageMemoryBind32 *in, VkSparseImageMemoryBind_host *out)
+static inline void convert_VkSparseImageMemoryBind_win32_to_host(const VkSparseImageMemoryBind32 *in, VkSparseImageMemoryBind *out)
 {
     if (!in) return;

@@ -11912,9 +11912,9 @@ static inline void convert_VkSparseImageMemoryBind_win32_to_host(const VkSparseI
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSparseImageMemoryBind_host *convert_VkSparseImageMemoryBind_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBind32 *in, uint32_t count)
+static inline const VkSparseImageMemoryBind *convert_VkSparseImageMemoryBind_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBind32 *in, uint32_t count)
 {
-    VkSparseImageMemoryBind_host *out;
+    VkSparseImageMemoryBind *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -11930,7 +11930,7 @@ static inline const VkSparseImageMemoryBind_host *convert_VkSparseImageMemoryBin
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSparseImageMemoryBindInfo_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBindInfo32 *in, VkSparseImageMemoryBindInfo_host *out)
+static inline void convert_VkSparseImageMemoryBindInfo_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBindInfo32 *in, VkSparseImageMemoryBindInfo *out)
 {
     if (!in) return;

@@ -11941,9 +11941,9 @@ static inline void convert_VkSparseImageMemoryBindInfo_win32_to_host(struct conv
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSparseImageMemoryBindInfo_host *convert_VkSparseImageMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBindInfo32 *in, uint32_t count)
+static inline const VkSparseImageMemoryBindInfo *convert_VkSparseImageMemoryBindInfo_array_win32_to_host(struct conversion_context *ctx, const VkSparseImageMemoryBindInfo32 *in, uint32_t count)
 {
-    VkSparseImageMemoryBindInfo_host *out;
+    VkSparseImageMemoryBindInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -11959,7 +11959,7 @@ static inline const VkSparseImageMemoryBindInfo_host *convert_VkSparseImageMemor
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkBindSparseInfo_win32_to_host(struct conversion_context *ctx, const VkBindSparseInfo32 *in, VkBindSparseInfo_host *out)
+static inline void convert_VkBindSparseInfo_win32_to_host(struct conversion_context *ctx, const VkBindSparseInfo32 *in, VkBindSparseInfo *out)
 {
     if (!in) return;

@@ -11979,9 +11979,9 @@ static inline void convert_VkBindSparseInfo_win32_to_host(struct conversion_cont
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkBindSparseInfo_host *convert_VkBindSparseInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindSparseInfo32 *in, uint32_t count)
+static inline const VkBindSparseInfo *convert_VkBindSparseInfo_array_win32_to_host(struct conversion_context *ctx, const VkBindSparseInfo32 *in, uint32_t count)
 {
-    VkBindSparseInfo_host *out;
+    VkBindSparseInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -12067,7 +12067,7 @@ static inline const VkSubmitInfo *convert_VkSubmitInfo_array_win32_to_host(struc
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSemaphoreSubmitInfo_win32_to_host(const VkSemaphoreSubmitInfo32 *in, VkSemaphoreSubmitInfo_host *out)
+static inline void convert_VkSemaphoreSubmitInfo_win32_to_host(const VkSemaphoreSubmitInfo32 *in, VkSemaphoreSubmitInfo *out)
 {
     if (!in) return;

@@ -12081,9 +12081,9 @@ static inline void convert_VkSemaphoreSubmitInfo_win32_to_host(const VkSemaphore
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSemaphoreSubmitInfo_host *convert_VkSemaphoreSubmitInfo_array_win32_to_host(struct conversion_context *ctx, const VkSemaphoreSubmitInfo32 *in, uint32_t count)
+static inline const VkSemaphoreSubmitInfo *convert_VkSemaphoreSubmitInfo_array_win32_to_host(struct conversion_context *ctx, const VkSemaphoreSubmitInfo32 *in, uint32_t count)
 {
-    VkSemaphoreSubmitInfo_host *out;
+    VkSemaphoreSubmitInfo *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -12176,7 +12176,7 @@ static inline void convert_VkSubmitInfo2_win64_to_host(struct conversion_context
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSubmitInfo2_win32_to_host(struct conversion_context *ctx, const VkSubmitInfo232 *in, VkSubmitInfo2_host *out)
+static inline void convert_VkSubmitInfo2_win32_to_host(struct conversion_context *ctx, const VkSubmitInfo232 *in, VkSubmitInfo2 *out)
 {
     if (!in) return;

@@ -12211,9 +12211,9 @@ static inline const VkSubmitInfo2 *convert_VkSubmitInfo2_array_win64_to_host(str
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkSubmitInfo2_host *convert_VkSubmitInfo2_array_win32_to_host(struct conversion_context *ctx, const VkSubmitInfo232 *in, uint32_t count)
+static inline const VkSubmitInfo2 *convert_VkSubmitInfo2_array_win32_to_host(struct conversion_context *ctx, const VkSubmitInfo232 *in, uint32_t count)
 {
-    VkSubmitInfo2_host *out;
+    VkSubmitInfo2 *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -12242,7 +12242,7 @@ static inline void convert_VkDebugUtilsObjectNameInfoEXT_win64_to_host(const VkD
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDebugUtilsObjectNameInfoEXT_win32_to_host(const VkDebugUtilsObjectNameInfoEXT32 *in, VkDebugUtilsObjectNameInfoEXT_host *out)
+static inline void convert_VkDebugUtilsObjectNameInfoEXT_win32_to_host(const VkDebugUtilsObjectNameInfoEXT32 *in, VkDebugUtilsObjectNameInfoEXT *out)
 {
     if (!in) return;

@@ -12270,7 +12270,7 @@ static inline void convert_VkDebugUtilsObjectTagInfoEXT_win64_to_host(const VkDe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDebugUtilsObjectTagInfoEXT_win32_to_host(const VkDebugUtilsObjectTagInfoEXT32 *in, VkDebugUtilsObjectTagInfoEXT_host *out)
+static inline void convert_VkDebugUtilsObjectTagInfoEXT_win32_to_host(const VkDebugUtilsObjectTagInfoEXT32 *in, VkDebugUtilsObjectTagInfoEXT *out)
 {
     if (!in) return;

@@ -12285,7 +12285,7 @@ static inline void convert_VkDebugUtilsObjectTagInfoEXT_win32_to_host(const VkDe
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkSemaphoreSignalInfo_win32_to_host(const VkSemaphoreSignalInfo32 *in, VkSemaphoreSignalInfo_host *out)
+static inline void convert_VkSemaphoreSignalInfo_win32_to_host(const VkSemaphoreSignalInfo32 *in, VkSemaphoreSignalInfo *out)
 {
     if (!in) return;

@@ -12315,9 +12315,9 @@ static inline const VkDebugUtilsObjectNameInfoEXT *convert_VkDebugUtilsObjectNam
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkDebugUtilsObjectNameInfoEXT_host *convert_VkDebugUtilsObjectNameInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDebugUtilsObjectNameInfoEXT32 *in, uint32_t count)
+static inline const VkDebugUtilsObjectNameInfoEXT *convert_VkDebugUtilsObjectNameInfoEXT_array_win32_to_host(struct conversion_context *ctx, const VkDebugUtilsObjectNameInfoEXT32 *in, uint32_t count)
 {
-    VkDebugUtilsObjectNameInfoEXT_host *out;
+    VkDebugUtilsObjectNameInfoEXT *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -12353,7 +12353,7 @@ static inline void convert_VkDebugUtilsMessengerCallbackDataEXT_win64_to_host(st
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkDebugUtilsMessengerCallbackDataEXT_win32_to_host(struct conversion_context *ctx, const VkDebugUtilsMessengerCallbackDataEXT32 *in, VkDebugUtilsMessengerCallbackDataEXT_host *out)
+static inline void convert_VkDebugUtilsMessengerCallbackDataEXT_win32_to_host(struct conversion_context *ctx, const VkDebugUtilsMessengerCallbackDataEXT32 *in, VkDebugUtilsMessengerCallbackDataEXT *out)
 {
     const VkBaseInStructure *in_header;
     VkBaseOutStructure *out_header = (void *)out;
@@ -12379,7 +12379,7 @@ static inline void convert_VkDebugUtilsMessengerCallbackDataEXT_win32_to_host(st
         {
         case VK_STRUCTURE_TYPE_DEVICE_ADDRESS_BINDING_CALLBACK_DATA_EXT:
         {
-            VkDeviceAddressBindingCallbackDataEXT_host *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
+            VkDeviceAddressBindingCallbackDataEXT *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));
             const VkDeviceAddressBindingCallbackDataEXT32 *in_ext = (const VkDeviceAddressBindingCallbackDataEXT32 *)in_header;
             out_ext->sType = VK_STRUCTURE_TYPE_DEVICE_ADDRESS_BINDING_CALLBACK_DATA_EXT;
             out_ext->pNext = NULL;
@@ -12400,7 +12400,7 @@ static inline void convert_VkDebugUtilsMessengerCallbackDataEXT_win32_to_host(st
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkCopyDescriptorSet_win32_to_host(const VkCopyDescriptorSet32 *in, VkCopyDescriptorSet_host *out)
+static inline void convert_VkCopyDescriptorSet_win32_to_host(const VkCopyDescriptorSet32 *in, VkCopyDescriptorSet *out)
 {
     if (!in) return;

@@ -12417,9 +12417,9 @@ static inline void convert_VkCopyDescriptorSet_win32_to_host(const VkCopyDescrip
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline const VkCopyDescriptorSet_host *convert_VkCopyDescriptorSet_array_win32_to_host(struct conversion_context *ctx, const VkCopyDescriptorSet32 *in, uint32_t count)
+static inline const VkCopyDescriptorSet *convert_VkCopyDescriptorSet_array_win32_to_host(struct conversion_context *ctx, const VkCopyDescriptorSet32 *in, uint32_t count)
 {
-    VkCopyDescriptorSet_host *out;
+    VkCopyDescriptorSet *out;
     unsigned int i;

if (!in || !count) return NULL;
@@ -12457,7 +12457,7 @@ static NTSTATUS thunk32_vkAcquireNextImage2KHR(void *args)
         uint32_t *pImageIndex;
         VkResult result;
     } *params = args;
-    VkAcquireNextImageInfoKHR_host pAcquireInfo_host;
+    VkAcquireNextImageInfoKHR pAcquireInfo_host;

TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pImageIndex);

@@ -12557,7 +12557,7 @@ static NTSTATUS thunk32_vkAcquireProfilingLockKHR(void *args)
         const VkAcquireProfilingLockInfoKHR32 *pInfo;
         VkResult result;
     } *params = args;
-    VkAcquireProfilingLockInfoKHR_host pInfo_host;
+    VkAcquireProfilingLockInfoKHR pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);

@@ -12591,7 +12591,7 @@ static NTSTATUS thunk32_vkAllocateCommandBuffers(void *args)
         VkCommandBuffer *pCommandBuffers;
         VkResult result;
     } *params = args;
-    VkCommandBufferAllocateInfo_host pAllocateInfo_host;
+    VkCommandBufferAllocateInfo pAllocateInfo_host;

TRACE("%p, %p, %p\n", params->device, params->pAllocateInfo, params->pCommandBuffers);

@@ -12625,7 +12625,7 @@ static NTSTATUS thunk32_vkAllocateDescriptorSets(void *args)
         VkDescriptorSet *pDescriptorSets;
         VkResult result;
     } *params = args;
-    VkDescriptorSetAllocateInfo_host pAllocateInfo_host;
+    VkDescriptorSetAllocateInfo pAllocateInfo_host;

TRACE("%p, %p, %p\n", params->device, params->pAllocateInfo, params->pDescriptorSets);

@@ -12660,7 +12660,7 @@ static NTSTATUS thunk32_vkAllocateMemory(void *args)
         VkDeviceMemory *pMemory;
         VkResult result;
     } *params = args;
-    VkMemoryAllocateInfo_host pAllocateInfo_host;
+    VkMemoryAllocateInfo pAllocateInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p, %p\n", params->device, params->pAllocateInfo, params->pAllocator, params->pMemory);
@@ -12696,7 +12696,7 @@ static NTSTATUS thunk32_vkBeginCommandBuffer(void *args)
         const VkCommandBufferBeginInfo32 *pBeginInfo;
         VkResult result;
     } *params = args;
-    VkCommandBufferBeginInfo_host pBeginInfo_host;
+    VkCommandBufferBeginInfo pBeginInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->commandBuffer, params->pBeginInfo);
@@ -12733,7 +12733,7 @@ static NTSTATUS thunk32_vkBindAccelerationStructureMemoryNV(void *args)
         const VkBindAccelerationStructureMemoryInfoNV32 *pBindInfos;
         VkResult result;
     } *params = args;
-    const VkBindAccelerationStructureMemoryInfoNV_host *pBindInfos_host;
+    const VkBindAccelerationStructureMemoryInfoNV *pBindInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos);
@@ -12803,7 +12803,7 @@ static NTSTATUS thunk32_vkBindBufferMemory2(void *args)
         const VkBindBufferMemoryInfo32 *pBindInfos;
         VkResult result;
     } *params = args;
-    const VkBindBufferMemoryInfo_host *pBindInfos_host;
+    const VkBindBufferMemoryInfo *pBindInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos);
@@ -12840,7 +12840,7 @@ static NTSTATUS thunk32_vkBindBufferMemory2KHR(void *args)
         const VkBindBufferMemoryInfo32 *pBindInfos;
         VkResult result;
     } *params = args;
-    const VkBindBufferMemoryInfo_host *pBindInfos_host;
+    const VkBindBufferMemoryInfo *pBindInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos);
@@ -12910,7 +12910,7 @@ static NTSTATUS thunk32_vkBindImageMemory2(void *args)
         const VkBindImageMemoryInfo32 *pBindInfos;
         VkResult result;
     } *params = args;
-    const VkBindImageMemoryInfo_host *pBindInfos_host;
+    const VkBindImageMemoryInfo *pBindInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos);
@@ -12947,7 +12947,7 @@ static NTSTATUS thunk32_vkBindImageMemory2KHR(void *args)
         const VkBindImageMemoryInfo32 *pBindInfos;
         VkResult result;
     } *params = args;
-    const VkBindImageMemoryInfo_host *pBindInfos_host;
+    const VkBindImageMemoryInfo *pBindInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos);
@@ -13020,7 +13020,7 @@ static NTSTATUS thunk32_vkBuildAccelerationStructuresKHR(void *args)
         const VkAccelerationStructureBuildRangeInfoKHR * const*ppBuildRangeInfos;
         VkResult result;
     } *params = args;
-    const VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
+    const VkAccelerationStructureBuildGeometryInfoKHR *pInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->infoCount, params->pInfos, params->ppBuildRangeInfos);
@@ -13058,7 +13058,7 @@ static NTSTATUS thunk32_vkBuildMicromapsEXT(void *args)
         const VkMicromapBuildInfoEXT32 *pInfos;
         VkResult result;
     } *params = args;
-    const VkMicromapBuildInfoEXT_host *pInfos_host;
+    const VkMicromapBuildInfoEXT *pInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->infoCount, params->pInfos);
@@ -13093,7 +13093,7 @@ static NTSTATUS thunk32_vkCmdBeginConditionalRenderingEXT(void *args)
         VkCommandBuffer commandBuffer;
         const VkConditionalRenderingBeginInfoEXT32 *pConditionalRenderingBegin;
     } *params = args;
-    VkConditionalRenderingBeginInfoEXT_host pConditionalRenderingBegin_host;
+    VkConditionalRenderingBeginInfoEXT pConditionalRenderingBegin_host;

TRACE("%p, %p\n", params->commandBuffer, params->pConditionalRenderingBegin);

@@ -13221,7 +13221,7 @@ static NTSTATUS thunk32_vkCmdBeginRenderPass(void *args)
         const VkRenderPassBeginInfo32 *pRenderPassBegin;
         VkSubpassContents contents;
     } *params = args;
-    VkRenderPassBeginInfo_host pRenderPassBegin_host;
+    VkRenderPassBeginInfo pRenderPassBegin_host;

TRACE("%p, %p, %#x\n", params->commandBuffer, params->pRenderPassBegin, params->contents);

@@ -13254,7 +13254,7 @@ static NTSTATUS thunk32_vkCmdBeginRenderPass2(void *args)
         const VkRenderPassBeginInfo32 *pRenderPassBegin;
         const VkSubpassBeginInfo *pSubpassBeginInfo;
     } *params = args;
-    VkRenderPassBeginInfo_host pRenderPassBegin_host;
+    VkRenderPassBeginInfo pRenderPassBegin_host;

TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo);

@@ -13287,7 +13287,7 @@ static NTSTATUS thunk32_vkCmdBeginRenderPass2KHR(void *args)
         const VkRenderPassBeginInfo32 *pRenderPassBegin;
         const VkSubpassBeginInfo *pSubpassBeginInfo;
     } *params = args;
-    VkRenderPassBeginInfo_host pRenderPassBegin_host;
+    VkRenderPassBeginInfo pRenderPassBegin_host;

TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo);

@@ -13319,7 +13319,7 @@ static NTSTATUS thunk32_vkCmdBeginRendering(void *args)
         VkCommandBuffer commandBuffer;
         const VkRenderingInfo32 *pRenderingInfo;
     } *params = args;
-    VkRenderingInfo_host pRenderingInfo_host;
+    VkRenderingInfo pRenderingInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->commandBuffer, params->pRenderingInfo);
@@ -13354,7 +13354,7 @@ static NTSTATUS thunk32_vkCmdBeginRenderingKHR(void *args)
         VkCommandBuffer commandBuffer;
         const VkRenderingInfo32 *pRenderingInfo;
     } *params = args;
-    VkRenderingInfo_host pRenderingInfo_host;
+    VkRenderingInfo pRenderingInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->commandBuffer, params->pRenderingInfo);
@@ -13788,7 +13788,7 @@ static NTSTATUS thunk32_vkCmdBlitImage2(void *args)
         VkCommandBuffer commandBuffer;
         const VkBlitImageInfo232 *pBlitImageInfo;
     } *params = args;
-    VkBlitImageInfo2_host pBlitImageInfo_host;
+    VkBlitImageInfo2 pBlitImageInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo);

@@ -13820,7 +13820,7 @@ static NTSTATUS thunk32_vkCmdBlitImage2KHR(void *args)
         VkCommandBuffer commandBuffer;
         const VkBlitImageInfo232 *pBlitImageInfo;
     } *params = args;
-    VkBlitImageInfo2_host pBlitImageInfo_host;
+    VkBlitImageInfo2 pBlitImageInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo);

@@ -13859,7 +13859,7 @@ static NTSTATUS thunk32_vkCmdBuildAccelerationStructureNV(void *args)
         VkBuffer DECLSPEC_ALIGN(8) scratch;
         VkDeviceSize DECLSPEC_ALIGN(8) scratchOffset;
     } *params = args;
-    VkAccelerationStructureInfoNV_host pInfo_host;
+    VkAccelerationStructureInfoNV pInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p, 0x%s, 0x%s, %u, 0x%s, 0x%s, 0x%s, 0x%s\n", params->commandBuffer, params->pInfo, wine_dbgstr_longlong(params->instanceData), wine_dbgstr_longlong(params->instanceOffset), params->update, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), wine_dbgstr_longlong(params->scratch), wine_dbgstr_longlong(params->scratchOffset));
@@ -13898,7 +13898,7 @@ static NTSTATUS thunk32_vkCmdBuildAccelerationStructuresIndirectKHR(void *args)
         const uint32_t *pIndirectStrides;
         const uint32_t * const*ppMaxPrimitiveCounts;
     } *params = args;
-    const VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
+    const VkAccelerationStructureBuildGeometryInfoKHR *pInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, %p, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->pIndirectDeviceAddresses, params->pIndirectStrides, params->ppMaxPrimitiveCounts);
@@ -13935,7 +13935,7 @@ static NTSTATUS thunk32_vkCmdBuildAccelerationStructuresKHR(void *args)
         const VkAccelerationStructureBuildGeometryInfoKHR32 *pInfos;
         const VkAccelerationStructureBuildRangeInfoKHR * const*ppBuildRangeInfos;
     } *params = args;
-    const VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host;
+    const VkAccelerationStructureBuildGeometryInfoKHR *pInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->ppBuildRangeInfos);
@@ -13971,7 +13971,7 @@ static NTSTATUS thunk32_vkCmdBuildMicromapsEXT(void *args)
         uint32_t infoCount;
         const VkMicromapBuildInfoEXT32 *pInfos;
     } *params = args;
-    const VkMicromapBuildInfoEXT_host *pInfos_host;
+    const VkMicromapBuildInfoEXT *pInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->commandBuffer, params->infoCount, params->pInfos);
@@ -14107,7 +14107,7 @@ static NTSTATUS thunk32_vkCmdCopyAccelerationStructureKHR(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyAccelerationStructureInfoKHR32 *pInfo;
     } *params = args;
-    VkCopyAccelerationStructureInfoKHR_host pInfo_host;
+    VkCopyAccelerationStructureInfoKHR pInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pInfo);

@@ -14171,7 +14171,7 @@ static NTSTATUS thunk32_vkCmdCopyAccelerationStructureToMemoryKHR(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyAccelerationStructureToMemoryInfoKHR32 *pInfo;
     } *params = args;
-    VkCopyAccelerationStructureToMemoryInfoKHR_host pInfo_host;
+    VkCopyAccelerationStructureToMemoryInfoKHR pInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pInfo);

@@ -14206,7 +14206,7 @@ static NTSTATUS thunk32_vkCmdCopyBuffer(void *args)
         uint32_t regionCount;
         const VkBufferCopy32 *pRegions;
     } *params = args;
-    const VkBufferCopy_host *pRegions_host;
+    const VkBufferCopy *pRegions_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions);
@@ -14241,7 +14241,7 @@ static NTSTATUS thunk32_vkCmdCopyBuffer2(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyBufferInfo232 *pCopyBufferInfo;
     } *params = args;
-    VkCopyBufferInfo2_host pCopyBufferInfo_host;
+    VkCopyBufferInfo2 pCopyBufferInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferInfo);
@@ -14276,7 +14276,7 @@ static NTSTATUS thunk32_vkCmdCopyBuffer2KHR(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyBufferInfo232 *pCopyBufferInfo;
     } *params = args;
-    VkCopyBufferInfo2_host pCopyBufferInfo_host;
+    VkCopyBufferInfo2 pCopyBufferInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferInfo);
@@ -14315,7 +14315,7 @@ static NTSTATUS thunk32_vkCmdCopyBufferToImage(void *args)
         uint32_t regionCount;
         const VkBufferImageCopy32 *pRegions;
     } *params = args;
-    const VkBufferImageCopy_host *pRegions_host;
+    const VkBufferImageCopy *pRegions_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions);
@@ -14350,7 +14350,7 @@ static NTSTATUS thunk32_vkCmdCopyBufferToImage2(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyBufferToImageInfo232 *pCopyBufferToImageInfo;
     } *params = args;
-    VkCopyBufferToImageInfo2_host pCopyBufferToImageInfo_host;
+    VkCopyBufferToImageInfo2 pCopyBufferToImageInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferToImageInfo);
@@ -14385,7 +14385,7 @@ static NTSTATUS thunk32_vkCmdCopyBufferToImage2KHR(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyBufferToImageInfo232 *pCopyBufferToImageInfo;
     } *params = args;
-    VkCopyBufferToImageInfo2_host pCopyBufferToImageInfo_host;
+    VkCopyBufferToImageInfo2 pCopyBufferToImageInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferToImageInfo);
@@ -14455,7 +14455,7 @@ static NTSTATUS thunk32_vkCmdCopyImage2(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyImageInfo232 *pCopyImageInfo;
     } *params = args;
-    VkCopyImageInfo2_host pCopyImageInfo_host;
+    VkCopyImageInfo2 pCopyImageInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo);

@@ -14487,7 +14487,7 @@ static NTSTATUS thunk32_vkCmdCopyImage2KHR(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyImageInfo232 *pCopyImageInfo;
     } *params = args;
-    VkCopyImageInfo2_host pCopyImageInfo_host;
+    VkCopyImageInfo2 pCopyImageInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo);

@@ -14523,7 +14523,7 @@ static NTSTATUS thunk32_vkCmdCopyImageToBuffer(void *args)
         uint32_t regionCount;
         const VkBufferImageCopy32 *pRegions;
     } *params = args;
-    const VkBufferImageCopy_host *pRegions_host;
+    const VkBufferImageCopy *pRegions_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %#x, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions);
@@ -14558,7 +14558,7 @@ static NTSTATUS thunk32_vkCmdCopyImageToBuffer2(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyImageToBufferInfo232 *pCopyImageToBufferInfo;
     } *params = args;
-    VkCopyImageToBufferInfo2_host pCopyImageToBufferInfo_host;
+    VkCopyImageToBufferInfo2 pCopyImageToBufferInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageToBufferInfo);
@@ -14593,7 +14593,7 @@ static NTSTATUS thunk32_vkCmdCopyImageToBuffer2KHR(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyImageToBufferInfo232 *pCopyImageToBufferInfo;
     } *params = args;
-    VkCopyImageToBufferInfo2_host pCopyImageToBufferInfo_host;
+    VkCopyImageToBufferInfo2 pCopyImageToBufferInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageToBufferInfo);
@@ -14660,7 +14660,7 @@ static NTSTATUS thunk32_vkCmdCopyMemoryToAccelerationStructureKHR(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyMemoryToAccelerationStructureInfoKHR32 *pInfo;
     } *params = args;
-    VkCopyMemoryToAccelerationStructureInfoKHR_host pInfo_host;
+    VkCopyMemoryToAccelerationStructureInfoKHR pInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pInfo);

@@ -14727,7 +14727,7 @@ static NTSTATUS thunk32_vkCmdCopyMemoryToMicromapEXT(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyMemoryToMicromapInfoEXT32 *pInfo;
     } *params = args;
-    VkCopyMemoryToMicromapInfoEXT_host pInfo_host;
+    VkCopyMemoryToMicromapInfoEXT pInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pInfo);

@@ -14759,7 +14759,7 @@ static NTSTATUS thunk32_vkCmdCopyMicromapEXT(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyMicromapInfoEXT32 *pInfo;
     } *params = args;
-    VkCopyMicromapInfoEXT_host pInfo_host;
+    VkCopyMicromapInfoEXT pInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pInfo);

@@ -14791,7 +14791,7 @@ static NTSTATUS thunk32_vkCmdCopyMicromapToMemoryEXT(void *args)
         VkCommandBuffer commandBuffer;
         const VkCopyMicromapToMemoryInfoEXT32 *pInfo;
     } *params = args;
-    VkCopyMicromapToMemoryInfoEXT_host pInfo_host;
+    VkCopyMicromapToMemoryInfoEXT pInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pInfo);

@@ -14859,7 +14859,7 @@ static NTSTATUS thunk32_vkCmdCuLaunchKernelNVX(void *args)
         VkCommandBuffer commandBuffer;
         const VkCuLaunchInfoNVX32 *pLaunchInfo;
     } *params = args;
-    VkCuLaunchInfoNVX_host pLaunchInfo_host;
+    VkCuLaunchInfoNVX pLaunchInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pLaunchInfo);

@@ -15013,7 +15013,7 @@ static NTSTATUS thunk32_vkCmdDecompressMemoryNV(void *args)
         uint32_t decompressRegionCount;
         const VkDecompressMemoryRegionNV32 *pDecompressMemoryRegions;
     } *params = args;
-    const VkDecompressMemoryRegionNV_host *pDecompressMemoryRegions_host;
+    const VkDecompressMemoryRegionNV *pDecompressMemoryRegions_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->commandBuffer, params->decompressRegionCount, params->pDecompressMemoryRegions);
@@ -16170,7 +16170,7 @@ static NTSTATUS thunk32_vkCmdExecuteGeneratedCommandsNV(void *args)
         VkBool32 isPreprocessed;
         const VkGeneratedCommandsInfoNV32 *pGeneratedCommandsInfo;
     } *params = args;
-    VkGeneratedCommandsInfoNV_host pGeneratedCommandsInfo_host;
+    VkGeneratedCommandsInfoNV pGeneratedCommandsInfo_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->commandBuffer, params->isPreprocessed, params->pGeneratedCommandsInfo);
@@ -16399,8 +16399,8 @@ static NTSTATUS thunk32_vkCmdPipelineBarrier(void *args)
         uint32_t imageMemoryBarrierCount;
         const VkImageMemoryBarrier32 *pImageMemoryBarriers;
     } *params = args;
-    const VkBufferMemoryBarrier_host *pBufferMemoryBarriers_host;
-    const VkImageMemoryBarrier_host *pImageMemoryBarriers_host;
+    const VkBufferMemoryBarrier *pBufferMemoryBarriers_host;
+    const VkImageMemoryBarrier *pImageMemoryBarriers_host;
     struct conversion_context ctx;

TRACE("%p, %#x, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->srcStageMask, params->dstStageMask, params->dependencyFlags, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers);
@@ -16436,7 +16436,7 @@ static NTSTATUS thunk32_vkCmdPipelineBarrier2(void *args)
         VkCommandBuffer commandBuffer;
         const VkDependencyInfo32 *pDependencyInfo;
     } *params = args;
-    VkDependencyInfo_host pDependencyInfo_host;
+    VkDependencyInfo pDependencyInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->commandBuffer, params->pDependencyInfo);
@@ -16471,7 +16471,7 @@ static NTSTATUS thunk32_vkCmdPipelineBarrier2KHR(void *args)
         VkCommandBuffer commandBuffer;
         const VkDependencyInfo32 *pDependencyInfo;
     } *params = args;
-    VkDependencyInfo_host pDependencyInfo_host;
+    VkDependencyInfo pDependencyInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->commandBuffer, params->pDependencyInfo);
@@ -16506,7 +16506,7 @@ static NTSTATUS thunk32_vkCmdPreprocessGeneratedCommandsNV(void *args)
         VkCommandBuffer commandBuffer;
         const VkGeneratedCommandsInfoNV32 *pGeneratedCommandsInfo;
     } *params = args;
-    VkGeneratedCommandsInfoNV_host pGeneratedCommandsInfo_host;
+    VkGeneratedCommandsInfoNV pGeneratedCommandsInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->commandBuffer, params->pGeneratedCommandsInfo);
@@ -16579,7 +16579,7 @@ static NTSTATUS thunk32_vkCmdPushDescriptorSetKHR(void *args)
         uint32_t descriptorWriteCount;
         const VkWriteDescriptorSet32 *pDescriptorWrites;
     } *params = args;
-    const VkWriteDescriptorSet_host *pDescriptorWrites_host;
+    const VkWriteDescriptorSet *pDescriptorWrites_host;
     struct conversion_context ctx;

TRACE("%p, %#x, 0x%s, %u, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->set, params->descriptorWriteCount, params->pDescriptorWrites);
@@ -16807,7 +16807,7 @@ static NTSTATUS thunk32_vkCmdResolveImage2(void *args)
         VkCommandBuffer commandBuffer;
         const VkResolveImageInfo232 *pResolveImageInfo;
     } *params = args;
-    VkResolveImageInfo2_host pResolveImageInfo_host;
+    VkResolveImageInfo2 pResolveImageInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo);

@@ -16839,7 +16839,7 @@ static NTSTATUS thunk32_vkCmdResolveImage2KHR(void *args)
         VkCommandBuffer commandBuffer;
         const VkResolveImageInfo232 *pResolveImageInfo;
     } *params = args;
-    VkResolveImageInfo2_host pResolveImageInfo_host;
+    VkResolveImageInfo2 pResolveImageInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo);

@@ -18030,7 +18030,7 @@ static NTSTATUS thunk32_vkCmdSetEvent2(void *args)
         VkEvent DECLSPEC_ALIGN(8) event;
         const VkDependencyInfo32 *pDependencyInfo;
     } *params = args;
-    VkDependencyInfo_host pDependencyInfo_host;
+    VkDependencyInfo pDependencyInfo_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->pDependencyInfo);
@@ -18066,7 +18066,7 @@ static NTSTATUS thunk32_vkCmdSetEvent2KHR(void *args)
         VkEvent DECLSPEC_ALIGN(8) event;
         const VkDependencyInfo32 *pDependencyInfo;
     } *params = args;
-    VkDependencyInfo_host pDependencyInfo_host;
+    VkDependencyInfo pDependencyInfo_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->pDependencyInfo);
@@ -18497,7 +18497,7 @@ static NTSTATUS thunk32_vkCmdSetPerformanceMarkerINTEL(void *args)
         const VkPerformanceMarkerInfoINTEL32 *pMarkerInfo;
         VkResult result;
     } *params = args;
-    VkPerformanceMarkerInfoINTEL_host pMarkerInfo_host;
+    VkPerformanceMarkerInfoINTEL pMarkerInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo);

@@ -18530,7 +18530,7 @@ static NTSTATUS thunk32_vkCmdSetPerformanceOverrideINTEL(void *args)
         const VkPerformanceOverrideInfoINTEL32 *pOverrideInfo;
         VkResult result;
     } *params = args;
-    VkPerformanceOverrideInfoINTEL_host pOverrideInfo_host;
+    VkPerformanceOverrideInfoINTEL pOverrideInfo_host;

TRACE("%p, %p\n", params->commandBuffer, params->pOverrideInfo);

@@ -19735,10 +19735,10 @@ static NTSTATUS thunk32_vkCmdTraceRaysIndirectKHR(void *args)
         const VkStridedDeviceAddressRegionKHR32 *pCallableShaderBindingTable;
         VkDeviceAddress DECLSPEC_ALIGN(8) indirectDeviceAddress;
     } *params = args;
-    VkStridedDeviceAddressRegionKHR_host pRaygenShaderBindingTable_host;
-    VkStridedDeviceAddressRegionKHR_host pMissShaderBindingTable_host;
-    VkStridedDeviceAddressRegionKHR_host pHitShaderBindingTable_host;
-    VkStridedDeviceAddressRegionKHR_host pCallableShaderBindingTable_host;
+    VkStridedDeviceAddressRegionKHR pRaygenShaderBindingTable_host;
+    VkStridedDeviceAddressRegionKHR pMissShaderBindingTable_host;
+    VkStridedDeviceAddressRegionKHR pHitShaderBindingTable_host;
+    VkStridedDeviceAddressRegionKHR pCallableShaderBindingTable_host;

TRACE("%p, %p, %p, %p, %p, 0x%s\n", params->commandBuffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, wine_dbgstr_longlong(params->indirectDeviceAddress));

@@ -19779,10 +19779,10 @@ static NTSTATUS thunk32_vkCmdTraceRaysKHR(void *args)
         uint32_t height;
         uint32_t depth;
     } *params = args;
-    VkStridedDeviceAddressRegionKHR_host pRaygenShaderBindingTable_host;
-    VkStridedDeviceAddressRegionKHR_host pMissShaderBindingTable_host;
-    VkStridedDeviceAddressRegionKHR_host pHitShaderBindingTable_host;
-    VkStridedDeviceAddressRegionKHR_host pCallableShaderBindingTable_host;
+    VkStridedDeviceAddressRegionKHR pRaygenShaderBindingTable_host;
+    VkStridedDeviceAddressRegionKHR pMissShaderBindingTable_host;
+    VkStridedDeviceAddressRegionKHR pHitShaderBindingTable_host;
+    VkStridedDeviceAddressRegionKHR pCallableShaderBindingTable_host;

TRACE("%p, %p, %p, %p, %p, %u, %u, %u\n", params->commandBuffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->width, params->height, params->depth);

@@ -19902,8 +19902,8 @@ static NTSTATUS thunk32_vkCmdWaitEvents(void *args)
         uint32_t imageMemoryBarrierCount;
         const VkImageMemoryBarrier32 *pImageMemoryBarriers;
     } *params = args;
-    const VkBufferMemoryBarrier_host *pBufferMemoryBarriers_host;
-    const VkImageMemoryBarrier_host *pImageMemoryBarriers_host;
+    const VkBufferMemoryBarrier *pBufferMemoryBarriers_host;
+    const VkImageMemoryBarrier *pImageMemoryBarriers_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->srcStageMask, params->dstStageMask, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers);
@@ -19941,7 +19941,7 @@ static NTSTATUS thunk32_vkCmdWaitEvents2(void *args)
         const VkEvent *pEvents;
         const VkDependencyInfo32 *pDependencyInfos;
     } *params = args;
-    const VkDependencyInfo_host *pDependencyInfos_host;
+    const VkDependencyInfo *pDependencyInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos);
@@ -19978,7 +19978,7 @@ static NTSTATUS thunk32_vkCmdWaitEvents2KHR(void *args)
         const VkEvent *pEvents;
         const VkDependencyInfo32 *pDependencyInfos;
     } *params = args;
-    const VkDependencyInfo_host *pDependencyInfos_host;
+    const VkDependencyInfo *pDependencyInfos_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos);
@@ -20311,7 +20311,7 @@ static NTSTATUS thunk32_vkCopyAccelerationStructureKHR(void *args)
         const VkCopyAccelerationStructureInfoKHR32 *pInfo;
         VkResult result;
     } *params = args;
-    VkCopyAccelerationStructureInfoKHR_host pInfo_host;
+    VkCopyAccelerationStructureInfoKHR pInfo_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo);

@@ -20345,7 +20345,7 @@ static NTSTATUS thunk32_vkCopyAccelerationStructureToMemoryKHR(void *args)
         const VkCopyAccelerationStructureToMemoryInfoKHR32 *pInfo;
         VkResult result;
     } *params = args;
-    VkCopyAccelerationStructureToMemoryInfoKHR_host pInfo_host;
+    VkCopyAccelerationStructureToMemoryInfoKHR pInfo_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo);

@@ -20379,7 +20379,7 @@ static NTSTATUS thunk32_vkCopyMemoryToAccelerationStructureKHR(void *args)
         const VkCopyMemoryToAccelerationStructureInfoKHR32 *pInfo;
         VkResult result;
     } *params = args;
-    VkCopyMemoryToAccelerationStructureInfoKHR_host pInfo_host;
+    VkCopyMemoryToAccelerationStructureInfoKHR pInfo_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo);

@@ -20413,7 +20413,7 @@ static NTSTATUS thunk32_vkCopyMemoryToMicromapEXT(void *args)
         const VkCopyMemoryToMicromapInfoEXT32 *pInfo;
         VkResult result;
     } *params = args;
-    VkCopyMemoryToMicromapInfoEXT_host pInfo_host;
+    VkCopyMemoryToMicromapInfoEXT pInfo_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo);

@@ -20447,7 +20447,7 @@ static NTSTATUS thunk32_vkCopyMicromapEXT(void *args)
         const VkCopyMicromapInfoEXT32 *pInfo;
         VkResult result;
     } *params = args;
-    VkCopyMicromapInfoEXT_host pInfo_host;
+    VkCopyMicromapInfoEXT pInfo_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo);

@@ -20481,7 +20481,7 @@ static NTSTATUS thunk32_vkCopyMicromapToMemoryEXT(void *args)
         const VkCopyMicromapToMemoryInfoEXT32 *pInfo;
         VkResult result;
     } *params = args;
-    VkCopyMicromapToMemoryInfoEXT_host pInfo_host;
+    VkCopyMicromapToMemoryInfoEXT pInfo_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo);

@@ -20516,7 +20516,7 @@ static NTSTATUS thunk32_vkCreateAccelerationStructureKHR(void *args)
         VkAccelerationStructureKHR *pAccelerationStructure;
         VkResult result;
     } *params = args;
-    VkAccelerationStructureCreateInfoKHR_host pCreateInfo_host;
+    VkAccelerationStructureCreateInfoKHR pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pAccelerationStructure);

@@ -20551,7 +20551,7 @@ static NTSTATUS thunk32_vkCreateAccelerationStructureNV(void *args)
         VkAccelerationStructureNV *pAccelerationStructure;
         VkResult result;
     } *params = args;
-    VkAccelerationStructureCreateInfoNV_host pCreateInfo_host;
+    VkAccelerationStructureCreateInfoNV pCreateInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pAccelerationStructure);
@@ -20589,7 +20589,7 @@ static NTSTATUS thunk32_vkCreateBuffer(void *args)
         VkBuffer *pBuffer;
         VkResult result;
     } *params = args;
-    VkBufferCreateInfo_host pCreateInfo_host;
+    VkBufferCreateInfo pCreateInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pBuffer);
@@ -20627,7 +20627,7 @@ static NTSTATUS thunk32_vkCreateBufferView(void *args)
         VkBufferView *pView;
         VkResult result;
     } *params = args;
-    VkBufferViewCreateInfo_host pCreateInfo_host;
+    VkBufferViewCreateInfo pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView);

@@ -20703,7 +20703,7 @@ static NTSTATUS thunk32_vkCreateComputePipelines(void *args)
         VkPipeline *pPipelines;
         VkResult result;
     } *params = args;
-    const VkComputePipelineCreateInfo_host *pCreateInfos_host;
+    const VkComputePipelineCreateInfo *pCreateInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines);
@@ -20742,7 +20742,7 @@ static NTSTATUS thunk32_vkCreateCuFunctionNVX(void *args)
         VkCuFunctionNVX *pFunction;
         VkResult result;
     } *params = args;
-    VkCuFunctionCreateInfoNVX_host pCreateInfo_host;
+    VkCuFunctionCreateInfoNVX pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFunction);

@@ -20974,7 +20974,7 @@ static NTSTATUS thunk32_vkCreateDescriptorUpdateTemplate(void *args)
         VkDescriptorUpdateTemplate *pDescriptorUpdateTemplate;
         VkResult result;
     } *params = args;
-    VkDescriptorUpdateTemplateCreateInfo_host pCreateInfo_host;
+    VkDescriptorUpdateTemplateCreateInfo pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate);

@@ -21009,7 +21009,7 @@ static NTSTATUS thunk32_vkCreateDescriptorUpdateTemplateKHR(void *args)
         VkDescriptorUpdateTemplate *pDescriptorUpdateTemplate;
         VkResult result;
     } *params = args;
-    VkDescriptorUpdateTemplateCreateInfo_host pCreateInfo_host;
+    VkDescriptorUpdateTemplateCreateInfo pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate);

@@ -21154,7 +21154,7 @@ static NTSTATUS thunk32_vkCreateFramebuffer(void *args)
         VkFramebuffer *pFramebuffer;
         VkResult result;
     } *params = args;
-    VkFramebufferCreateInfo_host pCreateInfo_host;
+    VkFramebufferCreateInfo pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFramebuffer);

@@ -21196,7 +21196,7 @@ static NTSTATUS thunk32_vkCreateGraphicsPipelines(void *args)
         VkPipeline *pPipelines;
         VkResult result;
     } *params = args;
-    const VkGraphicsPipelineCreateInfo_host *pCreateInfos_host;
+    const VkGraphicsPipelineCreateInfo *pCreateInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines);
@@ -21273,7 +21273,7 @@ static NTSTATUS thunk32_vkCreateImageView(void *args)
         VkImageView *pView;
         VkResult result;
     } *params = args;
-    VkImageViewCreateInfo_host pCreateInfo_host;
+    VkImageViewCreateInfo pCreateInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView);
@@ -21311,7 +21311,7 @@ static NTSTATUS thunk32_vkCreateIndirectCommandsLayoutNV(void *args)
         VkIndirectCommandsLayoutNV *pIndirectCommandsLayout;
         VkResult result;
     } *params = args;
-    VkIndirectCommandsLayoutCreateInfoNV_host pCreateInfo_host;
+    VkIndirectCommandsLayoutCreateInfoNV pCreateInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pIndirectCommandsLayout);
@@ -21392,7 +21392,7 @@ static NTSTATUS thunk32_vkCreateMicromapEXT(void *args)
         VkMicromapEXT *pMicromap;
         VkResult result;
     } *params = args;
-    VkMicromapCreateInfoEXT_host pCreateInfo_host;
+    VkMicromapCreateInfoEXT pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pMicromap);

@@ -21633,7 +21633,7 @@ static NTSTATUS thunk32_vkCreateRayTracingPipelinesKHR(void *args)
         VkPipeline *pPipelines;
         VkResult result;
     } *params = args;
-    const VkRayTracingPipelineCreateInfoKHR_host *pCreateInfos_host;
+    const VkRayTracingPipelineCreateInfoKHR *pCreateInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines);
@@ -21679,7 +21679,7 @@ static NTSTATUS thunk32_vkCreateRayTracingPipelinesNV(void *args)
         VkPipeline *pPipelines;
         VkResult result;
     } *params = args;
-    const VkRayTracingPipelineCreateInfoNV_host *pCreateInfos_host;
+    const VkRayTracingPipelineCreateInfoNV *pCreateInfos_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines);
@@ -21999,7 +21999,7 @@ static NTSTATUS thunk32_vkCreateSwapchainKHR(void *args)
         VkSwapchainKHR *pSwapchain;
         VkResult result;
     } *params = args;
-    VkSwapchainCreateInfoKHR_host pCreateInfo_host;
+    VkSwapchainCreateInfoKHR pCreateInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSwapchain);

@@ -22100,7 +22100,7 @@ static NTSTATUS thunk32_vkDebugMarkerSetObjectNameEXT(void *args)
         const VkDebugMarkerObjectNameInfoEXT32 *pNameInfo;
         VkResult result;
     } *params = args;
-    VkDebugMarkerObjectNameInfoEXT_host pNameInfo_host;
+    VkDebugMarkerObjectNameInfoEXT pNameInfo_host;

TRACE("%p, %p\n", params->device, params->pNameInfo);

@@ -22135,7 +22135,7 @@ static NTSTATUS thunk32_vkDebugMarkerSetObjectTagEXT(void *args)
         const VkDebugMarkerObjectTagInfoEXT32 *pTagInfo;
         VkResult result;
     } *params = args;
-    VkDebugMarkerObjectTagInfoEXT_host pTagInfo_host;
+    VkDebugMarkerObjectTagInfoEXT pTagInfo_host;

TRACE("%p, %p\n", params->device, params->pTagInfo);

@@ -23772,7 +23772,7 @@ static NTSTATUS thunk32_vkFlushMappedMemoryRanges(void *args)
         const VkMappedMemoryRange32 *pMemoryRanges;
         VkResult result;
     } *params = args;
-    const VkMappedMemoryRange_host *pMemoryRanges_host;
+    const VkMappedMemoryRange *pMemoryRanges_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges);
@@ -23906,8 +23906,8 @@ static NTSTATUS thunk32_vkGetAccelerationStructureBuildSizesKHR(void *args)
         const uint32_t *pMaxPrimitiveCounts;
         VkAccelerationStructureBuildSizesInfoKHR32 *pSizeInfo;
     } *params = args;
-    VkAccelerationStructureBuildGeometryInfoKHR_host pBuildInfo_host;
-    VkAccelerationStructureBuildSizesInfoKHR_host pSizeInfo_host;
+    VkAccelerationStructureBuildGeometryInfoKHR pBuildInfo_host;
+    VkAccelerationStructureBuildSizesInfoKHR pSizeInfo_host;
     struct conversion_context ctx;

TRACE("%p, %#x, %p, %p, %p\n", params->device, params->buildType, params->pBuildInfo, params->pMaxPrimitiveCounts, params->pSizeInfo);
@@ -23945,7 +23945,7 @@ static NTSTATUS thunk32_vkGetAccelerationStructureDeviceAddressKHR(void *args)
         const VkAccelerationStructureDeviceAddressInfoKHR32 *pInfo;
         VkDeviceAddress result;
     } *params = args;
-    VkAccelerationStructureDeviceAddressInfoKHR_host pInfo_host;
+    VkAccelerationStructureDeviceAddressInfoKHR pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);

@@ -24011,8 +24011,8 @@ static NTSTATUS thunk32_vkGetAccelerationStructureMemoryRequirementsNV(void *arg
         const VkAccelerationStructureMemoryRequirementsInfoNV32 *pInfo;
         VkMemoryRequirements2KHR32 *pMemoryRequirements;
     } *params = args;
-    VkAccelerationStructureMemoryRequirementsInfoNV_host pInfo_host;
-    VkMemoryRequirements2KHR_host pMemoryRequirements_host;
+    VkAccelerationStructureMemoryRequirementsInfoNV pInfo_host;
+    VkMemoryRequirements2KHR pMemoryRequirements_host;

TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements);

@@ -24047,7 +24047,7 @@ static NTSTATUS thunk32_vkGetBufferDeviceAddress(void *args)
         const VkBufferDeviceAddressInfo32 *pInfo;
         VkDeviceAddress result;
     } *params = args;
-    VkBufferDeviceAddressInfo_host pInfo_host;
+    VkBufferDeviceAddressInfo pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);

@@ -24080,7 +24080,7 @@ static NTSTATUS thunk32_vkGetBufferDeviceAddressEXT(void *args)
         const VkBufferDeviceAddressInfo32 *pInfo;
         VkDeviceAddress result;
     } *params = args;
-    VkBufferDeviceAddressInfo_host pInfo_host;
+    VkBufferDeviceAddressInfo pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);

@@ -24113,7 +24113,7 @@ static NTSTATUS thunk32_vkGetBufferDeviceAddressKHR(void *args)
         const VkBufferDeviceAddressInfo32 *pInfo;
         VkDeviceAddress result;
     } *params = args;
-    VkBufferDeviceAddressInfo_host pInfo_host;
+    VkBufferDeviceAddressInfo pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);

@@ -24146,7 +24146,7 @@ static NTSTATUS thunk32_vkGetBufferMemoryRequirements(void *args)
         VkBuffer DECLSPEC_ALIGN(8) buffer;
         VkMemoryRequirements32 *pMemoryRequirements;
     } *params = args;
-    VkMemoryRequirements_host pMemoryRequirements_host;
+    VkMemoryRequirements pMemoryRequirements_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pMemoryRequirements);

@@ -24179,8 +24179,8 @@ static NTSTATUS thunk32_vkGetBufferMemoryRequirements2(void *args)
         const VkBufferMemoryRequirementsInfo232 *pInfo;
         VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
-    VkBufferMemoryRequirementsInfo2_host pInfo_host;
-    VkMemoryRequirements2_host pMemoryRequirements_host;
+    VkBufferMemoryRequirementsInfo2 pInfo_host;
+    VkMemoryRequirements2 pMemoryRequirements_host;

TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements);

@@ -24215,8 +24215,8 @@ static NTSTATUS thunk32_vkGetBufferMemoryRequirements2KHR(void *args)
         const VkBufferMemoryRequirementsInfo232 *pInfo;
         VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
-    VkBufferMemoryRequirementsInfo2_host pInfo_host;
-    VkMemoryRequirements2_host pMemoryRequirements_host;
+    VkBufferMemoryRequirementsInfo2 pInfo_host;
+    VkMemoryRequirements2 pMemoryRequirements_host;

TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements);

@@ -24251,7 +24251,7 @@ static NTSTATUS thunk32_vkGetBufferOpaqueCaptureAddress(void *args)
         const VkBufferDeviceAddressInfo32 *pInfo;
         uint64_t result;
     } *params = args;
-    VkBufferDeviceAddressInfo_host pInfo_host;
+    VkBufferDeviceAddressInfo pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);

@@ -24284,7 +24284,7 @@ static NTSTATUS thunk32_vkGetBufferOpaqueCaptureAddressKHR(void *args)
         const VkBufferDeviceAddressInfo32 *pInfo;
         uint64_t result;
     } *params = args;
-    VkBufferDeviceAddressInfo_host pInfo_host;
+    VkBufferDeviceAddressInfo pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);

@@ -24444,7 +24444,7 @@ static NTSTATUS thunk32_vkGetDescriptorSetLayoutHostMappingInfoVALVE(void *args)
         const VkDescriptorSetBindingReferenceVALVE32 *pBindingReference;
         VkDescriptorSetLayoutHostMappingInfoVALVE *pHostMapping;
     } *params = args;
-    VkDescriptorSetBindingReferenceVALVE_host pBindingReference_host;
+    VkDescriptorSetBindingReferenceVALVE pBindingReference_host;

TRACE("%p, %p, %p\n", params->device, params->pBindingReference, params->pHostMapping);

@@ -24570,8 +24570,8 @@ static NTSTATUS thunk32_vkGetDeviceBufferMemoryRequirements(void *args)
         const VkDeviceBufferMemoryRequirements32 *pInfo;
         VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
-    VkDeviceBufferMemoryRequirements_host pInfo_host;
-    VkMemoryRequirements2_host pMemoryRequirements_host;
+    VkDeviceBufferMemoryRequirements pInfo_host;
+    VkMemoryRequirements2 pMemoryRequirements_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements);
@@ -24609,8 +24609,8 @@ static NTSTATUS thunk32_vkGetDeviceBufferMemoryRequirementsKHR(void *args)
         const VkDeviceBufferMemoryRequirements32 *pInfo;
         VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
-    VkDeviceBufferMemoryRequirements_host pInfo_host;
-    VkMemoryRequirements2_host pMemoryRequirements_host;
+    VkDeviceBufferMemoryRequirements pInfo_host;
+    VkMemoryRequirements2 pMemoryRequirements_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements);
@@ -24649,8 +24649,8 @@ static NTSTATUS thunk32_vkGetDeviceFaultInfoEXT(void *args)
         VkDeviceFaultInfoEXT32 *pFaultInfo;
         VkResult result;
     } *params = args;
-    VkDeviceFaultCountsEXT_host pFaultCounts_host;
-    VkDeviceFaultInfoEXT_host *pFaultInfo_host = NULL;
+    VkDeviceFaultCountsEXT pFaultCounts_host;
+    VkDeviceFaultInfoEXT *pFaultInfo_host = NULL;
     struct conversion_context ctx;

TRACE("%p, %p, %p\n", params->device, params->pFaultCounts, params->pFaultInfo);
@@ -24823,7 +24823,7 @@ static NTSTATUS thunk32_vkGetDeviceImageMemoryRequirements(void *args)
         VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
     VkDeviceImageMemoryRequirements pInfo_host;
-    VkMemoryRequirements2_host pMemoryRequirements_host;
+    VkMemoryRequirements2 pMemoryRequirements_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements);
@@ -24862,7 +24862,7 @@ static NTSTATUS thunk32_vkGetDeviceImageMemoryRequirementsKHR(void *args)
         VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
     VkDeviceImageMemoryRequirements pInfo_host;
-    VkMemoryRequirements2_host pMemoryRequirements_host;
+    VkMemoryRequirements2 pMemoryRequirements_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements);
@@ -24902,7 +24902,7 @@ static NTSTATUS thunk32_vkGetDeviceImageSparseMemoryRequirements(void *args)
         VkSparseImageMemoryRequirements232 *pSparseMemoryRequirements;
     } *params = args;
     VkDeviceImageMemoryRequirements pInfo_host;
-    VkSparseImageMemoryRequirements2_host *pSparseMemoryRequirements_host;
+    VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements);
@@ -24942,7 +24942,7 @@ static NTSTATUS thunk32_vkGetDeviceImageSparseMemoryRequirementsKHR(void *args)
         VkSparseImageMemoryRequirements232 *pSparseMemoryRequirements;
     } *params = args;
     VkDeviceImageMemoryRequirements pInfo_host;
-    VkSparseImageMemoryRequirements2_host *pSparseMemoryRequirements_host;
+    VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements);
@@ -25011,7 +25011,7 @@ static NTSTATUS thunk32_vkGetDeviceMemoryOpaqueCaptureAddress(void *args)
         const VkDeviceMemoryOpaqueCaptureAddressInfo32 *pInfo;
         uint64_t result;
     } *params = args;
-    VkDeviceMemoryOpaqueCaptureAddressInfo_host pInfo_host;
+    VkDeviceMemoryOpaqueCaptureAddressInfo pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);

@@ -25044,7 +25044,7 @@ static NTSTATUS thunk32_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args)
         const VkDeviceMemoryOpaqueCaptureAddressInfo32 *pInfo;
         uint64_t result;
     } *params = args;
-    VkDeviceMemoryOpaqueCaptureAddressInfo_host pInfo_host;
+    VkDeviceMemoryOpaqueCaptureAddressInfo pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);

@@ -25204,7 +25204,7 @@ static NTSTATUS thunk32_vkGetDynamicRenderingTilePropertiesQCOM(void *args)
         VkTilePropertiesQCOM *pProperties;
         VkResult result;
     } *params = args;
-    VkRenderingInfo_host pRenderingInfo_host;
+    VkRenderingInfo pRenderingInfo_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p\n", params->device, params->pRenderingInfo, params->pProperties);
@@ -25335,8 +25335,8 @@ static NTSTATUS thunk32_vkGetGeneratedCommandsMemoryRequirementsNV(void *args)
         const VkGeneratedCommandsMemoryRequirementsInfoNV32 *pInfo;
         VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
-    VkGeneratedCommandsMemoryRequirementsInfoNV_host pInfo_host;
-    VkMemoryRequirements2_host pMemoryRequirements_host;
+    VkGeneratedCommandsMemoryRequirementsInfoNV pInfo_host;
+    VkMemoryRequirements2 pMemoryRequirements_host;

TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements);

@@ -25371,7 +25371,7 @@ static NTSTATUS thunk32_vkGetImageMemoryRequirements(void *args)
         VkImage DECLSPEC_ALIGN(8) image;
         VkMemoryRequirements32 *pMemoryRequirements;
     } *params = args;
-    VkMemoryRequirements_host pMemoryRequirements_host;
+    VkMemoryRequirements pMemoryRequirements_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pMemoryRequirements);

@@ -25404,8 +25404,8 @@ static NTSTATUS thunk32_vkGetImageMemoryRequirements2(void *args)
         const VkImageMemoryRequirementsInfo232 *pInfo;
         VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
-    VkImageMemoryRequirementsInfo2_host pInfo_host;
-    VkMemoryRequirements2_host pMemoryRequirements_host;
+    VkImageMemoryRequirementsInfo2 pInfo_host;
+    VkMemoryRequirements2 pMemoryRequirements_host;

TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements);

@@ -25440,8 +25440,8 @@ static NTSTATUS thunk32_vkGetImageMemoryRequirements2KHR(void *args)
         const VkImageMemoryRequirementsInfo232 *pInfo;
         VkMemoryRequirements232 *pMemoryRequirements;
     } *params = args;
-    VkImageMemoryRequirementsInfo2_host pInfo_host;
-    VkMemoryRequirements2_host pMemoryRequirements_host;
+    VkImageMemoryRequirementsInfo2 pInfo_host;
+    VkMemoryRequirements2 pMemoryRequirements_host;

TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements);

@@ -25477,7 +25477,7 @@ static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements(void *args)
         uint32_t *pSparseMemoryRequirementCount;
         VkSparseImageMemoryRequirements32 *pSparseMemoryRequirements;
     } *params = args;
-    VkSparseImageMemoryRequirements_host *pSparseMemoryRequirements_host;
+    VkSparseImageMemoryRequirements *pSparseMemoryRequirements_host;
     struct conversion_context ctx;

TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements);
@@ -25515,8 +25515,8 @@ static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements2(void *args)
         uint32_t *pSparseMemoryRequirementCount;
         VkSparseImageMemoryRequirements232 *pSparseMemoryRequirements;
     } *params = args;
-    VkImageSparseMemoryRequirementsInfo2_host pInfo_host;
-    VkSparseImageMemoryRequirements2_host *pSparseMemoryRequirements_host;
+    VkImageSparseMemoryRequirementsInfo2 pInfo_host;
+    VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements);
@@ -25555,8 +25555,8 @@ static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements2KHR(void *args)
         uint32_t *pSparseMemoryRequirementCount;
         VkSparseImageMemoryRequirements232 *pSparseMemoryRequirements;
     } *params = args;
-    VkImageSparseMemoryRequirementsInfo2_host pInfo_host;
-    VkSparseImageMemoryRequirements2_host *pSparseMemoryRequirements_host;
+    VkImageSparseMemoryRequirementsInfo2 pInfo_host;
+    VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements);
@@ -25595,7 +25595,7 @@ static NTSTATUS thunk32_vkGetImageSubresourceLayout(void *args)
         const VkImageSubresource *pSubresource;
         VkSubresourceLayout32 *pLayout;
     } *params = args;
-    VkSubresourceLayout_host pLayout_host;
+    VkSubresourceLayout pLayout_host;

TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout);

@@ -25629,7 +25629,7 @@ static NTSTATUS thunk32_vkGetImageSubresourceLayout2EXT(void *args)
         const VkImageSubresource2EXT *pSubresource;
         VkSubresourceLayout2EXT32 *pLayout;
     } *params = args;
-    VkSubresourceLayout2EXT_host pLayout_host;
+    VkSubresourceLayout2EXT pLayout_host;

TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout);

@@ -25664,7 +25664,7 @@ static NTSTATUS thunk32_vkGetImageViewAddressNVX(void *args)
         VkImageViewAddressPropertiesNVX32 *pProperties;
         VkResult result;
     } *params = args;
-    VkImageViewAddressPropertiesNVX_host pProperties_host;
+    VkImageViewAddressPropertiesNVX pProperties_host;

TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pProperties);

@@ -25698,7 +25698,7 @@ static NTSTATUS thunk32_vkGetImageViewHandleNVX(void *args)
         const VkImageViewHandleInfoNVX32 *pInfo;
         uint32_t result;
     } *params = args;
-    VkImageViewHandleInfoNVX_host pInfo_host;
+    VkImageViewHandleInfoNVX pInfo_host;

TRACE("%p, %p\n", params->device, params->pInfo);

@@ -25765,8 +25765,8 @@ static NTSTATUS thunk32_vkGetMicromapBuildSizesEXT(void *args)
         const VkMicromapBuildInfoEXT32 *pBuildInfo;
         VkMicromapBuildSizesInfoEXT32 *pSizeInfo;
     } *params = args;
-    VkMicromapBuildInfoEXT_host pBuildInfo_host;
-    VkMicromapBuildSizesInfoEXT_host pSizeInfo_host;
+    VkMicromapBuildInfoEXT pBuildInfo_host;
+    VkMicromapBuildSizesInfoEXT pSizeInfo_host;

TRACE("%p, %#x, %p, %p\n", params->device, params->buildType, params->pBuildInfo, params->pSizeInfo);

@@ -25802,7 +25802,7 @@ static NTSTATUS thunk32_vkGetPerformanceParameterINTEL(void *args)
         VkPerformanceValueINTEL32 *pValue;
         VkResult result;
     } *params = args;
-    VkPerformanceValueINTEL_host pValue_host;
+    VkPerformanceValueINTEL pValue_host;

TRACE("%p, %#x, %p\n", params->device, params->parameter, params->pValue);

@@ -26316,7 +26316,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties(void *args)
         VkImageFormatProperties32 *pImageFormatProperties;
         VkResult result;
     } *params = args;
-    VkImageFormatProperties_host pImageFormatProperties_host;
+    VkImageFormatProperties pImageFormatProperties_host;

TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p\n", params->physicalDevice, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties);

@@ -26350,7 +26350,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties2(void *args)
         VkImageFormatProperties232 *pImageFormatProperties;
         VkResult result;
     } *params = args;
-    VkImageFormatProperties2_host pImageFormatProperties_host;
+    VkImageFormatProperties2 pImageFormatProperties_host;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties);

@@ -26385,7 +26385,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties2KHR(void *args)
         VkImageFormatProperties232 *pImageFormatProperties;
         VkResult result;
     } *params = args;
-    VkImageFormatProperties2_host pImageFormatProperties_host;
+    VkImageFormatProperties2 pImageFormatProperties_host;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties);

@@ -26418,7 +26418,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties(void *args)
         VkPhysicalDevice physicalDevice;
         VkPhysicalDeviceMemoryProperties32 *pMemoryProperties;
     } *params = args;
-    VkPhysicalDeviceMemoryProperties_host pMemoryProperties_host;
+    VkPhysicalDeviceMemoryProperties pMemoryProperties_host;

TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties);

@@ -26450,7 +26450,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties2(void *args)
         VkPhysicalDevice physicalDevice;
         VkPhysicalDeviceMemoryProperties232 *pMemoryProperties;
     } *params = args;
-    VkPhysicalDeviceMemoryProperties2_host pMemoryProperties_host;
+    VkPhysicalDeviceMemoryProperties2 pMemoryProperties_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties);
@@ -26486,7 +26486,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties2KHR(void *args)
         VkPhysicalDevice physicalDevice;
         VkPhysicalDeviceMemoryProperties232 *pMemoryProperties;
     } *params = args;
-    VkPhysicalDeviceMemoryProperties2_host pMemoryProperties_host;
+    VkPhysicalDeviceMemoryProperties2 pMemoryProperties_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties);
@@ -26619,7 +26619,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceProperties(void *args)
         VkPhysicalDevice physicalDevice;
         VkPhysicalDeviceProperties32 *pProperties;
     } *params = args;
-    VkPhysicalDeviceProperties_host pProperties_host;
+    VkPhysicalDeviceProperties pProperties_host;

TRACE("%p, %p\n", params->physicalDevice, params->pProperties);

@@ -26651,7 +26651,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceProperties2(void *args)
         VkPhysicalDevice physicalDevice;
         VkPhysicalDeviceProperties232 *pProperties;
     } *params = args;
-    VkPhysicalDeviceProperties2_host pProperties_host;
+    VkPhysicalDeviceProperties2 pProperties_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->physicalDevice, params->pProperties);
@@ -26687,7 +26687,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceProperties2KHR(void *args)
         VkPhysicalDevice physicalDevice;
         VkPhysicalDeviceProperties232 *pProperties;
     } *params = args;
-    VkPhysicalDeviceProperties2_host pProperties_host;
+    VkPhysicalDeviceProperties2 pProperties_host;
     struct conversion_context ctx;

TRACE("%p, %p\n", params->physicalDevice, params->pProperties);
@@ -26981,7 +26981,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args)
         VkSurfaceCapabilities2KHR *pSurfaceCapabilities;
         VkResult result;
     } *params = args;
-    VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host;
+    VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo_host;

TRACE("%p, %p, %p\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceCapabilities);

@@ -27050,7 +27050,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args)
         VkSurfaceFormat2KHR *pSurfaceFormats;
         VkResult result;
     } *params = args;
-    VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host;
+    VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo_host;

TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceFormatCount, params->pSurfaceFormats);

@@ -27312,7 +27312,7 @@ static NTSTATUS thunk32_vkGetPipelineExecutableInternalRepresentationsKHR(void *
         VkPipelineExecutableInternalRepresentationKHR *pInternalRepresentations;
         VkResult result;
     } *params = args;
-    VkPipelineExecutableInfoKHR_host pExecutableInfo_host;
+    VkPipelineExecutableInfoKHR pExecutableInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pInternalRepresentationCount, params->pInternalRepresentations);

@@ -27347,7 +27347,7 @@ static NTSTATUS thunk32_vkGetPipelineExecutablePropertiesKHR(void *args)
         VkPipelineExecutablePropertiesKHR *pProperties;
         VkResult result;
     } *params = args;
-    VkPipelineInfoKHR_host pPipelineInfo_host;
+    VkPipelineInfoKHR pPipelineInfo_host;

TRACE("%p, %p, %p, %p\n", params->device, params->pPipelineInfo, params->pExecutableCount, params->pProperties);

@@ -27382,8 +27382,8 @@ static NTSTATUS thunk32_vkGetPipelineExecutableStatisticsKHR(void *args)
         VkPipelineExecutableStatisticKHR32 *pStatistics;
         VkResult result;
     } *params = args;
-    VkPipelineExecutableInfoKHR_host pExecutableInfo_host;
-    VkPipelineExecutableStatisticKHR_host *pStatistics_host;
+    VkPipelineExecutableInfoKHR pExecutableInfo_host;
+    VkPipelineExecutableStatisticKHR *pStatistics_host;
     struct conversion_context ctx;

TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pStatisticCount, params->pStatistics);
@@ -27422,7 +27422,7 @@ static NTSTATUS thunk32_vkGetPipelinePropertiesEXT(void *args)
         VkBaseOutStructure *pPipelineProperties;
         VkResult result;
     } *params = args;
-    VkPipelineInfoEXT_host pPipelineInfo_host;
+    VkPipelineInfoEXT pPipelineInfo_host;

TRACE("%p, %p, %p\n", params->device, params->pPipelineInfo, params->pPipelineProperties);

@@ -28053,7 +28053,7 @@ static NTSTATUS thunk32_vkInvalidateMappedMemoryRanges(void *args)
         const VkMappedMemoryRange32 *pMemoryRanges;
         VkResult result;
     } *params = args;
-    const VkMappedMemoryRange_host *pMemoryRanges_host;
+    const VkMappedMemoryRange *pMemoryRanges_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges);
@@ -28222,7 +28222,7 @@ static NTSTATUS thunk32_vkQueueBindSparse(void *args)
         VkFence DECLSPEC_ALIGN(8) fence;
         VkResult result;
     } *params = args;
-    const VkBindSparseInfo_host *pBindInfo_host;
+    const VkBindSparseInfo *pBindInfo_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, 0x%s\n", params->queue, params->bindInfoCount, params->pBindInfo, wine_dbgstr_longlong(params->fence));
@@ -28429,7 +28429,7 @@ static NTSTATUS thunk32_vkQueueSubmit2(void *args)
         VkFence DECLSPEC_ALIGN(8) fence;
         VkResult result;
     } *params = args;
-    const VkSubmitInfo2_host *pSubmits_host;
+    const VkSubmitInfo2 *pSubmits_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence));
@@ -28472,7 +28472,7 @@ static NTSTATUS thunk32_vkQueueSubmit2KHR(void *args)
         VkFence DECLSPEC_ALIGN(8) fence;
         VkResult result;
     } *params = args;
-    const VkSubmitInfo2_host *pSubmits_host;
+    const VkSubmitInfo2 *pSubmits_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence));
@@ -28822,7 +28822,7 @@ static NTSTATUS thunk32_vkSetDebugUtilsObjectNameEXT(void *args)
         const VkDebugUtilsObjectNameInfoEXT32 *pNameInfo;
         VkResult result;
     } *params = args;
-    VkDebugUtilsObjectNameInfoEXT_host pNameInfo_host;
+    VkDebugUtilsObjectNameInfoEXT pNameInfo_host;

TRACE("%p, %p\n", params->device, params->pNameInfo);

@@ -28857,7 +28857,7 @@ static NTSTATUS thunk32_vkSetDebugUtilsObjectTagEXT(void *args)
         const VkDebugUtilsObjectTagInfoEXT32 *pTagInfo;
         VkResult result;
     } *params = args;
-    VkDebugUtilsObjectTagInfoEXT_host pTagInfo_host;
+    VkDebugUtilsObjectTagInfoEXT pTagInfo_host;

TRACE("%p, %p\n", params->device, params->pTagInfo);

@@ -29020,7 +29020,7 @@ static NTSTATUS thunk32_vkSignalSemaphore(void *args)
         const VkSemaphoreSignalInfo32 *pSignalInfo;
         VkResult result;
     } *params = args;
-    VkSemaphoreSignalInfo_host pSignalInfo_host;
+    VkSemaphoreSignalInfo pSignalInfo_host;

TRACE("%p, %p\n", params->device, params->pSignalInfo);

@@ -29053,7 +29053,7 @@ static NTSTATUS thunk32_vkSignalSemaphoreKHR(void *args)
         const VkSemaphoreSignalInfo32 *pSignalInfo;
         VkResult result;
     } *params = args;
-    VkSemaphoreSignalInfo_host pSignalInfo_host;
+    VkSemaphoreSignalInfo pSignalInfo_host;

TRACE("%p, %p\n", params->device, params->pSignalInfo);

@@ -29092,7 +29092,7 @@ static NTSTATUS thunk32_vkSubmitDebugUtilsMessageEXT(void *args)
         VkDebugUtilsMessageTypeFlagsEXT messageTypes;
         const VkDebugUtilsMessengerCallbackDataEXT32 *pCallbackData;
     } *params = args;
-    VkDebugUtilsMessengerCallbackDataEXT_host pCallbackData_host;
+    VkDebugUtilsMessengerCallbackDataEXT pCallbackData_host;
     struct conversion_context ctx;

TRACE("%p, %#x, %#x, %p\n", params->instance, params->messageSeverity, params->messageTypes, params->pCallbackData);
@@ -29315,8 +29315,8 @@ static NTSTATUS thunk32_vkUpdateDescriptorSets(void *args)
         uint32_t descriptorCopyCount;
         const VkCopyDescriptorSet32 *pDescriptorCopies;
     } *params = args;
-    const VkWriteDescriptorSet_host *pDescriptorWrites_host;
-    const VkCopyDescriptorSet_host *pDescriptorCopies_host;
+    const VkWriteDescriptorSet *pDescriptorWrites_host;
+    const VkCopyDescriptorSet *pDescriptorCopies_host;
     struct conversion_context ctx;

TRACE("%p, %u, %p, %u, %p\n", params->device, params->descriptorWriteCount, params->pDescriptorWrites, params->descriptorCopyCount, params->pDescriptorCopies);
diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h
index 85234b68f51..c8da040a235 100644
--- a/dlls/winevulkan/vulkan_thunks.h
+++ b/dlls/winevulkan/vulkan_thunks.h
@@ -14,2472 +14,8 @@

#define WINE_VK_VERSION VK_API_VERSION_1_3

-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkAcquireNextImageInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkSwapchainKHR swapchain;
-    uint64_t timeout;
-    VkSemaphore semaphore;
-    VkFence fence;
-    uint32_t deviceMask;
-} VkAcquireNextImageInfoKHR_host;
-#else
-typedef VkAcquireNextImageInfoKHR VkAcquireNextImageInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkAcquireProfilingLockInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkAcquireProfilingLockFlagsKHR flags;
-    uint64_t timeout;
-} VkAcquireProfilingLockInfoKHR_host;
-#else
-typedef VkAcquireProfilingLockInfoKHR VkAcquireProfilingLockInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCommandBufferAllocateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkCommandPool commandPool;
-    VkCommandBufferLevel level;
-    uint32_t commandBufferCount;
-} VkCommandBufferAllocateInfo_host;
-#else
-typedef VkCommandBufferAllocateInfo VkCommandBufferAllocateInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDescriptorSetAllocateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDescriptorPool descriptorPool;
-    uint32_t descriptorSetCount;
-    const VkDescriptorSetLayout *pSetLayouts;
-} VkDescriptorSetAllocateInfo_host;
-#else
-typedef VkDescriptorSetAllocateInfo VkDescriptorSetAllocateInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDedicatedAllocationMemoryAllocateInfoNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImage image;
-    VkBuffer buffer;
-} VkDedicatedAllocationMemoryAllocateInfoNV_host;
-#else
-typedef VkDedicatedAllocationMemoryAllocateInfoNV VkDedicatedAllocationMemoryAllocateInfoNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkMemoryDedicatedAllocateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImage image;
-    VkBuffer buffer;
-} VkMemoryDedicatedAllocateInfo_host;
-typedef VkMemoryDedicatedAllocateInfo_host VkMemoryDedicatedAllocateInfoKHR_host;
-#else
-typedef VkMemoryDedicatedAllocateInfo VkMemoryDedicatedAllocateInfo_host;
-typedef VkMemoryDedicatedAllocateInfo_host VkMemoryDedicatedAllocateInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkMemoryOpaqueCaptureAddressAllocateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    uint64_t opaqueCaptureAddress;
-} VkMemoryOpaqueCaptureAddressAllocateInfo_host;
-typedef VkMemoryOpaqueCaptureAddressAllocateInfo_host VkMemoryOpaqueCaptureAddressAllocateInfoKHR_host;
-#else
-typedef VkMemoryOpaqueCaptureAddressAllocateInfo VkMemoryOpaqueCaptureAddressAllocateInfo_host;
-typedef VkMemoryOpaqueCaptureAddressAllocateInfo_host VkMemoryOpaqueCaptureAddressAllocateInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkMemoryAllocateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDeviceSize allocationSize;
-    uint32_t memoryTypeIndex;
-} VkMemoryAllocateInfo_host;
-#else
-typedef VkMemoryAllocateInfo VkMemoryAllocateInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCommandBufferInheritanceInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkRenderPass renderPass;
-    uint32_t subpass;
-    VkFramebuffer framebuffer;
-    VkBool32 occlusionQueryEnable;
-    VkQueryControlFlags queryFlags;
-    VkQueryPipelineStatisticFlags pipelineStatistics;
-} VkCommandBufferInheritanceInfo_host;
-#else
-typedef VkCommandBufferInheritanceInfo VkCommandBufferInheritanceInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCommandBufferBeginInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkCommandBufferUsageFlags flags;
-    const VkCommandBufferInheritanceInfo_host *pInheritanceInfo;
-} VkCommandBufferBeginInfo_host;
-#else
-typedef VkCommandBufferBeginInfo VkCommandBufferBeginInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBindAccelerationStructureMemoryInfoNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkAccelerationStructureNV accelerationStructure;
-    VkDeviceMemory memory;
-    VkDeviceSize memoryOffset;
-    uint32_t deviceIndexCount;
-    const uint32_t *pDeviceIndices;
-} VkBindAccelerationStructureMemoryInfoNV_host;
-#else
-typedef VkBindAccelerationStructureMemoryInfoNV VkBindAccelerationStructureMemoryInfoNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBindBufferMemoryInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkBuffer buffer;
-    VkDeviceMemory memory;
-    VkDeviceSize memoryOffset;
-} VkBindBufferMemoryInfo_host;
-typedef VkBindBufferMemoryInfo_host VkBindBufferMemoryInfoKHR_host;
-#else
-typedef VkBindBufferMemoryInfo VkBindBufferMemoryInfo_host;
-typedef VkBindBufferMemoryInfo_host VkBindBufferMemoryInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBindImageMemorySwapchainInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkSwapchainKHR swapchain;
-    uint32_t imageIndex;
-} VkBindImageMemorySwapchainInfoKHR_host;
-#else
-typedef VkBindImageMemorySwapchainInfoKHR VkBindImageMemorySwapchainInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBindImageMemoryInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImage image;
-    VkDeviceMemory memory;
-    VkDeviceSize memoryOffset;
-} VkBindImageMemoryInfo_host;
-typedef VkBindImageMemoryInfo_host VkBindImageMemoryInfoKHR_host;
-#else
-typedef VkBindImageMemoryInfo VkBindImageMemoryInfo_host;
-typedef VkBindImageMemoryInfo_host VkBindImageMemoryInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkAccelerationStructureGeometryKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkGeometryTypeKHR geometryType;
-    VkAccelerationStructureGeometryDataKHR geometry;
-    VkGeometryFlagsKHR flags;
-} VkAccelerationStructureGeometryKHR_host;
-#else
-typedef VkAccelerationStructureGeometryKHR VkAccelerationStructureGeometryKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkAccelerationStructureBuildGeometryInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkAccelerationStructureTypeKHR type;
-    VkBuildAccelerationStructureFlagsKHR flags;
-    VkBuildAccelerationStructureModeKHR mode;
-    VkAccelerationStructureKHR srcAccelerationStructure;
-    VkAccelerationStructureKHR dstAccelerationStructure;
-    uint32_t geometryCount;
-    const VkAccelerationStructureGeometryKHR_host *pGeometries;
-    const VkAccelerationStructureGeometryKHR_host * const*ppGeometries;
-    VkDeviceOrHostAddressKHR scratchData;
-} VkAccelerationStructureBuildGeometryInfoKHR_host;
-#else
-typedef VkAccelerationStructureBuildGeometryInfoKHR VkAccelerationStructureBuildGeometryInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkMicromapBuildInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkMicromapTypeEXT type;
-    VkBuildMicromapFlagsEXT flags;
-    VkBuildMicromapModeEXT mode;
-    VkMicromapEXT dstMicromap;
-    uint32_t usageCountsCount;
-    const VkMicromapUsageEXT *pUsageCounts;
-    const VkMicromapUsageEXT * const*ppUsageCounts;
-    VkDeviceOrHostAddressConstKHR data;
-    VkDeviceOrHostAddressKHR scratchData;
-    VkDeviceOrHostAddressConstKHR triangleArray;
-    VkDeviceSize triangleArrayStride;
-} VkMicromapBuildInfoEXT_host;
-#else
-typedef VkMicromapBuildInfoEXT VkMicromapBuildInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkConditionalRenderingBeginInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkBuffer buffer;
-    VkDeviceSize offset;
-    VkConditionalRenderingFlagsEXT flags;
-} VkConditionalRenderingBeginInfoEXT_host;
-#else
-typedef VkConditionalRenderingBeginInfoEXT VkConditionalRenderingBeginInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkRenderPassBeginInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkRenderPass renderPass;
-    VkFramebuffer framebuffer;
-    VkRect2D renderArea;
-    uint32_t clearValueCount;
-    const VkClearValue *pClearValues;
-} VkRenderPassBeginInfo_host;
-#else
-typedef VkRenderPassBeginInfo VkRenderPassBeginInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkRenderingAttachmentInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImageView imageView;
-    VkImageLayout imageLayout;
-    VkResolveModeFlagBits resolveMode;
-    VkImageView resolveImageView;
-    VkImageLayout resolveImageLayout;
-    VkAttachmentLoadOp loadOp;
-    VkAttachmentStoreOp storeOp;
-    VkClearValue clearValue;
-} VkRenderingAttachmentInfo_host;
-typedef VkRenderingAttachmentInfo_host VkRenderingAttachmentInfoKHR_host;
-#else
-typedef VkRenderingAttachmentInfo VkRenderingAttachmentInfo_host;
-typedef VkRenderingAttachmentInfo_host VkRenderingAttachmentInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkRenderingFragmentShadingRateAttachmentInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImageView imageView;
-    VkImageLayout imageLayout;
-    VkExtent2D shadingRateAttachmentTexelSize;
-} VkRenderingFragmentShadingRateAttachmentInfoKHR_host;
-#else
-typedef VkRenderingFragmentShadingRateAttachmentInfoKHR VkRenderingFragmentShadingRateAttachmentInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkRenderingFragmentDensityMapAttachmentInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImageView imageView;
-    VkImageLayout imageLayout;
-} VkRenderingFragmentDensityMapAttachmentInfoEXT_host;
-#else
-typedef VkRenderingFragmentDensityMapAttachmentInfoEXT VkRenderingFragmentDensityMapAttachmentInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkRenderingInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkRenderingFlags flags;
-    VkRect2D renderArea;
-    uint32_t layerCount;
-    uint32_t viewMask;
-    uint32_t colorAttachmentCount;
-    const VkRenderingAttachmentInfo_host *pColorAttachments;
-    const VkRenderingAttachmentInfo_host *pDepthAttachment;
-    const VkRenderingAttachmentInfo_host *pStencilAttachment;
-} VkRenderingInfo_host;
-typedef VkRenderingInfo_host VkRenderingInfoKHR_host;
-#else
-typedef VkRenderingInfo VkRenderingInfo_host;
-typedef VkRenderingInfo_host VkRenderingInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBlitImageInfo2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImage srcImage;
-    VkImageLayout srcImageLayout;
-    VkImage dstImage;
-    VkImageLayout dstImageLayout;
-    uint32_t regionCount;
-    const VkImageBlit2 *pRegions;
-    VkFilter filter;
-} VkBlitImageInfo2_host;
-typedef VkBlitImageInfo2_host VkBlitImageInfo2KHR_host;
-#else
-typedef VkBlitImageInfo2 VkBlitImageInfo2_host;
-typedef VkBlitImageInfo2_host VkBlitImageInfo2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkGeometryTrianglesNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkBuffer vertexData;
-    VkDeviceSize vertexOffset;
-    uint32_t vertexCount;
-    VkDeviceSize vertexStride;
-    VkFormat vertexFormat;
-    VkBuffer indexData;
-    VkDeviceSize indexOffset;
-    uint32_t indexCount;
-    VkIndexType indexType;
-    VkBuffer transformData;
-    VkDeviceSize transformOffset;
-} VkGeometryTrianglesNV_host;
-#else
-typedef VkGeometryTrianglesNV VkGeometryTrianglesNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkGeometryAABBNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkBuffer aabbData;
-    uint32_t numAABBs;
-    uint32_t stride;
-    VkDeviceSize offset;
-} VkGeometryAABBNV_host;
-#else
-typedef VkGeometryAABBNV VkGeometryAABBNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkGeometryDataNV_host
-{
-    VkGeometryTrianglesNV_host triangles;
-    VkGeometryAABBNV_host aabbs;
-} VkGeometryDataNV_host;
-#else
-typedef VkGeometryDataNV VkGeometryDataNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkGeometryNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkGeometryTypeKHR geometryType;
-    VkGeometryDataNV_host geometry;
-    VkGeometryFlagsKHR flags;
-} VkGeometryNV_host;
-#else
-typedef VkGeometryNV VkGeometryNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkAccelerationStructureInfoNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkAccelerationStructureTypeNV type;
-    VkBuildAccelerationStructureFlagsNV flags;
-    uint32_t instanceCount;
-    uint32_t geometryCount;
-    const VkGeometryNV_host *pGeometries;
-} VkAccelerationStructureInfoNV_host;
-#else
-typedef VkAccelerationStructureInfoNV VkAccelerationStructureInfoNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCopyAccelerationStructureInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkAccelerationStructureKHR src;
-    VkAccelerationStructureKHR dst;
-    VkCopyAccelerationStructureModeKHR mode;
-} VkCopyAccelerationStructureInfoKHR_host;
-#else
-typedef VkCopyAccelerationStructureInfoKHR VkCopyAccelerationStructureInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCopyAccelerationStructureToMemoryInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkAccelerationStructureKHR src;
-    VkDeviceOrHostAddressKHR dst;
-    VkCopyAccelerationStructureModeKHR mode;
-} VkCopyAccelerationStructureToMemoryInfoKHR_host;
-#else
-typedef VkCopyAccelerationStructureToMemoryInfoKHR VkCopyAccelerationStructureToMemoryInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBufferCopy_host
-{
-    VkDeviceSize srcOffset;
-    VkDeviceSize dstOffset;
-    VkDeviceSize size;
-} VkBufferCopy_host;
-#else
-typedef VkBufferCopy VkBufferCopy_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBufferCopy2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDeviceSize srcOffset;
-    VkDeviceSize dstOffset;
-    VkDeviceSize size;
-} VkBufferCopy2_host;
-typedef VkBufferCopy2_host VkBufferCopy2KHR_host;
-#else
-typedef VkBufferCopy2 VkBufferCopy2_host;
-typedef VkBufferCopy2_host VkBufferCopy2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCopyBufferInfo2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkBuffer srcBuffer;
-    VkBuffer dstBuffer;
-    uint32_t regionCount;
-    const VkBufferCopy2_host *pRegions;
-} VkCopyBufferInfo2_host;
-typedef VkCopyBufferInfo2_host VkCopyBufferInfo2KHR_host;
-#else
-typedef VkCopyBufferInfo2 VkCopyBufferInfo2_host;
-typedef VkCopyBufferInfo2_host VkCopyBufferInfo2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBufferImageCopy_host
-{
-    VkDeviceSize bufferOffset;
-    uint32_t bufferRowLength;
-    uint32_t bufferImageHeight;
-    VkImageSubresourceLayers imageSubresource;
-    VkOffset3D imageOffset;
-    VkExtent3D imageExtent;
-} VkBufferImageCopy_host;
-#else
-typedef VkBufferImageCopy VkBufferImageCopy_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBufferImageCopy2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDeviceSize bufferOffset;
-    uint32_t bufferRowLength;
-    uint32_t bufferImageHeight;
-    VkImageSubresourceLayers imageSubresource;
-    VkOffset3D imageOffset;
-    VkExtent3D imageExtent;
-} VkBufferImageCopy2_host;
-typedef VkBufferImageCopy2_host VkBufferImageCopy2KHR_host;
-#else
-typedef VkBufferImageCopy2 VkBufferImageCopy2_host;
-typedef VkBufferImageCopy2_host VkBufferImageCopy2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCopyBufferToImageInfo2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkBuffer srcBuffer;
-    VkImage dstImage;
-    VkImageLayout dstImageLayout;
-    uint32_t regionCount;
-    const VkBufferImageCopy2_host *pRegions;
-} VkCopyBufferToImageInfo2_host;
-typedef VkCopyBufferToImageInfo2_host VkCopyBufferToImageInfo2KHR_host;
-#else
-typedef VkCopyBufferToImageInfo2 VkCopyBufferToImageInfo2_host;
-typedef VkCopyBufferToImageInfo2_host VkCopyBufferToImageInfo2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCopyImageInfo2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImage srcImage;
-    VkImageLayout srcImageLayout;
-    VkImage dstImage;
-    VkImageLayout dstImageLayout;
-    uint32_t regionCount;
-    const VkImageCopy2 *pRegions;
-} VkCopyImageInfo2_host;
-typedef VkCopyImageInfo2_host VkCopyImageInfo2KHR_host;
-#else
-typedef VkCopyImageInfo2 VkCopyImageInfo2_host;
-typedef VkCopyImageInfo2_host VkCopyImageInfo2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCopyImageToBufferInfo2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImage srcImage;
-    VkImageLayout srcImageLayout;
-    VkBuffer dstBuffer;
-    uint32_t regionCount;
-    const VkBufferImageCopy2_host *pRegions;
-} VkCopyImageToBufferInfo2_host;
-typedef VkCopyImageToBufferInfo2_host VkCopyImageToBufferInfo2KHR_host;
-#else
-typedef VkCopyImageToBufferInfo2 VkCopyImageToBufferInfo2_host;
-typedef VkCopyImageToBufferInfo2_host VkCopyImageToBufferInfo2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCopyMemoryToAccelerationStructureInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDeviceOrHostAddressConstKHR src;
-    VkAccelerationStructureKHR dst;
-    VkCopyAccelerationStructureModeKHR mode;
-} VkCopyMemoryToAccelerationStructureInfoKHR_host;
-#else
-typedef VkCopyMemoryToAccelerationStructureInfoKHR VkCopyMemoryToAccelerationStructureInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCopyMemoryToMicromapInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDeviceOrHostAddressConstKHR src;
-    VkMicromapEXT dst;
-    VkCopyMicromapModeEXT mode;
-} VkCopyMemoryToMicromapInfoEXT_host;
-#else
-typedef VkCopyMemoryToMicromapInfoEXT VkCopyMemoryToMicromapInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCopyMicromapInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkMicromapEXT src;
-    VkMicromapEXT dst;
-    VkCopyMicromapModeEXT mode;
-} VkCopyMicromapInfoEXT_host;
-#else
-typedef VkCopyMicromapInfoEXT VkCopyMicromapInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCopyMicromapToMemoryInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkMicromapEXT src;
-    VkDeviceOrHostAddressKHR dst;
-    VkCopyMicromapModeEXT mode;
-} VkCopyMicromapToMemoryInfoEXT_host;
-#else
-typedef VkCopyMicromapToMemoryInfoEXT VkCopyMicromapToMemoryInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCuLaunchInfoNVX_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkCuFunctionNVX function;
-    uint32_t gridDimX;
-    uint32_t gridDimY;
-    uint32_t gridDimZ;
-    uint32_t blockDimX;
-    uint32_t blockDimY;
-    uint32_t blockDimZ;
-    uint32_t sharedMemBytes;
-    size_t paramCount;
-    const void * const *pParams;
-    size_t extraCount;
-    const void * const *pExtras;
-} VkCuLaunchInfoNVX_host;
-#else
-typedef VkCuLaunchInfoNVX VkCuLaunchInfoNVX_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDecompressMemoryRegionNV_host
-{
-    VkDeviceAddress srcAddress;
-    VkDeviceAddress dstAddress;
-    VkDeviceSize compressedSize;
-    VkDeviceSize decompressedSize;
-    VkMemoryDecompressionMethodFlagsNV decompressionMethod;
-} VkDecompressMemoryRegionNV_host;
-#else
-typedef VkDecompressMemoryRegionNV VkDecompressMemoryRegionNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkIndirectCommandsStreamNV_host
-{
-    VkBuffer buffer;
-    VkDeviceSize offset;
-} VkIndirectCommandsStreamNV_host;
-#else
-typedef VkIndirectCommandsStreamNV VkIndirectCommandsStreamNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkGeneratedCommandsInfoNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipelineBindPoint pipelineBindPoint;
-    VkPipeline pipeline;
-    VkIndirectCommandsLayoutNV indirectCommandsLayout;
-    uint32_t streamCount;
-    const VkIndirectCommandsStreamNV_host *pStreams;
-    uint32_t sequencesCount;
-    VkBuffer preprocessBuffer;
-    VkDeviceSize preprocessOffset;
-    VkDeviceSize preprocessSize;
-    VkBuffer sequencesCountBuffer;
-    VkDeviceSize sequencesCountOffset;
-    VkBuffer sequencesIndexBuffer;
-    VkDeviceSize sequencesIndexOffset;
-} VkGeneratedCommandsInfoNV_host;
-#else
-typedef VkGeneratedCommandsInfoNV VkGeneratedCommandsInfoNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBufferMemoryBarrier_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkAccessFlags srcAccessMask;
-    VkAccessFlags dstAccessMask;
-    uint32_t srcQueueFamilyIndex;
-    uint32_t dstQueueFamilyIndex;
-    VkBuffer buffer;
-    VkDeviceSize offset;
-    VkDeviceSize size;
-} VkBufferMemoryBarrier_host;
-#else
-typedef VkBufferMemoryBarrier VkBufferMemoryBarrier_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkImageMemoryBarrier_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkAccessFlags srcAccessMask;
-    VkAccessFlags dstAccessMask;
-    VkImageLayout oldLayout;
-    VkImageLayout newLayout;
-    uint32_t srcQueueFamilyIndex;
-    uint32_t dstQueueFamilyIndex;
-    VkImage image;
-    VkImageSubresourceRange subresourceRange;
-} VkImageMemoryBarrier_host;
-#else
-typedef VkImageMemoryBarrier VkImageMemoryBarrier_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBufferMemoryBarrier2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipelineStageFlags2 srcStageMask;
-    VkAccessFlags2 srcAccessMask;
-    VkPipelineStageFlags2 dstStageMask;
-    VkAccessFlags2 dstAccessMask;
-    uint32_t srcQueueFamilyIndex;
-    uint32_t dstQueueFamilyIndex;
-    VkBuffer buffer;
-    VkDeviceSize offset;
-    VkDeviceSize size;
-} VkBufferMemoryBarrier2_host;
-typedef VkBufferMemoryBarrier2_host VkBufferMemoryBarrier2KHR_host;
-#else
-typedef VkBufferMemoryBarrier2 VkBufferMemoryBarrier2_host;
-typedef VkBufferMemoryBarrier2_host VkBufferMemoryBarrier2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkImageMemoryBarrier2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipelineStageFlags2 srcStageMask;
-    VkAccessFlags2 srcAccessMask;
-    VkPipelineStageFlags2 dstStageMask;
-    VkAccessFlags2 dstAccessMask;
-    VkImageLayout oldLayout;
-    VkImageLayout newLayout;
-    uint32_t srcQueueFamilyIndex;
-    uint32_t dstQueueFamilyIndex;
-    VkImage image;
-    VkImageSubresourceRange subresourceRange;
-} VkImageMemoryBarrier2_host;
-typedef VkImageMemoryBarrier2_host VkImageMemoryBarrier2KHR_host;
-#else
-typedef VkImageMemoryBarrier2 VkImageMemoryBarrier2_host;
-typedef VkImageMemoryBarrier2_host VkImageMemoryBarrier2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDependencyInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDependencyFlags dependencyFlags;
-    uint32_t memoryBarrierCount;
-    const VkMemoryBarrier2 *pMemoryBarriers;
-    uint32_t bufferMemoryBarrierCount;
-    const VkBufferMemoryBarrier2_host *pBufferMemoryBarriers;
-    uint32_t imageMemoryBarrierCount;
-    const VkImageMemoryBarrier2_host *pImageMemoryBarriers;
-} VkDependencyInfo_host;
-typedef VkDependencyInfo_host VkDependencyInfoKHR_host;
-#else
-typedef VkDependencyInfo VkDependencyInfo_host;
-typedef VkDependencyInfo_host VkDependencyInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDescriptorImageInfo_host
-{
-    VkSampler sampler;
-    VkImageView imageView;
-    VkImageLayout imageLayout;
-} VkDescriptorImageInfo_host;
-#else
-typedef VkDescriptorImageInfo VkDescriptorImageInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDescriptorBufferInfo_host
-{
-    VkBuffer buffer;
-    VkDeviceSize offset;
-    VkDeviceSize range;
-} VkDescriptorBufferInfo_host;
-#else
-typedef VkDescriptorBufferInfo VkDescriptorBufferInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkWriteDescriptorSet_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDescriptorSet dstSet;
-    uint32_t dstBinding;
-    uint32_t dstArrayElement;
-    uint32_t descriptorCount;
-    VkDescriptorType descriptorType;
-    const VkDescriptorImageInfo_host *pImageInfo;
-    const VkDescriptorBufferInfo_host *pBufferInfo;
-    const VkBufferView *pTexelBufferView;
-} VkWriteDescriptorSet_host;
-#else
-typedef VkWriteDescriptorSet VkWriteDescriptorSet_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkResolveImageInfo2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImage srcImage;
-    VkImageLayout srcImageLayout;
-    VkImage dstImage;
-    VkImageLayout dstImageLayout;
-    uint32_t regionCount;
-    const VkImageResolve2 *pRegions;
-} VkResolveImageInfo2_host;
-typedef VkResolveImageInfo2_host VkResolveImageInfo2KHR_host;
-#else
-typedef VkResolveImageInfo2 VkResolveImageInfo2_host;
-typedef VkResolveImageInfo2_host VkResolveImageInfo2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPerformanceMarkerInfoINTEL_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    uint64_t marker;
-} VkPerformanceMarkerInfoINTEL_host;
-#else
-typedef VkPerformanceMarkerInfoINTEL VkPerformanceMarkerInfoINTEL_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPerformanceOverrideInfoINTEL_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPerformanceOverrideTypeINTEL type;
-    VkBool32 enable;
-    uint64_t parameter;
-} VkPerformanceOverrideInfoINTEL_host;
-#else
-typedef VkPerformanceOverrideInfoINTEL VkPerformanceOverrideInfoINTEL_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkStridedDeviceAddressRegionKHR_host
-{
-    VkDeviceAddress deviceAddress;
-    VkDeviceSize stride;
-    VkDeviceSize size;
-} VkStridedDeviceAddressRegionKHR_host;
-#else
-typedef VkStridedDeviceAddressRegionKHR VkStridedDeviceAddressRegionKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkAccelerationStructureCreateInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkAccelerationStructureCreateFlagsKHR createFlags;
-    VkBuffer buffer;
-    VkDeviceSize offset;
-    VkDeviceSize size;
-    VkAccelerationStructureTypeKHR type;
-    VkDeviceAddress deviceAddress;
-} VkAccelerationStructureCreateInfoKHR_host;
-#else
-typedef VkAccelerationStructureCreateInfoKHR VkAccelerationStructureCreateInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkAccelerationStructureCreateInfoNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDeviceSize compactedSize;
-    VkAccelerationStructureInfoNV_host info;
-} VkAccelerationStructureCreateInfoNV_host;
-#else
-typedef VkAccelerationStructureCreateInfoNV VkAccelerationStructureCreateInfoNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBufferOpaqueCaptureAddressCreateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    uint64_t opaqueCaptureAddress;
-} VkBufferOpaqueCaptureAddressCreateInfo_host;
-typedef VkBufferOpaqueCaptureAddressCreateInfo_host VkBufferOpaqueCaptureAddressCreateInfoKHR_host;
-#else
-typedef VkBufferOpaqueCaptureAddressCreateInfo VkBufferOpaqueCaptureAddressCreateInfo_host;
-typedef VkBufferOpaqueCaptureAddressCreateInfo_host VkBufferOpaqueCaptureAddressCreateInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBufferDeviceAddressCreateInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDeviceAddress deviceAddress;
-} VkBufferDeviceAddressCreateInfoEXT_host;
-#else
-typedef VkBufferDeviceAddressCreateInfoEXT VkBufferDeviceAddressCreateInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBufferCreateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkBufferCreateFlags flags;
-    VkDeviceSize size;
-    VkBufferUsageFlags usage;
-    VkSharingMode sharingMode;
-    uint32_t queueFamilyIndexCount;
-    const uint32_t *pQueueFamilyIndices;
-} VkBufferCreateInfo_host;
-#else
-typedef VkBufferCreateInfo VkBufferCreateInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBufferViewCreateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkBufferViewCreateFlags flags;
-    VkBuffer buffer;
-    VkFormat format;
-    VkDeviceSize offset;
-    VkDeviceSize range;
-} VkBufferViewCreateInfo_host;
-#else
-typedef VkBufferViewCreateInfo VkBufferViewCreateInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPipelineCreationFeedback_host
-{
-    VkPipelineCreationFeedbackFlags flags;
-    uint64_t duration;
-} VkPipelineCreationFeedback_host;
-typedef VkPipelineCreationFeedback_host VkPipelineCreationFeedbackEXT_host;
-#else
-typedef VkPipelineCreationFeedback VkPipelineCreationFeedback_host;
-typedef VkPipelineCreationFeedback_host VkPipelineCreationFeedbackEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkShaderModuleValidationCacheCreateInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkValidationCacheEXT validationCache;
-} VkShaderModuleValidationCacheCreateInfoEXT_host;
-#else
-typedef VkShaderModuleValidationCacheCreateInfoEXT VkShaderModuleValidationCacheCreateInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDebugUtilsObjectNameInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkObjectType objectType;
-    uint64_t objectHandle;
-    const char *pObjectName;
-} VkDebugUtilsObjectNameInfoEXT_host;
-#else
-typedef VkDebugUtilsObjectNameInfoEXT VkDebugUtilsObjectNameInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPipelineShaderStageCreateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipelineShaderStageCreateFlags flags;
-    VkShaderStageFlagBits stage;
-    VkShaderModule module;
-    const char *pName;
-    const VkSpecializationInfo *pSpecializationInfo;
-} VkPipelineShaderStageCreateInfo_host;
-#else
-typedef VkPipelineShaderStageCreateInfo VkPipelineShaderStageCreateInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPipelineCreationFeedbackCreateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipelineCreationFeedback_host *pPipelineCreationFeedback;
-    uint32_t pipelineStageCreationFeedbackCount;
-    VkPipelineCreationFeedback_host *pPipelineStageCreationFeedbacks;
-} VkPipelineCreationFeedbackCreateInfo_host;
-typedef VkPipelineCreationFeedbackCreateInfo_host VkPipelineCreationFeedbackCreateInfoEXT_host;
-#else
-typedef VkPipelineCreationFeedbackCreateInfo VkPipelineCreationFeedbackCreateInfo_host;
-typedef VkPipelineCreationFeedbackCreateInfo_host VkPipelineCreationFeedbackCreateInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSubpassShadingPipelineCreateInfoHUAWEI_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkRenderPass renderPass;
-    uint32_t subpass;
-} VkSubpassShadingPipelineCreateInfoHUAWEI_host;
-#else
-typedef VkSubpassShadingPipelineCreateInfoHUAWEI VkSubpassShadingPipelineCreateInfoHUAWEI_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkComputePipelineCreateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipelineCreateFlags flags;
-    VkPipelineShaderStageCreateInfo_host stage;
-    VkPipelineLayout layout;
-    VkPipeline basePipelineHandle;
-    int32_t basePipelineIndex;
-} VkComputePipelineCreateInfo_host;
-#else
-typedef VkComputePipelineCreateInfo VkComputePipelineCreateInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCuFunctionCreateInfoNVX_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkCuModuleNVX module;
-    const char *pName;
-} VkCuFunctionCreateInfoNVX_host;
-#else
-typedef VkCuFunctionCreateInfoNVX VkCuFunctionCreateInfoNVX_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDescriptorUpdateTemplateCreateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDescriptorUpdateTemplateCreateFlags flags;
-    uint32_t descriptorUpdateEntryCount;
-    const VkDescriptorUpdateTemplateEntry *pDescriptorUpdateEntries;
-    VkDescriptorUpdateTemplateType templateType;
-    VkDescriptorSetLayout descriptorSetLayout;
-    VkPipelineBindPoint pipelineBindPoint;
-    VkPipelineLayout pipelineLayout;
-    uint32_t set;
-} VkDescriptorUpdateTemplateCreateInfo_host;
-typedef VkDescriptorUpdateTemplateCreateInfo_host VkDescriptorUpdateTemplateCreateInfoKHR_host;
-#else
-typedef VkDescriptorUpdateTemplateCreateInfo VkDescriptorUpdateTemplateCreateInfo_host;
-typedef VkDescriptorUpdateTemplateCreateInfo_host VkDescriptorUpdateTemplateCreateInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkFramebufferCreateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkFramebufferCreateFlags flags;
-    VkRenderPass renderPass;
-    uint32_t attachmentCount;
-    const VkImageView *pAttachments;
-    uint32_t width;
-    uint32_t height;
-    uint32_t layers;
-} VkFramebufferCreateInfo_host;
-#else
-typedef VkFramebufferCreateInfo VkFramebufferCreateInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkGraphicsShaderGroupCreateInfoNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    uint32_t stageCount;
-    const VkPipelineShaderStageCreateInfo_host *pStages;
-    const VkPipelineVertexInputStateCreateInfo *pVertexInputState;
-    const VkPipelineTessellationStateCreateInfo *pTessellationState;
-} VkGraphicsShaderGroupCreateInfoNV_host;
-#else
-typedef VkGraphicsShaderGroupCreateInfoNV VkGraphicsShaderGroupCreateInfoNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkGraphicsPipelineShaderGroupsCreateInfoNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    uint32_t groupCount;
-    const VkGraphicsShaderGroupCreateInfoNV_host *pGroups;
-    uint32_t pipelineCount;
-    const VkPipeline *pPipelines;
-} VkGraphicsPipelineShaderGroupsCreateInfoNV_host;
-#else
-typedef VkGraphicsPipelineShaderGroupsCreateInfoNV VkGraphicsPipelineShaderGroupsCreateInfoNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkGraphicsPipelineCreateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipelineCreateFlags flags;
-    uint32_t stageCount;
-    const VkPipelineShaderStageCreateInfo_host *pStages;
-    const VkPipelineVertexInputStateCreateInfo *pVertexInputState;
-    const VkPipelineInputAssemblyStateCreateInfo *pInputAssemblyState;
-    const VkPipelineTessellationStateCreateInfo *pTessellationState;
-    const VkPipelineViewportStateCreateInfo *pViewportState;
-    const VkPipelineRasterizationStateCreateInfo *pRasterizationState;
-    const VkPipelineMultisampleStateCreateInfo *pMultisampleState;
-    const VkPipelineDepthStencilStateCreateInfo *pDepthStencilState;
-    const VkPipelineColorBlendStateCreateInfo *pColorBlendState;
-    const VkPipelineDynamicStateCreateInfo *pDynamicState;
-    VkPipelineLayout layout;
-    VkRenderPass renderPass;
-    uint32_t subpass;
-    VkPipeline basePipelineHandle;
-    int32_t basePipelineIndex;
-} VkGraphicsPipelineCreateInfo_host;
-#else
-typedef VkGraphicsPipelineCreateInfo VkGraphicsPipelineCreateInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkImageSwapchainCreateInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkSwapchainKHR swapchain;
-} VkImageSwapchainCreateInfoKHR_host;
-#else
-typedef VkImageSwapchainCreateInfoKHR VkImageSwapchainCreateInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSamplerYcbcrConversionInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkSamplerYcbcrConversion conversion;
-} VkSamplerYcbcrConversionInfo_host;
-typedef VkSamplerYcbcrConversionInfo_host VkSamplerYcbcrConversionInfoKHR_host;
-#else
-typedef VkSamplerYcbcrConversionInfo VkSamplerYcbcrConversionInfo_host;
-typedef VkSamplerYcbcrConversionInfo_host VkSamplerYcbcrConversionInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkImageViewCreateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImageViewCreateFlags flags;
-    VkImage image;
-    VkImageViewType viewType;
-    VkFormat format;
-    VkComponentMapping components;
-    VkImageSubresourceRange subresourceRange;
-} VkImageViewCreateInfo_host;
-#else
-typedef VkImageViewCreateInfo VkImageViewCreateInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkIndirectCommandsLayoutTokenNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkIndirectCommandsTokenTypeNV tokenType;
-    uint32_t stream;
-    uint32_t offset;
-    uint32_t vertexBindingUnit;
-    VkBool32 vertexDynamicStride;
-    VkPipelineLayout pushconstantPipelineLayout;
-    VkShaderStageFlags pushconstantShaderStageFlags;
-    uint32_t pushconstantOffset;
-    uint32_t pushconstantSize;
-    VkIndirectStateFlagsNV indirectStateFlags;
-    uint32_t indexTypeCount;
-    const VkIndexType *pIndexTypes;
-    const uint32_t *pIndexTypeValues;
-} VkIndirectCommandsLayoutTokenNV_host;
-#else
-typedef VkIndirectCommandsLayoutTokenNV VkIndirectCommandsLayoutTokenNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkIndirectCommandsLayoutCreateInfoNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkIndirectCommandsLayoutUsageFlagsNV flags;
-    VkPipelineBindPoint pipelineBindPoint;
-    uint32_t tokenCount;
-    const VkIndirectCommandsLayoutTokenNV_host *pTokens;
-    uint32_t streamCount;
-    const uint32_t *pStreamStrides;
-} VkIndirectCommandsLayoutCreateInfoNV_host;
-#else
-typedef VkIndirectCommandsLayoutCreateInfoNV VkIndirectCommandsLayoutCreateInfoNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkMicromapCreateInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkMicromapCreateFlagsEXT createFlags;
-    VkBuffer buffer;
-    VkDeviceSize offset;
-    VkDeviceSize size;
-    VkMicromapTypeEXT type;
-    VkDeviceAddress deviceAddress;
-} VkMicromapCreateInfoEXT_host;
-#else
-typedef VkMicromapCreateInfoEXT VkMicromapCreateInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkRayTracingPipelineCreateInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipelineCreateFlags flags;
-    uint32_t stageCount;
-    const VkPipelineShaderStageCreateInfo_host *pStages;
-    uint32_t groupCount;
-    const VkRayTracingShaderGroupCreateInfoKHR *pGroups;
-    uint32_t maxPipelineRayRecursionDepth;
-    const VkPipelineLibraryCreateInfoKHR *pLibraryInfo;
-    const VkRayTracingPipelineInterfaceCreateInfoKHR *pLibraryInterface;
-    const VkPipelineDynamicStateCreateInfo *pDynamicState;
-    VkPipelineLayout layout;
-    VkPipeline basePipelineHandle;
-    int32_t basePipelineIndex;
-} VkRayTracingPipelineCreateInfoKHR_host;
-#else
-typedef VkRayTracingPipelineCreateInfoKHR VkRayTracingPipelineCreateInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkRayTracingPipelineCreateInfoNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipelineCreateFlags flags;
-    uint32_t stageCount;
-    const VkPipelineShaderStageCreateInfo_host *pStages;
-    uint32_t groupCount;
-    const VkRayTracingShaderGroupCreateInfoNV *pGroups;
-    uint32_t maxRecursionDepth;
-    VkPipelineLayout layout;
-    VkPipeline basePipelineHandle;
-    int32_t basePipelineIndex;
-} VkRayTracingPipelineCreateInfoNV_host;
-#else
-typedef VkRayTracingPipelineCreateInfoNV VkRayTracingPipelineCreateInfoNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSemaphoreTypeCreateInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkSemaphoreType semaphoreType;
-    uint64_t initialValue;
-} VkSemaphoreTypeCreateInfo_host;
-typedef VkSemaphoreTypeCreateInfo_host VkSemaphoreTypeCreateInfoKHR_host;
-#else
-typedef VkSemaphoreTypeCreateInfo VkSemaphoreTypeCreateInfo_host;
-typedef VkSemaphoreTypeCreateInfo_host VkSemaphoreTypeCreateInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSwapchainCreateInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkSwapchainCreateFlagsKHR flags;
-    VkSurfaceKHR surface;
-    uint32_t minImageCount;
-    VkFormat imageFormat;
-    VkColorSpaceKHR imageColorSpace;
-    VkExtent2D imageExtent;
-    uint32_t imageArrayLayers;
-    VkImageUsageFlags imageUsage;
-    VkSharingMode imageSharingMode;
-    uint32_t queueFamilyIndexCount;
-    const uint32_t *pQueueFamilyIndices;
-    VkSurfaceTransformFlagBitsKHR preTransform;
-    VkCompositeAlphaFlagBitsKHR compositeAlpha;
-    VkPresentModeKHR presentMode;
-    VkBool32 clipped;
-    VkSwapchainKHR oldSwapchain;
-} VkSwapchainCreateInfoKHR_host;
-#else
-typedef VkSwapchainCreateInfoKHR VkSwapchainCreateInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDebugMarkerObjectNameInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDebugReportObjectTypeEXT objectType;
-    uint64_t object;
-    const char *pObjectName;
-} VkDebugMarkerObjectNameInfoEXT_host;
-#else
-typedef VkDebugMarkerObjectNameInfoEXT VkDebugMarkerObjectNameInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDebugMarkerObjectTagInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDebugReportObjectTypeEXT objectType;
-    uint64_t object;
-    uint64_t tagName;
-    size_t tagSize;
-    const void *pTag;
-} VkDebugMarkerObjectTagInfoEXT_host;
-#else
-typedef VkDebugMarkerObjectTagInfoEXT VkDebugMarkerObjectTagInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkMappedMemoryRange_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDeviceMemory memory;
-    VkDeviceSize offset;
-    VkDeviceSize size;
-} VkMappedMemoryRange_host;
-#else
-typedef VkMappedMemoryRange VkMappedMemoryRange_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkAccelerationStructureBuildSizesInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDeviceSize accelerationStructureSize;
-    VkDeviceSize updateScratchSize;
-    VkDeviceSize buildScratchSize;
-} VkAccelerationStructureBuildSizesInfoKHR_host;
-#else
-typedef VkAccelerationStructureBuildSizesInfoKHR VkAccelerationStructureBuildSizesInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkAccelerationStructureDeviceAddressInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkAccelerationStructureKHR accelerationStructure;
-} VkAccelerationStructureDeviceAddressInfoKHR_host;
-#else
-typedef VkAccelerationStructureDeviceAddressInfoKHR VkAccelerationStructureDeviceAddressInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkAccelerationStructureMemoryRequirementsInfoNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkAccelerationStructureMemoryRequirementsTypeNV type;
-    VkAccelerationStructureNV accelerationStructure;
-} VkAccelerationStructureMemoryRequirementsInfoNV_host;
-#else
-typedef VkAccelerationStructureMemoryRequirementsInfoNV VkAccelerationStructureMemoryRequirementsInfoNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkMemoryRequirements_host
-{
-    VkDeviceSize size;
-    VkDeviceSize alignment;
-    uint32_t memoryTypeBits;
-} VkMemoryRequirements_host;
-#else
-typedef VkMemoryRequirements VkMemoryRequirements_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBufferDeviceAddressInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkBuffer buffer;
-} VkBufferDeviceAddressInfo_host;
-typedef VkBufferDeviceAddressInfo_host VkBufferDeviceAddressInfoKHR_host;
-typedef VkBufferDeviceAddressInfo_host VkBufferDeviceAddressInfoEXT_host;
-#else
-typedef VkBufferDeviceAddressInfo VkBufferDeviceAddressInfo_host;
-typedef VkBufferDeviceAddressInfo_host VkBufferDeviceAddressInfoKHR_host;
-typedef VkBufferDeviceAddressInfo_host VkBufferDeviceAddressInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBufferMemoryRequirementsInfo2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkBuffer buffer;
-} VkBufferMemoryRequirementsInfo2_host;
-typedef VkBufferMemoryRequirementsInfo2_host VkBufferMemoryRequirementsInfo2KHR_host;
-#else
-typedef VkBufferMemoryRequirementsInfo2 VkBufferMemoryRequirementsInfo2_host;
-typedef VkBufferMemoryRequirementsInfo2_host VkBufferMemoryRequirementsInfo2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkMemoryRequirements2_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkMemoryRequirements_host memoryRequirements;
-} VkMemoryRequirements2_host;
-typedef VkMemoryRequirements2_host VkMemoryRequirements2KHR_host;
-#else
-typedef VkMemoryRequirements2 VkMemoryRequirements2_host;
-typedef VkMemoryRequirements2_host VkMemoryRequirements2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDescriptorSetBindingReferenceVALVE_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDescriptorSetLayout descriptorSetLayout;
-    uint32_t binding;
-} VkDescriptorSetBindingReferenceVALVE_host;
-#else
-typedef VkDescriptorSetBindingReferenceVALVE VkDescriptorSetBindingReferenceVALVE_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDeviceBufferMemoryRequirements_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    const VkBufferCreateInfo_host *pCreateInfo;
-} VkDeviceBufferMemoryRequirements_host;
-typedef VkDeviceBufferMemoryRequirements_host VkDeviceBufferMemoryRequirementsKHR_host;
-#else
-typedef VkDeviceBufferMemoryRequirements VkDeviceBufferMemoryRequirements_host;
-typedef VkDeviceBufferMemoryRequirements_host VkDeviceBufferMemoryRequirementsKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDeviceFaultCountsEXT_host
-{
-    VkStructureType sType;
-    void *pNext;
-    uint32_t addressInfoCount;
-    uint32_t vendorInfoCount;
-    VkDeviceSize vendorBinarySize;
-} VkDeviceFaultCountsEXT_host;
-#else
-typedef VkDeviceFaultCountsEXT VkDeviceFaultCountsEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDeviceFaultAddressInfoEXT_host
-{
-    VkDeviceFaultAddressTypeEXT addressType;
-    VkDeviceAddress reportedAddress;
-    VkDeviceSize addressPrecision;
-} VkDeviceFaultAddressInfoEXT_host;
-#else
-typedef VkDeviceFaultAddressInfoEXT VkDeviceFaultAddressInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDeviceFaultVendorInfoEXT_host
-{
-    char description[VK_MAX_DESCRIPTION_SIZE];
-    uint64_t vendorFaultCode;
-    uint64_t vendorFaultData;
-} VkDeviceFaultVendorInfoEXT_host;
-#else
-typedef VkDeviceFaultVendorInfoEXT VkDeviceFaultVendorInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDeviceFaultInfoEXT_host
-{
-    VkStructureType sType;
-    void *pNext;
-    char description[VK_MAX_DESCRIPTION_SIZE];
-    VkDeviceFaultAddressInfoEXT_host *pAddressInfos;
-    VkDeviceFaultVendorInfoEXT_host *pVendorInfos;
-    void *pVendorBinaryData;
-} VkDeviceFaultInfoEXT_host;
-#else
-typedef VkDeviceFaultInfoEXT VkDeviceFaultInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSparseImageMemoryRequirements_host
-{
-    VkSparseImageFormatProperties formatProperties;
-    uint32_t imageMipTailFirstLod;
-    VkDeviceSize imageMipTailSize;
-    VkDeviceSize imageMipTailOffset;
-    VkDeviceSize imageMipTailStride;
-} VkSparseImageMemoryRequirements_host;
-#else
-typedef VkSparseImageMemoryRequirements VkSparseImageMemoryRequirements_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSparseImageMemoryRequirements2_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkSparseImageMemoryRequirements_host memoryRequirements;
-} VkSparseImageMemoryRequirements2_host;
-typedef VkSparseImageMemoryRequirements2_host VkSparseImageMemoryRequirements2KHR_host;
-#else
-typedef VkSparseImageMemoryRequirements2 VkSparseImageMemoryRequirements2_host;
-typedef VkSparseImageMemoryRequirements2_host VkSparseImageMemoryRequirements2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDeviceMemoryOpaqueCaptureAddressInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDeviceMemory memory;
-} VkDeviceMemoryOpaqueCaptureAddressInfo_host;
-typedef VkDeviceMemoryOpaqueCaptureAddressInfo_host VkDeviceMemoryOpaqueCaptureAddressInfoKHR_host;
-#else
-typedef VkDeviceMemoryOpaqueCaptureAddressInfo VkDeviceMemoryOpaqueCaptureAddressInfo_host;
-typedef VkDeviceMemoryOpaqueCaptureAddressInfo_host VkDeviceMemoryOpaqueCaptureAddressInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkGeneratedCommandsMemoryRequirementsInfoNV_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipelineBindPoint pipelineBindPoint;
-    VkPipeline pipeline;
-    VkIndirectCommandsLayoutNV indirectCommandsLayout;
-    uint32_t maxSequencesCount;
-} VkGeneratedCommandsMemoryRequirementsInfoNV_host;
-#else
-typedef VkGeneratedCommandsMemoryRequirementsInfoNV VkGeneratedCommandsMemoryRequirementsInfoNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkImageMemoryRequirementsInfo2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImage image;
-} VkImageMemoryRequirementsInfo2_host;
-typedef VkImageMemoryRequirementsInfo2_host VkImageMemoryRequirementsInfo2KHR_host;
-#else
-typedef VkImageMemoryRequirementsInfo2 VkImageMemoryRequirementsInfo2_host;
-typedef VkImageMemoryRequirementsInfo2_host VkImageMemoryRequirementsInfo2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkImageSparseMemoryRequirementsInfo2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImage image;
-} VkImageSparseMemoryRequirementsInfo2_host;
-typedef VkImageSparseMemoryRequirementsInfo2_host VkImageSparseMemoryRequirementsInfo2KHR_host;
-#else
-typedef VkImageSparseMemoryRequirementsInfo2 VkImageSparseMemoryRequirementsInfo2_host;
-typedef VkImageSparseMemoryRequirementsInfo2_host VkImageSparseMemoryRequirementsInfo2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSubresourceLayout_host
-{
-    VkDeviceSize offset;
-    VkDeviceSize size;
-    VkDeviceSize rowPitch;
-    VkDeviceSize arrayPitch;
-    VkDeviceSize depthPitch;
-} VkSubresourceLayout_host;
-#else
-typedef VkSubresourceLayout VkSubresourceLayout_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSubresourceLayout2EXT_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkSubresourceLayout_host subresourceLayout;
-} VkSubresourceLayout2EXT_host;
-#else
-typedef VkSubresourceLayout2EXT VkSubresourceLayout2EXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkImageViewAddressPropertiesNVX_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkDeviceAddress deviceAddress;
-    VkDeviceSize size;
-} VkImageViewAddressPropertiesNVX_host;
-#else
-typedef VkImageViewAddressPropertiesNVX VkImageViewAddressPropertiesNVX_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkImageViewHandleInfoNVX_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkImageView imageView;
-    VkDescriptorType descriptorType;
-    VkSampler sampler;
-} VkImageViewHandleInfoNVX_host;
-#else
-typedef VkImageViewHandleInfoNVX VkImageViewHandleInfoNVX_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkMicromapBuildSizesInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDeviceSize micromapSize;
-    VkDeviceSize buildScratchSize;
-    VkBool32 discardable;
-} VkMicromapBuildSizesInfoEXT_host;
-#else
-typedef VkMicromapBuildSizesInfoEXT VkMicromapBuildSizesInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPerformanceValueINTEL_host
-{
-    VkPerformanceValueTypeINTEL type;
-    VkPerformanceValueDataINTEL data;
-} VkPerformanceValueINTEL_host;
-#else
-typedef VkPerformanceValueINTEL VkPerformanceValueINTEL_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkImageFormatProperties_host
-{
-    VkExtent3D maxExtent;
-    uint32_t maxMipLevels;
-    uint32_t maxArrayLayers;
-    VkSampleCountFlags sampleCounts;
-    VkDeviceSize maxResourceSize;
-} VkImageFormatProperties_host;
-#else
-typedef VkImageFormatProperties VkImageFormatProperties_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkImageFormatProperties2_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkImageFormatProperties_host imageFormatProperties;
-} VkImageFormatProperties2_host;
-typedef VkImageFormatProperties2_host VkImageFormatProperties2KHR_host;
-#else
-typedef VkImageFormatProperties2 VkImageFormatProperties2_host;
-typedef VkImageFormatProperties2_host VkImageFormatProperties2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkMemoryHeap_host
-{
-    VkDeviceSize size;
-    VkMemoryHeapFlags flags;
-} VkMemoryHeap_host;
-#else
-typedef VkMemoryHeap VkMemoryHeap_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceMemoryProperties_host
-{
-    uint32_t memoryTypeCount;
-    VkMemoryType memoryTypes[VK_MAX_MEMORY_TYPES];
-    uint32_t memoryHeapCount;
-    VkMemoryHeap_host memoryHeaps[VK_MAX_MEMORY_HEAPS];
-} VkPhysicalDeviceMemoryProperties_host;
-#else
-typedef VkPhysicalDeviceMemoryProperties VkPhysicalDeviceMemoryProperties_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceMemoryBudgetPropertiesEXT_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkDeviceSize heapBudget[VK_MAX_MEMORY_HEAPS];
-    VkDeviceSize heapUsage[VK_MAX_MEMORY_HEAPS];
-} VkPhysicalDeviceMemoryBudgetPropertiesEXT_host;
-#else
-typedef VkPhysicalDeviceMemoryBudgetPropertiesEXT VkPhysicalDeviceMemoryBudgetPropertiesEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceMemoryProperties2_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkPhysicalDeviceMemoryProperties_host memoryProperties;
-} VkPhysicalDeviceMemoryProperties2_host;
-typedef VkPhysicalDeviceMemoryProperties2_host VkPhysicalDeviceMemoryProperties2KHR_host;
-#else
-typedef VkPhysicalDeviceMemoryProperties2 VkPhysicalDeviceMemoryProperties2_host;
-typedef VkPhysicalDeviceMemoryProperties2_host VkPhysicalDeviceMemoryProperties2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceLimits_host
-{
-    uint32_t maxImageDimension1D;
-    uint32_t maxImageDimension2D;
-    uint32_t maxImageDimension3D;
-    uint32_t maxImageDimensionCube;
-    uint32_t maxImageArrayLayers;
-    uint32_t maxTexelBufferElements;
-    uint32_t maxUniformBufferRange;
-    uint32_t maxStorageBufferRange;
-    uint32_t maxPushConstantsSize;
-    uint32_t maxMemoryAllocationCount;
-    uint32_t maxSamplerAllocationCount;
-    VkDeviceSize bufferImageGranularity;
-    VkDeviceSize sparseAddressSpaceSize;
-    uint32_t maxBoundDescriptorSets;
-    uint32_t maxPerStageDescriptorSamplers;
-    uint32_t maxPerStageDescriptorUniformBuffers;
-    uint32_t maxPerStageDescriptorStorageBuffers;
-    uint32_t maxPerStageDescriptorSampledImages;
-    uint32_t maxPerStageDescriptorStorageImages;
-    uint32_t maxPerStageDescriptorInputAttachments;
-    uint32_t maxPerStageResources;
-    uint32_t maxDescriptorSetSamplers;
-    uint32_t maxDescriptorSetUniformBuffers;
-    uint32_t maxDescriptorSetUniformBuffersDynamic;
-    uint32_t maxDescriptorSetStorageBuffers;
-    uint32_t maxDescriptorSetStorageBuffersDynamic;
-    uint32_t maxDescriptorSetSampledImages;
-    uint32_t maxDescriptorSetStorageImages;
-    uint32_t maxDescriptorSetInputAttachments;
-    uint32_t maxVertexInputAttributes;
-    uint32_t maxVertexInputBindings;
-    uint32_t maxVertexInputAttributeOffset;
-    uint32_t maxVertexInputBindingStride;
-    uint32_t maxVertexOutputComponents;
-    uint32_t maxTessellationGenerationLevel;
-    uint32_t maxTessellationPatchSize;
-    uint32_t maxTessellationControlPerVertexInputComponents;
-    uint32_t maxTessellationControlPerVertexOutputComponents;
-    uint32_t maxTessellationControlPerPatchOutputComponents;
-    uint32_t maxTessellationControlTotalOutputComponents;
-    uint32_t maxTessellationEvaluationInputComponents;
-    uint32_t maxTessellationEvaluationOutputComponents;
-    uint32_t maxGeometryShaderInvocations;
-    uint32_t maxGeometryInputComponents;
-    uint32_t maxGeometryOutputComponents;
-    uint32_t maxGeometryOutputVertices;
-    uint32_t maxGeometryTotalOutputComponents;
-    uint32_t maxFragmentInputComponents;
-    uint32_t maxFragmentOutputAttachments;
-    uint32_t maxFragmentDualSrcAttachments;
-    uint32_t maxFragmentCombinedOutputResources;
-    uint32_t maxComputeSharedMemorySize;
-    uint32_t maxComputeWorkGroupCount[3];
-    uint32_t maxComputeWorkGroupInvocations;
-    uint32_t maxComputeWorkGroupSize[3];
-    uint32_t subPixelPrecisionBits;
-    uint32_t subTexelPrecisionBits;
-    uint32_t mipmapPrecisionBits;
-    uint32_t maxDrawIndexedIndexValue;
-    uint32_t maxDrawIndirectCount;
-    float maxSamplerLodBias;
-    float maxSamplerAnisotropy;
-    uint32_t maxViewports;
-    uint32_t maxViewportDimensions[2];
-    float viewportBoundsRange[2];
-    uint32_t viewportSubPixelBits;
-    size_t minMemoryMapAlignment;
-    VkDeviceSize minTexelBufferOffsetAlignment;
-    VkDeviceSize minUniformBufferOffsetAlignment;
-    VkDeviceSize minStorageBufferOffsetAlignment;
-    int32_t minTexelOffset;
-    uint32_t maxTexelOffset;
-    int32_t minTexelGatherOffset;
-    uint32_t maxTexelGatherOffset;
-    float minInterpolationOffset;
-    float maxInterpolationOffset;
-    uint32_t subPixelInterpolationOffsetBits;
-    uint32_t maxFramebufferWidth;
-    uint32_t maxFramebufferHeight;
-    uint32_t maxFramebufferLayers;
-    VkSampleCountFlags framebufferColorSampleCounts;
-    VkSampleCountFlags framebufferDepthSampleCounts;
-    VkSampleCountFlags framebufferStencilSampleCounts;
-    VkSampleCountFlags framebufferNoAttachmentsSampleCounts;
-    uint32_t maxColorAttachments;
-    VkSampleCountFlags sampledImageColorSampleCounts;
-    VkSampleCountFlags sampledImageIntegerSampleCounts;
-    VkSampleCountFlags sampledImageDepthSampleCounts;
-    VkSampleCountFlags sampledImageStencilSampleCounts;
-    VkSampleCountFlags storageImageSampleCounts;
-    uint32_t maxSampleMaskWords;
-    VkBool32 timestampComputeAndGraphics;
-    float timestampPeriod;
-    uint32_t maxClipDistances;
-    uint32_t maxCullDistances;
-    uint32_t maxCombinedClipAndCullDistances;
-    uint32_t discreteQueuePriorities;
-    float pointSizeRange[2];
-    float lineWidthRange[2];
-    float pointSizeGranularity;
-    float lineWidthGranularity;
-    VkBool32 strictLines;
-    VkBool32 standardSampleLocations;
-    VkDeviceSize optimalBufferCopyOffsetAlignment;
-    VkDeviceSize optimalBufferCopyRowPitchAlignment;
-    VkDeviceSize nonCoherentAtomSize;
-} VkPhysicalDeviceLimits_host;
-#else
-typedef VkPhysicalDeviceLimits VkPhysicalDeviceLimits_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceProperties_host
-{
-    uint32_t apiVersion;
-    uint32_t driverVersion;
-    uint32_t vendorID;
-    uint32_t deviceID;
-    VkPhysicalDeviceType deviceType;
-    char deviceName[VK_MAX_PHYSICAL_DEVICE_NAME_SIZE];
-    uint8_t pipelineCacheUUID[VK_UUID_SIZE];
-    VkPhysicalDeviceLimits_host limits;
-    VkPhysicalDeviceSparseProperties sparseProperties;
-} VkPhysicalDeviceProperties_host;
-#else
-typedef VkPhysicalDeviceProperties VkPhysicalDeviceProperties_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceMaintenance3Properties_host
-{
-    VkStructureType sType;
-    void *pNext;
-    uint32_t maxPerSetDescriptors;
-    VkDeviceSize maxMemoryAllocationSize;
-} VkPhysicalDeviceMaintenance3Properties_host;
-typedef VkPhysicalDeviceMaintenance3Properties_host VkPhysicalDeviceMaintenance3PropertiesKHR_host;
-#else
-typedef VkPhysicalDeviceMaintenance3Properties VkPhysicalDeviceMaintenance3Properties_host;
-typedef VkPhysicalDeviceMaintenance3Properties_host VkPhysicalDeviceMaintenance3PropertiesKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceMaintenance4Properties_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkDeviceSize maxBufferSize;
-} VkPhysicalDeviceMaintenance4Properties_host;
-typedef VkPhysicalDeviceMaintenance4Properties_host VkPhysicalDeviceMaintenance4PropertiesKHR_host;
-#else
-typedef VkPhysicalDeviceMaintenance4Properties VkPhysicalDeviceMaintenance4Properties_host;
-typedef VkPhysicalDeviceMaintenance4Properties_host VkPhysicalDeviceMaintenance4PropertiesKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceExternalMemoryHostPropertiesEXT_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkDeviceSize minImportedHostPointerAlignment;
-} VkPhysicalDeviceExternalMemoryHostPropertiesEXT_host;
-#else
-typedef VkPhysicalDeviceExternalMemoryHostPropertiesEXT VkPhysicalDeviceExternalMemoryHostPropertiesEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceTimelineSemaphoreProperties_host
-{
-    VkStructureType sType;
-    void *pNext;
-    uint64_t maxTimelineSemaphoreValueDifference;
-} VkPhysicalDeviceTimelineSemaphoreProperties_host;
-typedef VkPhysicalDeviceTimelineSemaphoreProperties_host VkPhysicalDeviceTimelineSemaphorePropertiesKHR_host;
-#else
-typedef VkPhysicalDeviceTimelineSemaphoreProperties VkPhysicalDeviceTimelineSemaphoreProperties_host;
-typedef VkPhysicalDeviceTimelineSemaphoreProperties_host VkPhysicalDeviceTimelineSemaphorePropertiesKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceTransformFeedbackPropertiesEXT_host
-{
-    VkStructureType sType;
-    void *pNext;
-    uint32_t maxTransformFeedbackStreams;
-    uint32_t maxTransformFeedbackBuffers;
-    VkDeviceSize maxTransformFeedbackBufferSize;
-    uint32_t maxTransformFeedbackStreamDataSize;
-    uint32_t maxTransformFeedbackBufferDataSize;
-    uint32_t maxTransformFeedbackBufferDataStride;
-    VkBool32 transformFeedbackQueries;
-    VkBool32 transformFeedbackStreamsLinesTriangles;
-    VkBool32 transformFeedbackRasterizationStreamSelect;
-    VkBool32 transformFeedbackDraw;
-} VkPhysicalDeviceTransformFeedbackPropertiesEXT_host;
-#else
-typedef VkPhysicalDeviceTransformFeedbackPropertiesEXT VkPhysicalDeviceTransformFeedbackPropertiesEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceMemoryDecompressionPropertiesNV_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkMemoryDecompressionMethodFlagsNV decompressionMethods;
-    uint64_t maxDecompressionIndirectCount;
-} VkPhysicalDeviceMemoryDecompressionPropertiesNV_host;
-#else
-typedef VkPhysicalDeviceMemoryDecompressionPropertiesNV VkPhysicalDeviceMemoryDecompressionPropertiesNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceAccelerationStructurePropertiesKHR_host
-{
-    VkStructureType sType;
-    void *pNext;
-    uint64_t maxGeometryCount;
-    uint64_t maxInstanceCount;
-    uint64_t maxPrimitiveCount;
-    uint32_t maxPerStageDescriptorAccelerationStructures;
-    uint32_t maxPerStageDescriptorUpdateAfterBindAccelerationStructures;
-    uint32_t maxDescriptorSetAccelerationStructures;
-    uint32_t maxDescriptorSetUpdateAfterBindAccelerationStructures;
-    uint32_t minAccelerationStructureScratchOffsetAlignment;
-} VkPhysicalDeviceAccelerationStructurePropertiesKHR_host;
-#else
-typedef VkPhysicalDeviceAccelerationStructurePropertiesKHR VkPhysicalDeviceAccelerationStructurePropertiesKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceRayTracingPropertiesNV_host
-{
-    VkStructureType sType;
-    void *pNext;
-    uint32_t shaderGroupHandleSize;
-    uint32_t maxRecursionDepth;
-    uint32_t maxShaderGroupStride;
-    uint32_t shaderGroupBaseAlignment;
-    uint64_t maxGeometryCount;
-    uint64_t maxInstanceCount;
-    uint64_t maxTriangleCount;
-    uint32_t maxDescriptorSetAccelerationStructures;
-} VkPhysicalDeviceRayTracingPropertiesNV_host;
-#else
-typedef VkPhysicalDeviceRayTracingPropertiesNV VkPhysicalDeviceRayTracingPropertiesNV_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceTexelBufferAlignmentProperties_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkDeviceSize storageTexelBufferOffsetAlignmentBytes;
-    VkBool32 storageTexelBufferOffsetSingleTexelAlignment;
-    VkDeviceSize uniformTexelBufferOffsetAlignmentBytes;
-    VkBool32 uniformTexelBufferOffsetSingleTexelAlignment;
-} VkPhysicalDeviceTexelBufferAlignmentProperties_host;
-typedef VkPhysicalDeviceTexelBufferAlignmentProperties_host VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT_host;
-#else
-typedef VkPhysicalDeviceTexelBufferAlignmentProperties VkPhysicalDeviceTexelBufferAlignmentProperties_host;
-typedef VkPhysicalDeviceTexelBufferAlignmentProperties_host VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceVulkan11Properties_host
-{
-    VkStructureType sType;
-    void *pNext;
-    uint8_t deviceUUID[VK_UUID_SIZE];
-    uint8_t driverUUID[VK_UUID_SIZE];
-    uint8_t deviceLUID[VK_LUID_SIZE];
-    uint32_t deviceNodeMask;
-    VkBool32 deviceLUIDValid;
-    uint32_t subgroupSize;
-    VkShaderStageFlags subgroupSupportedStages;
-    VkSubgroupFeatureFlags subgroupSupportedOperations;
-    VkBool32 subgroupQuadOperationsInAllStages;
-    VkPointClippingBehavior pointClippingBehavior;
-    uint32_t maxMultiviewViewCount;
-    uint32_t maxMultiviewInstanceIndex;
-    VkBool32 protectedNoFault;
-    uint32_t maxPerSetDescriptors;
-    VkDeviceSize maxMemoryAllocationSize;
-} VkPhysicalDeviceVulkan11Properties_host;
-#else
-typedef VkPhysicalDeviceVulkan11Properties VkPhysicalDeviceVulkan11Properties_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceVulkan12Properties_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkDriverId driverID;
-    char driverName[VK_MAX_DRIVER_NAME_SIZE];
-    char driverInfo[VK_MAX_DRIVER_INFO_SIZE];
-    VkConformanceVersion conformanceVersion;
-    VkShaderFloatControlsIndependence denormBehaviorIndependence;
-    VkShaderFloatControlsIndependence roundingModeIndependence;
-    VkBool32 shaderSignedZeroInfNanPreserveFloat16;
-    VkBool32 shaderSignedZeroInfNanPreserveFloat32;
-    VkBool32 shaderSignedZeroInfNanPreserveFloat64;
-    VkBool32 shaderDenormPreserveFloat16;
-    VkBool32 shaderDenormPreserveFloat32;
-    VkBool32 shaderDenormPreserveFloat64;
-    VkBool32 shaderDenormFlushToZeroFloat16;
-    VkBool32 shaderDenormFlushToZeroFloat32;
-    VkBool32 shaderDenormFlushToZeroFloat64;
-    VkBool32 shaderRoundingModeRTEFloat16;
-    VkBool32 shaderRoundingModeRTEFloat32;
-    VkBool32 shaderRoundingModeRTEFloat64;
-    VkBool32 shaderRoundingModeRTZFloat16;
-    VkBool32 shaderRoundingModeRTZFloat32;
-    VkBool32 shaderRoundingModeRTZFloat64;
-    uint32_t maxUpdateAfterBindDescriptorsInAllPools;
-    VkBool32 shaderUniformBufferArrayNonUniformIndexingNative;
-    VkBool32 shaderSampledImageArrayNonUniformIndexingNative;
-    VkBool32 shaderStorageBufferArrayNonUniformIndexingNative;
-    VkBool32 shaderStorageImageArrayNonUniformIndexingNative;
-    VkBool32 shaderInputAttachmentArrayNonUniformIndexingNative;
-    VkBool32 robustBufferAccessUpdateAfterBind;
-    VkBool32 quadDivergentImplicitLod;
-    uint32_t maxPerStageDescriptorUpdateAfterBindSamplers;
-    uint32_t maxPerStageDescriptorUpdateAfterBindUniformBuffers;
-    uint32_t maxPerStageDescriptorUpdateAfterBindStorageBuffers;
-    uint32_t maxPerStageDescriptorUpdateAfterBindSampledImages;
-    uint32_t maxPerStageDescriptorUpdateAfterBindStorageImages;
-    uint32_t maxPerStageDescriptorUpdateAfterBindInputAttachments;
-    uint32_t maxPerStageUpdateAfterBindResources;
-    uint32_t maxDescriptorSetUpdateAfterBindSamplers;
-    uint32_t maxDescriptorSetUpdateAfterBindUniformBuffers;
-    uint32_t maxDescriptorSetUpdateAfterBindUniformBuffersDynamic;
-    uint32_t maxDescriptorSetUpdateAfterBindStorageBuffers;
-    uint32_t maxDescriptorSetUpdateAfterBindStorageBuffersDynamic;
-    uint32_t maxDescriptorSetUpdateAfterBindSampledImages;
-    uint32_t maxDescriptorSetUpdateAfterBindStorageImages;
-    uint32_t maxDescriptorSetUpdateAfterBindInputAttachments;
-    VkResolveModeFlags supportedDepthResolveModes;
-    VkResolveModeFlags supportedStencilResolveModes;
-    VkBool32 independentResolveNone;
-    VkBool32 independentResolve;
-    VkBool32 filterMinmaxSingleComponentFormats;
-    VkBool32 filterMinmaxImageComponentMapping;
-    uint64_t maxTimelineSemaphoreValueDifference;
-    VkSampleCountFlags framebufferIntegerColorSampleCounts;
-} VkPhysicalDeviceVulkan12Properties_host;
-#else
-typedef VkPhysicalDeviceVulkan12Properties VkPhysicalDeviceVulkan12Properties_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceVulkan13Properties_host
-{
-    VkStructureType sType;
-    void *pNext;
-    uint32_t minSubgroupSize;
-    uint32_t maxSubgroupSize;
-    uint32_t maxComputeWorkgroupSubgroups;
-    VkShaderStageFlags requiredSubgroupSizeStages;
-    uint32_t maxInlineUniformBlockSize;
-    uint32_t maxPerStageDescriptorInlineUniformBlocks;
-    uint32_t maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks;
-    uint32_t maxDescriptorSetInlineUniformBlocks;
-    uint32_t maxDescriptorSetUpdateAfterBindInlineUniformBlocks;
-    uint32_t maxInlineUniformTotalSize;
-    VkBool32 integerDotProduct8BitUnsignedAccelerated;
-    VkBool32 integerDotProduct8BitSignedAccelerated;
-    VkBool32 integerDotProduct8BitMixedSignednessAccelerated;
-    VkBool32 integerDotProduct4x8BitPackedUnsignedAccelerated;
-    VkBool32 integerDotProduct4x8BitPackedSignedAccelerated;
-    VkBool32 integerDotProduct4x8BitPackedMixedSignednessAccelerated;
-    VkBool32 integerDotProduct16BitUnsignedAccelerated;
-    VkBool32 integerDotProduct16BitSignedAccelerated;
-    VkBool32 integerDotProduct16BitMixedSignednessAccelerated;
-    VkBool32 integerDotProduct32BitUnsignedAccelerated;
-    VkBool32 integerDotProduct32BitSignedAccelerated;
-    VkBool32 integerDotProduct32BitMixedSignednessAccelerated;
-    VkBool32 integerDotProduct64BitUnsignedAccelerated;
-    VkBool32 integerDotProduct64BitSignedAccelerated;
-    VkBool32 integerDotProduct64BitMixedSignednessAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating8BitUnsignedAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating8BitSignedAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating16BitUnsignedAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating16BitSignedAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating32BitUnsignedAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating32BitSignedAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating64BitUnsignedAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating64BitSignedAccelerated;
-    VkBool32 integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated;
-    VkDeviceSize storageTexelBufferOffsetAlignmentBytes;
-    VkBool32 storageTexelBufferOffsetSingleTexelAlignment;
-    VkDeviceSize uniformTexelBufferOffsetAlignmentBytes;
-    VkBool32 uniformTexelBufferOffsetSingleTexelAlignment;
-    VkDeviceSize maxBufferSize;
-} VkPhysicalDeviceVulkan13Properties_host;
-#else
-typedef VkPhysicalDeviceVulkan13Properties VkPhysicalDeviceVulkan13Properties_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceRobustness2PropertiesEXT_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkDeviceSize robustStorageBufferAccessSizeAlignment;
-    VkDeviceSize robustUniformBufferAccessSizeAlignment;
-} VkPhysicalDeviceRobustness2PropertiesEXT_host;
-#else
-typedef VkPhysicalDeviceRobustness2PropertiesEXT VkPhysicalDeviceRobustness2PropertiesEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM_host
-{
-    VkStructureType sType;
-    void *pNext;
-    uint64_t shaderCoreMask;
-    uint32_t shaderCoreCount;
-    uint32_t shaderWarpsPerCore;
-} VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM_host;
-#else
-typedef VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceProperties2_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkPhysicalDeviceProperties_host properties;
-} VkPhysicalDeviceProperties2_host;
-typedef VkPhysicalDeviceProperties2_host VkPhysicalDeviceProperties2KHR_host;
-#else
-typedef VkPhysicalDeviceProperties2 VkPhysicalDeviceProperties2_host;
-typedef VkPhysicalDeviceProperties2_host VkPhysicalDeviceProperties2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPhysicalDeviceSurfaceInfo2KHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkSurfaceKHR surface;
-} VkPhysicalDeviceSurfaceInfo2KHR_host;
-#else
-typedef VkPhysicalDeviceSurfaceInfo2KHR VkPhysicalDeviceSurfaceInfo2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPipelineExecutableInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipeline pipeline;
-    uint32_t executableIndex;
-} VkPipelineExecutableInfoKHR_host;
-#else
-typedef VkPipelineExecutableInfoKHR VkPipelineExecutableInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPipelineInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkPipeline pipeline;
-} VkPipelineInfoKHR_host;
-typedef VkPipelineInfoKHR_host VkPipelineInfoEXT_host;
-#else
-typedef VkPipelineInfoKHR VkPipelineInfoKHR_host;
-typedef VkPipelineInfoKHR_host VkPipelineInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkPipelineExecutableStatisticKHR_host
-{
-    VkStructureType sType;
-    void *pNext;
-    char name[VK_MAX_DESCRIPTION_SIZE];
-    char description[VK_MAX_DESCRIPTION_SIZE];
-    VkPipelineExecutableStatisticFormatKHR format;
-    VkPipelineExecutableStatisticValueKHR value;
-} VkPipelineExecutableStatisticKHR_host;
-#else
-typedef VkPipelineExecutableStatisticKHR VkPipelineExecutableStatisticKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSparseMemoryBind_host
-{
-    VkDeviceSize resourceOffset;
-    VkDeviceSize size;
-    VkDeviceMemory memory;
-    VkDeviceSize memoryOffset;
-    VkSparseMemoryBindFlags flags;
-} VkSparseMemoryBind_host;
-#else
-typedef VkSparseMemoryBind VkSparseMemoryBind_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSparseBufferMemoryBindInfo_host
-{
-    VkBuffer buffer;
-    uint32_t bindCount;
-    const VkSparseMemoryBind_host *pBinds;
-} VkSparseBufferMemoryBindInfo_host;
-#else
-typedef VkSparseBufferMemoryBindInfo VkSparseBufferMemoryBindInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSparseImageOpaqueMemoryBindInfo_host
-{
-    VkImage image;
-    uint32_t bindCount;
-    const VkSparseMemoryBind_host *pBinds;
-} VkSparseImageOpaqueMemoryBindInfo_host;
-#else
-typedef VkSparseImageOpaqueMemoryBindInfo VkSparseImageOpaqueMemoryBindInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSparseImageMemoryBind_host
-{
-    VkImageSubresource subresource;
-    VkOffset3D offset;
-    VkExtent3D extent;
-    VkDeviceMemory memory;
-    VkDeviceSize memoryOffset;
-    VkSparseMemoryBindFlags flags;
-} VkSparseImageMemoryBind_host;
-#else
-typedef VkSparseImageMemoryBind VkSparseImageMemoryBind_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSparseImageMemoryBindInfo_host
-{
-    VkImage image;
-    uint32_t bindCount;
-    const VkSparseImageMemoryBind_host *pBinds;
-} VkSparseImageMemoryBindInfo_host;
-#else
-typedef VkSparseImageMemoryBindInfo VkSparseImageMemoryBindInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkBindSparseInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    uint32_t waitSemaphoreCount;
-    const VkSemaphore *pWaitSemaphores;
-    uint32_t bufferBindCount;
-    const VkSparseBufferMemoryBindInfo_host *pBufferBinds;
-    uint32_t imageOpaqueBindCount;
-    const VkSparseImageOpaqueMemoryBindInfo_host *pImageOpaqueBinds;
-    uint32_t imageBindCount;
-    const VkSparseImageMemoryBindInfo_host *pImageBinds;
-    uint32_t signalSemaphoreCount;
-    const VkSemaphore *pSignalSemaphores;
-} VkBindSparseInfo_host;
-#else
-typedef VkBindSparseInfo VkBindSparseInfo_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSemaphoreSubmitInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkSemaphore semaphore;
-    uint64_t value;
-    VkPipelineStageFlags2 stageMask;
-    uint32_t deviceIndex;
-} VkSemaphoreSubmitInfo_host;
-typedef VkSemaphoreSubmitInfo_host VkSemaphoreSubmitInfoKHR_host;
-#else
-typedef VkSemaphoreSubmitInfo VkSemaphoreSubmitInfo_host;
-typedef VkSemaphoreSubmitInfo_host VkSemaphoreSubmitInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSubmitInfo2_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkSubmitFlags flags;
-    uint32_t waitSemaphoreInfoCount;
-    const VkSemaphoreSubmitInfo_host *pWaitSemaphoreInfos;
-    uint32_t commandBufferInfoCount;
-    const VkCommandBufferSubmitInfo *pCommandBufferInfos;
-    uint32_t signalSemaphoreInfoCount;
-    const VkSemaphoreSubmitInfo_host *pSignalSemaphoreInfos;
-} VkSubmitInfo2_host;
-typedef VkSubmitInfo2_host VkSubmitInfo2KHR_host;
-#else
-typedef VkSubmitInfo2 VkSubmitInfo2_host;
-typedef VkSubmitInfo2_host VkSubmitInfo2KHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDebugUtilsObjectTagInfoEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkObjectType objectType;
-    uint64_t objectHandle;
-    uint64_t tagName;
-    size_t tagSize;
-    const void *pTag;
-} VkDebugUtilsObjectTagInfoEXT_host;
-#else
-typedef VkDebugUtilsObjectTagInfoEXT VkDebugUtilsObjectTagInfoEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkSemaphoreSignalInfo_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkSemaphore semaphore;
-    uint64_t value;
-} VkSemaphoreSignalInfo_host;
-typedef VkSemaphoreSignalInfo_host VkSemaphoreSignalInfoKHR_host;
-#else
-typedef VkSemaphoreSignalInfo VkSemaphoreSignalInfo_host;
-typedef VkSemaphoreSignalInfo_host VkSemaphoreSignalInfoKHR_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDeviceAddressBindingCallbackDataEXT_host
-{
-    VkStructureType sType;
-    void *pNext;
-    VkDeviceAddressBindingFlagsEXT flags;
-    VkDeviceAddress baseAddress;
-    VkDeviceSize size;
-    VkDeviceAddressBindingTypeEXT bindingType;
-} VkDeviceAddressBindingCallbackDataEXT_host;
-#else
-typedef VkDeviceAddressBindingCallbackDataEXT VkDeviceAddressBindingCallbackDataEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkDebugUtilsMessengerCallbackDataEXT_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDebugUtilsMessengerCallbackDataFlagsEXT flags;
-    const char *pMessageIdName;
-    int32_t messageIdNumber;
-    const char *pMessage;
-    uint32_t queueLabelCount;
-    const VkDebugUtilsLabelEXT *pQueueLabels;
-    uint32_t cmdBufLabelCount;
-    const VkDebugUtilsLabelEXT *pCmdBufLabels;
-    uint32_t objectCount;
-    const VkDebugUtilsObjectNameInfoEXT_host *pObjects;
-} VkDebugUtilsMessengerCallbackDataEXT_host;
-#else
-typedef VkDebugUtilsMessengerCallbackDataEXT VkDebugUtilsMessengerCallbackDataEXT_host;
-#endif
-
-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkCopyDescriptorSet_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDescriptorSet srcSet;
-    uint32_t srcBinding;
-    uint32_t srcArrayElement;
-    VkDescriptorSet dstSet;
-    uint32_t dstBinding;
-    uint32_t dstArrayElement;
-    uint32_t descriptorCount;
-} VkCopyDescriptorSet_host;
-#else
-typedef VkCopyDescriptorSet VkCopyDescriptorSet_host;
-#endif
-
-
 /* Functions for which we have custom implementations outside of the thunks. */
-VkResult wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo_host *pAllocateInfo, VkCommandBuffer *pCommandBuffers) DECLSPEC_HIDDEN;
+VkResult wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers) DECLSPEC_HIDDEN;
 VkResult wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkCommandPool *pCommandPool, void *client_ptr) DECLSPEC_HIDDEN;
 VkResult wine_vkCreateDebugReportCallbackEXT(VkInstance instance, const VkDebugReportCallbackCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDebugReportCallbackEXT *pCallback) DECLSPEC_HIDDEN;
 VkResult wine_vkCreateDebugUtilsMessengerEXT(VkInstance instance, const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDebugUtilsMessengerEXT *pMessenger) DECLSPEC_HIDDEN;
@@ -2513,41 +49,41 @@ void wine_vkGetPhysicalDeviceExternalFenceProperties(VkPhysicalDevice physicalDe
 void wine_vkGetPhysicalDeviceExternalFencePropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo, VkExternalFenceProperties *pExternalFenceProperties) DECLSPEC_HIDDEN;
 void wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, VkExternalSemaphoreProperties *pExternalSemaphoreProperties) DECLSPEC_HIDDEN;
 void wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, VkExternalSemaphoreProperties *pExternalSemaphoreProperties) DECLSPEC_HIDDEN;
-VkResult wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2_host *pImageFormatProperties) DECLSPEC_HIDDEN;
-VkResult wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2_host *pImageFormatProperties) DECLSPEC_HIDDEN;
-VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR_host *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) DECLSPEC_HIDDEN;
+VkResult wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN;
+VkResult wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN;
+VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) DECLSPEC_HIDDEN;
 VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) DECLSPEC_HIDDEN;

/* For use by vkDevice and children */
 struct vulkan_device_funcs
 {
-    VkResult (*p_vkAcquireNextImage2KHR)(VkDevice, const VkAcquireNextImageInfoKHR_host *, uint32_t *);
+    VkResult (*p_vkAcquireNextImage2KHR)(VkDevice, const VkAcquireNextImageInfoKHR *, uint32_t *);
     VkResult (*p_vkAcquireNextImageKHR)(VkDevice, VkSwapchainKHR, uint64_t, VkSemaphore, VkFence, uint32_t *);
     VkResult (*p_vkAcquirePerformanceConfigurationINTEL)(VkDevice, const VkPerformanceConfigurationAcquireInfoINTEL *, VkPerformanceConfigurationINTEL *);
-    VkResult (*p_vkAcquireProfilingLockKHR)(VkDevice, const VkAcquireProfilingLockInfoKHR_host *);
-    VkResult (*p_vkAllocateCommandBuffers)(VkDevice, const VkCommandBufferAllocateInfo_host *, VkCommandBuffer *);
-    VkResult (*p_vkAllocateDescriptorSets)(VkDevice, const VkDescriptorSetAllocateInfo_host *, VkDescriptorSet *);
-    VkResult (*p_vkAllocateMemory)(VkDevice, const VkMemoryAllocateInfo_host *, const VkAllocationCallbacks *, VkDeviceMemory *);
-    VkResult (*p_vkBeginCommandBuffer)(VkCommandBuffer, const VkCommandBufferBeginInfo_host *);
-    VkResult (*p_vkBindAccelerationStructureMemoryNV)(VkDevice, uint32_t, const VkBindAccelerationStructureMemoryInfoNV_host *);
+    VkResult (*p_vkAcquireProfilingLockKHR)(VkDevice, const VkAcquireProfilingLockInfoKHR *);
+    VkResult (*p_vkAllocateCommandBuffers)(VkDevice, const VkCommandBufferAllocateInfo *, VkCommandBuffer *);
+    VkResult (*p_vkAllocateDescriptorSets)(VkDevice, const VkDescriptorSetAllocateInfo *, VkDescriptorSet *);
+    VkResult (*p_vkAllocateMemory)(VkDevice, const VkMemoryAllocateInfo *, const VkAllocationCallbacks *, VkDeviceMemory *);
+    VkResult (*p_vkBeginCommandBuffer)(VkCommandBuffer, const VkCommandBufferBeginInfo *);
+    VkResult (*p_vkBindAccelerationStructureMemoryNV)(VkDevice, uint32_t, const VkBindAccelerationStructureMemoryInfoNV *);
     VkResult (*p_vkBindBufferMemory)(VkDevice, VkBuffer, VkDeviceMemory, VkDeviceSize);
-    VkResult (*p_vkBindBufferMemory2)(VkDevice, uint32_t, const VkBindBufferMemoryInfo_host *);
-    VkResult (*p_vkBindBufferMemory2KHR)(VkDevice, uint32_t, const VkBindBufferMemoryInfo_host *);
+    VkResult (*p_vkBindBufferMemory2)(VkDevice, uint32_t, const VkBindBufferMemoryInfo *);
+    VkResult (*p_vkBindBufferMemory2KHR)(VkDevice, uint32_t, const VkBindBufferMemoryInfo *);
     VkResult (*p_vkBindImageMemory)(VkDevice, VkImage, VkDeviceMemory, VkDeviceSize);
-    VkResult (*p_vkBindImageMemory2)(VkDevice, uint32_t, const VkBindImageMemoryInfo_host *);
-    VkResult (*p_vkBindImageMemory2KHR)(VkDevice, uint32_t, const VkBindImageMemoryInfo_host *);
+    VkResult (*p_vkBindImageMemory2)(VkDevice, uint32_t, const VkBindImageMemoryInfo *);
+    VkResult (*p_vkBindImageMemory2KHR)(VkDevice, uint32_t, const VkBindImageMemoryInfo *);
     VkResult (*p_vkBindOpticalFlowSessionImageNV)(VkDevice, VkOpticalFlowSessionNV, VkOpticalFlowSessionBindingPointNV, VkImageView, VkImageLayout);
-    VkResult (*p_vkBuildAccelerationStructuresKHR)(VkDevice, VkDeferredOperationKHR, uint32_t, const VkAccelerationStructureBuildGeometryInfoKHR_host *, const VkAccelerationStructureBuildRangeInfoKHR * const*);
-    VkResult (*p_vkBuildMicromapsEXT)(VkDevice, VkDeferredOperationKHR, uint32_t, const VkMicromapBuildInfoEXT_host *);
-    void (*p_vkCmdBeginConditionalRenderingEXT)(VkCommandBuffer, const VkConditionalRenderingBeginInfoEXT_host *);
+    VkResult (*p_vkBuildAccelerationStructuresKHR)(VkDevice, VkDeferredOperationKHR, uint32_t, const VkAccelerationStructureBuildGeometryInfoKHR *, const VkAccelerationStructureBuildRangeInfoKHR * const*);
+    VkResult (*p_vkBuildMicromapsEXT)(VkDevice, VkDeferredOperationKHR, uint32_t, const VkMicromapBuildInfoEXT *);
+    void (*p_vkCmdBeginConditionalRenderingEXT)(VkCommandBuffer, const VkConditionalRenderingBeginInfoEXT *);
     void (*p_vkCmdBeginDebugUtilsLabelEXT)(VkCommandBuffer, const VkDebugUtilsLabelEXT *);
     void (*p_vkCmdBeginQuery)(VkCommandBuffer, VkQueryPool, uint32_t, VkQueryControlFlags);
     void (*p_vkCmdBeginQueryIndexedEXT)(VkCommandBuffer, VkQueryPool, uint32_t, VkQueryControlFlags, uint32_t);
-    void (*p_vkCmdBeginRenderPass)(VkCommandBuffer, const VkRenderPassBeginInfo_host *, VkSubpassContents);
-    void (*p_vkCmdBeginRenderPass2)(VkCommandBuffer, const VkRenderPassBeginInfo_host *, const VkSubpassBeginInfo *);
-    void (*p_vkCmdBeginRenderPass2KHR)(VkCommandBuffer, const VkRenderPassBeginInfo_host *, const VkSubpassBeginInfo *);
-    void (*p_vkCmdBeginRendering)(VkCommandBuffer, const VkRenderingInfo_host *);
-    void (*p_vkCmdBeginRenderingKHR)(VkCommandBuffer, const VkRenderingInfo_host *);
+    void (*p_vkCmdBeginRenderPass)(VkCommandBuffer, const VkRenderPassBeginInfo *, VkSubpassContents);
+    void (*p_vkCmdBeginRenderPass2)(VkCommandBuffer, const VkRenderPassBeginInfo *, const VkSubpassBeginInfo *);
+    void (*p_vkCmdBeginRenderPass2KHR)(VkCommandBuffer, const VkRenderPassBeginInfo *, const VkSubpassBeginInfo *);
+    void (*p_vkCmdBeginRendering)(VkCommandBuffer, const VkRenderingInfo *);
+    void (*p_vkCmdBeginRenderingKHR)(VkCommandBuffer, const VkRenderingInfo *);
     void (*p_vkCmdBeginTransformFeedbackEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *);
     void (*p_vkCmdBindDescriptorSets)(VkCommandBuffer, VkPipelineBindPoint, VkPipelineLayout, uint32_t, uint32_t, const VkDescriptorSet *, uint32_t, const uint32_t *);
     void (*p_vkCmdBindIndexBuffer)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkIndexType);
@@ -2560,43 +96,43 @@ struct vulkan_device_funcs
     void (*p_vkCmdBindVertexBuffers2)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *, const VkDeviceSize *, const VkDeviceSize *);
     void (*p_vkCmdBindVertexBuffers2EXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *, const VkDeviceSize *, const VkDeviceSize *);
     void (*p_vkCmdBlitImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageBlit *, VkFilter);
-    void (*p_vkCmdBlitImage2)(VkCommandBuffer, const VkBlitImageInfo2_host *);
-    void (*p_vkCmdBlitImage2KHR)(VkCommandBuffer, const VkBlitImageInfo2_host *);
-    void (*p_vkCmdBuildAccelerationStructureNV)(VkCommandBuffer, const VkAccelerationStructureInfoNV_host *, VkBuffer, VkDeviceSize, VkBool32, VkAccelerationStructureNV, VkAccelerationStructureNV, VkBuffer, VkDeviceSize);
-    void (*p_vkCmdBuildAccelerationStructuresIndirectKHR)(VkCommandBuffer, uint32_t, const VkAccelerationStructureBuildGeometryInfoKHR_host *, const VkDeviceAddress *, const uint32_t *, const uint32_t * const*);
-    void (*p_vkCmdBuildAccelerationStructuresKHR)(VkCommandBuffer, uint32_t, const VkAccelerationStructureBuildGeometryInfoKHR_host *, const VkAccelerationStructureBuildRangeInfoKHR * const*);
-    void (*p_vkCmdBuildMicromapsEXT)(VkCommandBuffer, uint32_t, const VkMicromapBuildInfoEXT_host *);
+    void (*p_vkCmdBlitImage2)(VkCommandBuffer, const VkBlitImageInfo2 *);
+    void (*p_vkCmdBlitImage2KHR)(VkCommandBuffer, const VkBlitImageInfo2 *);
+    void (*p_vkCmdBuildAccelerationStructureNV)(VkCommandBuffer, const VkAccelerationStructureInfoNV *, VkBuffer, VkDeviceSize, VkBool32, VkAccelerationStructureNV, VkAccelerationStructureNV, VkBuffer, VkDeviceSize);
+    void (*p_vkCmdBuildAccelerationStructuresIndirectKHR)(VkCommandBuffer, uint32_t, const VkAccelerationStructureBuildGeometryInfoKHR *, const VkDeviceAddress *, const uint32_t *, const uint32_t * const*);
+    void (*p_vkCmdBuildAccelerationStructuresKHR)(VkCommandBuffer, uint32_t, const VkAccelerationStructureBuildGeometryInfoKHR *, const VkAccelerationStructureBuildRangeInfoKHR * const*);
+    void (*p_vkCmdBuildMicromapsEXT)(VkCommandBuffer, uint32_t, const VkMicromapBuildInfoEXT *);
     void (*p_vkCmdClearAttachments)(VkCommandBuffer, uint32_t, const VkClearAttachment *, uint32_t, const VkClearRect *);
     void (*p_vkCmdClearColorImage)(VkCommandBuffer, VkImage, VkImageLayout, const VkClearColorValue *, uint32_t, const VkImageSubresourceRange *);
     void (*p_vkCmdClearDepthStencilImage)(VkCommandBuffer, VkImage, VkImageLayout, const VkClearDepthStencilValue *, uint32_t, const VkImageSubresourceRange *);
-    void (*p_vkCmdCopyAccelerationStructureKHR)(VkCommandBuffer, const VkCopyAccelerationStructureInfoKHR_host *);
+    void (*p_vkCmdCopyAccelerationStructureKHR)(VkCommandBuffer, const VkCopyAccelerationStructureInfoKHR *);
     void (*p_vkCmdCopyAccelerationStructureNV)(VkCommandBuffer, VkAccelerationStructureNV, VkAccelerationStructureNV, VkCopyAccelerationStructureModeKHR);
-    void (*p_vkCmdCopyAccelerationStructureToMemoryKHR)(VkCommandBuffer, const VkCopyAccelerationStructureToMemoryInfoKHR_host *);
-    void (*p_vkCmdCopyBuffer)(VkCommandBuffer, VkBuffer, VkBuffer, uint32_t, const VkBufferCopy_host *);
-    void (*p_vkCmdCopyBuffer2)(VkCommandBuffer, const VkCopyBufferInfo2_host *);
-    void (*p_vkCmdCopyBuffer2KHR)(VkCommandBuffer, const VkCopyBufferInfo2_host *);
-    void (*p_vkCmdCopyBufferToImage)(VkCommandBuffer, VkBuffer, VkImage, VkImageLayout, uint32_t, const VkBufferImageCopy_host *);
-    void (*p_vkCmdCopyBufferToImage2)(VkCommandBuffer, const VkCopyBufferToImageInfo2_host *);
-    void (*p_vkCmdCopyBufferToImage2KHR)(VkCommandBuffer, const VkCopyBufferToImageInfo2_host *);
+    void (*p_vkCmdCopyAccelerationStructureToMemoryKHR)(VkCommandBuffer, const VkCopyAccelerationStructureToMemoryInfoKHR *);
+    void (*p_vkCmdCopyBuffer)(VkCommandBuffer, VkBuffer, VkBuffer, uint32_t, const VkBufferCopy *);
+    void (*p_vkCmdCopyBuffer2)(VkCommandBuffer, const VkCopyBufferInfo2 *);
+    void (*p_vkCmdCopyBuffer2KHR)(VkCommandBuffer, const VkCopyBufferInfo2 *);
+    void (*p_vkCmdCopyBufferToImage)(VkCommandBuffer, VkBuffer, VkImage, VkImageLayout, uint32_t, const VkBufferImageCopy *);
+    void (*p_vkCmdCopyBufferToImage2)(VkCommandBuffer, const VkCopyBufferToImageInfo2 *);
+    void (*p_vkCmdCopyBufferToImage2KHR)(VkCommandBuffer, const VkCopyBufferToImageInfo2 *);
     void (*p_vkCmdCopyImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageCopy *);
-    void (*p_vkCmdCopyImage2)(VkCommandBuffer, const VkCopyImageInfo2_host *);
-    void (*p_vkCmdCopyImage2KHR)(VkCommandBuffer, const VkCopyImageInfo2_host *);
-    void (*p_vkCmdCopyImageToBuffer)(VkCommandBuffer, VkImage, VkImageLayout, VkBuffer, uint32_t, const VkBufferImageCopy_host *);
-    void (*p_vkCmdCopyImageToBuffer2)(VkCommandBuffer, const VkCopyImageToBufferInfo2_host *);
-    void (*p_vkCmdCopyImageToBuffer2KHR)(VkCommandBuffer, const VkCopyImageToBufferInfo2_host *);
+    void (*p_vkCmdCopyImage2)(VkCommandBuffer, const VkCopyImageInfo2 *);
+    void (*p_vkCmdCopyImage2KHR)(VkCommandBuffer, const VkCopyImageInfo2 *);
+    void (*p_vkCmdCopyImageToBuffer)(VkCommandBuffer, VkImage, VkImageLayout, VkBuffer, uint32_t, const VkBufferImageCopy *);
+    void (*p_vkCmdCopyImageToBuffer2)(VkCommandBuffer, const VkCopyImageToBufferInfo2 *);
+    void (*p_vkCmdCopyImageToBuffer2KHR)(VkCommandBuffer, const VkCopyImageToBufferInfo2 *);
     void (*p_vkCmdCopyMemoryIndirectNV)(VkCommandBuffer, VkDeviceAddress, uint32_t, uint32_t);
-    void (*p_vkCmdCopyMemoryToAccelerationStructureKHR)(VkCommandBuffer, const VkCopyMemoryToAccelerationStructureInfoKHR_host *);
+    void (*p_vkCmdCopyMemoryToAccelerationStructureKHR)(VkCommandBuffer, const VkCopyMemoryToAccelerationStructureInfoKHR *);
     void (*p_vkCmdCopyMemoryToImageIndirectNV)(VkCommandBuffer, VkDeviceAddress, uint32_t, uint32_t, VkImage, VkImageLayout, const VkImageSubresourceLayers *);
-    void (*p_vkCmdCopyMemoryToMicromapEXT)(VkCommandBuffer, const VkCopyMemoryToMicromapInfoEXT_host *);
-    void (*p_vkCmdCopyMicromapEXT)(VkCommandBuffer, const VkCopyMicromapInfoEXT_host *);
-    void (*p_vkCmdCopyMicromapToMemoryEXT)(VkCommandBuffer, const VkCopyMicromapToMemoryInfoEXT_host *);
+    void (*p_vkCmdCopyMemoryToMicromapEXT)(VkCommandBuffer, const VkCopyMemoryToMicromapInfoEXT *);
+    void (*p_vkCmdCopyMicromapEXT)(VkCommandBuffer, const VkCopyMicromapInfoEXT *);
+    void (*p_vkCmdCopyMicromapToMemoryEXT)(VkCommandBuffer, const VkCopyMicromapToMemoryInfoEXT *);
     void (*p_vkCmdCopyQueryPoolResults)(VkCommandBuffer, VkQueryPool, uint32_t, uint32_t, VkBuffer, VkDeviceSize, VkDeviceSize, VkQueryResultFlags);
-    void (*p_vkCmdCuLaunchKernelNVX)(VkCommandBuffer, const VkCuLaunchInfoNVX_host *);
+    void (*p_vkCmdCuLaunchKernelNVX)(VkCommandBuffer, const VkCuLaunchInfoNVX *);
     void (*p_vkCmdDebugMarkerBeginEXT)(VkCommandBuffer, const VkDebugMarkerMarkerInfoEXT *);
     void (*p_vkCmdDebugMarkerEndEXT)(VkCommandBuffer);
     void (*p_vkCmdDebugMarkerInsertEXT)(VkCommandBuffer, const VkDebugMarkerMarkerInfoEXT *);
     void (*p_vkCmdDecompressMemoryIndirectCountNV)(VkCommandBuffer, VkDeviceAddress, VkDeviceAddress, uint32_t);
-    void (*p_vkCmdDecompressMemoryNV)(VkCommandBuffer, uint32_t, const VkDecompressMemoryRegionNV_host *);
+    void (*p_vkCmdDecompressMemoryNV)(VkCommandBuffer, uint32_t, const VkDecompressMemoryRegionNV *);
     void (*p_vkCmdDispatch)(VkCommandBuffer, uint32_t, uint32_t, uint32_t);
     void (*p_vkCmdDispatchBase)(VkCommandBuffer, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
     void (*p_vkCmdDispatchBaseKHR)(VkCommandBuffer, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
@@ -2631,27 +167,27 @@ struct vulkan_device_funcs
     void (*p_vkCmdEndRenderingKHR)(VkCommandBuffer);
     void (*p_vkCmdEndTransformFeedbackEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *);
     void (*p_vkCmdExecuteCommands)(VkCommandBuffer, uint32_t, const VkCommandBuffer *);
-    void (*p_vkCmdExecuteGeneratedCommandsNV)(VkCommandBuffer, VkBool32, const VkGeneratedCommandsInfoNV_host *);
+    void (*p_vkCmdExecuteGeneratedCommandsNV)(VkCommandBuffer, VkBool32, const VkGeneratedCommandsInfoNV *);
     void (*p_vkCmdFillBuffer)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkDeviceSize, uint32_t);
     void (*p_vkCmdInsertDebugUtilsLabelEXT)(VkCommandBuffer, const VkDebugUtilsLabelEXT *);
     void (*p_vkCmdNextSubpass)(VkCommandBuffer, VkSubpassContents);
     void (*p_vkCmdNextSubpass2)(VkCommandBuffer, const VkSubpassBeginInfo *, const VkSubpassEndInfo *);
     void (*p_vkCmdNextSubpass2KHR)(VkCommandBuffer, const VkSubpassBeginInfo *, const VkSubpassEndInfo *);
     void (*p_vkCmdOpticalFlowExecuteNV)(VkCommandBuffer, VkOpticalFlowSessionNV, const VkOpticalFlowExecuteInfoNV *);
-    void (*p_vkCmdPipelineBarrier)(VkCommandBuffer, VkPipelineStageFlags, VkPipelineStageFlags, VkDependencyFlags, uint32_t, const VkMemoryBarrier *, uint32_t, const VkBufferMemoryBarrier_host *, uint32_t, const VkImageMemoryBarrier_host *);
-    void (*p_vkCmdPipelineBarrier2)(VkCommandBuffer, const VkDependencyInfo_host *);
-    void (*p_vkCmdPipelineBarrier2KHR)(VkCommandBuffer, const VkDependencyInfo_host *);
-    void (*p_vkCmdPreprocessGeneratedCommandsNV)(VkCommandBuffer, const VkGeneratedCommandsInfoNV_host *);
+    void (*p_vkCmdPipelineBarrier)(VkCommandBuffer, VkPipelineStageFlags, VkPipelineStageFlags, VkDependencyFlags, uint32_t, const VkMemoryBarrier *, uint32_t, const VkBufferMemoryBarrier *, uint32_t, const VkImageMemoryBarrier *);
+    void (*p_vkCmdPipelineBarrier2)(VkCommandBuffer, const VkDependencyInfo *);
+    void (*p_vkCmdPipelineBarrier2KHR)(VkCommandBuffer, const VkDependencyInfo *);
+    void (*p_vkCmdPreprocessGeneratedCommandsNV)(VkCommandBuffer, const VkGeneratedCommandsInfoNV *);
     void (*p_vkCmdPushConstants)(VkCommandBuffer, VkPipelineLayout, VkShaderStageFlags, uint32_t, uint32_t, const void *);
-    void (*p_vkCmdPushDescriptorSetKHR)(VkCommandBuffer, VkPipelineBindPoint, VkPipelineLayout, uint32_t, uint32_t, const VkWriteDescriptorSet_host *);
+    void (*p_vkCmdPushDescriptorSetKHR)(VkCommandBuffer, VkPipelineBindPoint, VkPipelineLayout, uint32_t, uint32_t, const VkWriteDescriptorSet *);
     void (*p_vkCmdPushDescriptorSetWithTemplateKHR)(VkCommandBuffer, VkDescriptorUpdateTemplate, VkPipelineLayout, uint32_t, const void *);
     void (*p_vkCmdResetEvent)(VkCommandBuffer, VkEvent, VkPipelineStageFlags);
     void (*p_vkCmdResetEvent2)(VkCommandBuffer, VkEvent, VkPipelineStageFlags2);
     void (*p_vkCmdResetEvent2KHR)(VkCommandBuffer, VkEvent, VkPipelineStageFlags2);
     void (*p_vkCmdResetQueryPool)(VkCommandBuffer, VkQueryPool, uint32_t, uint32_t);
     void (*p_vkCmdResolveImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageResolve *);
-    void (*p_vkCmdResolveImage2)(VkCommandBuffer, const VkResolveImageInfo2_host *);
-    void (*p_vkCmdResolveImage2KHR)(VkCommandBuffer, const VkResolveImageInfo2_host *);
+    void (*p_vkCmdResolveImage2)(VkCommandBuffer, const VkResolveImageInfo2 *);
+    void (*p_vkCmdResolveImage2KHR)(VkCommandBuffer, const VkResolveImageInfo2 *);
     void (*p_vkCmdSetAlphaToCoverageEnableEXT)(VkCommandBuffer, VkBool32);
     void (*p_vkCmdSetAlphaToOneEnableEXT)(VkCommandBuffer, VkBool32);
     void (*p_vkCmdSetBlendConstants)(VkCommandBuffer, const float[4]);
@@ -2690,8 +226,8 @@ struct vulkan_device_funcs
     void (*p_vkCmdSetDeviceMaskKHR)(VkCommandBuffer, uint32_t);
     void (*p_vkCmdSetDiscardRectangleEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkRect2D *);
     void (*p_vkCmdSetEvent)(VkCommandBuffer, VkEvent, VkPipelineStageFlags);
-    void (*p_vkCmdSetEvent2)(VkCommandBuffer, VkEvent, const VkDependencyInfo_host *);
-    void (*p_vkCmdSetEvent2KHR)(VkCommandBuffer, VkEvent, const VkDependencyInfo_host *);
+    void (*p_vkCmdSetEvent2)(VkCommandBuffer, VkEvent, const VkDependencyInfo *);
+    void (*p_vkCmdSetEvent2KHR)(VkCommandBuffer, VkEvent, const VkDependencyInfo *);
     void (*p_vkCmdSetExclusiveScissorNV)(VkCommandBuffer, uint32_t, uint32_t, const VkRect2D *);
     void (*p_vkCmdSetExtraPrimitiveOverestimationSizeEXT)(VkCommandBuffer, float);
     void (*p_vkCmdSetFragmentShadingRateEnumNV)(VkCommandBuffer, VkFragmentShadingRateNV, const VkFragmentShadingRateCombinerOpKHR[2]);
@@ -2705,8 +241,8 @@ struct vulkan_device_funcs
     void (*p_vkCmdSetLogicOpEXT)(VkCommandBuffer, VkLogicOp);
     void (*p_vkCmdSetLogicOpEnableEXT)(VkCommandBuffer, VkBool32);
     void (*p_vkCmdSetPatchControlPointsEXT)(VkCommandBuffer, uint32_t);
-    VkResult (*p_vkCmdSetPerformanceMarkerINTEL)(VkCommandBuffer, const VkPerformanceMarkerInfoINTEL_host *);
-    VkResult (*p_vkCmdSetPerformanceOverrideINTEL)(VkCommandBuffer, const VkPerformanceOverrideInfoINTEL_host *);
+    VkResult (*p_vkCmdSetPerformanceMarkerINTEL)(VkCommandBuffer, const VkPerformanceMarkerInfoINTEL *);
+    VkResult (*p_vkCmdSetPerformanceOverrideINTEL)(VkCommandBuffer, const VkPerformanceOverrideInfoINTEL *);
     VkResult (*p_vkCmdSetPerformanceStreamMarkerINTEL)(VkCommandBuffer, const VkPerformanceStreamMarkerInfoINTEL *);
     void (*p_vkCmdSetPolygonModeEXT)(VkCommandBuffer, VkPolygonMode);
     void (*p_vkCmdSetPrimitiveRestartEnable)(VkCommandBuffer, VkBool32);
@@ -2745,13 +281,13 @@ struct vulkan_device_funcs
     void (*p_vkCmdSetViewportWithCountEXT)(VkCommandBuffer, uint32_t, const VkViewport *);
     void (*p_vkCmdSubpassShadingHUAWEI)(VkCommandBuffer);
     void (*p_vkCmdTraceRaysIndirect2KHR)(VkCommandBuffer, VkDeviceAddress);
-    void (*p_vkCmdTraceRaysIndirectKHR)(VkCommandBuffer, const VkStridedDeviceAddressRegionKHR_host *, const VkStridedDeviceAddressRegionKHR_host *, const VkStridedDeviceAddressRegionKHR_host *, const VkStridedDeviceAddressRegionKHR_host *, VkDeviceAddress);
-    void (*p_vkCmdTraceRaysKHR)(VkCommandBuffer, const VkStridedDeviceAddressRegionKHR_host *, const VkStridedDeviceAddressRegionKHR_host *, const VkStridedDeviceAddressRegionKHR_host *, const VkStridedDeviceAddressRegionKHR_host *, uint32_t, uint32_t, uint32_t);
+    void (*p_vkCmdTraceRaysIndirectKHR)(VkCommandBuffer, const VkStridedDeviceAddressRegionKHR *, const VkStridedDeviceAddressRegionKHR *, const VkStridedDeviceAddressRegionKHR *, const VkStridedDeviceAddressRegionKHR *, VkDeviceAddress);
+    void (*p_vkCmdTraceRaysKHR)(VkCommandBuffer, const VkStridedDeviceAddressRegionKHR *, const VkStridedDeviceAddressRegionKHR *, const VkStridedDeviceAddressRegionKHR *, const VkStridedDeviceAddressRegionKHR *, uint32_t, uint32_t, uint32_t);
     void (*p_vkCmdTraceRaysNV)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, VkDeviceSize, VkBuffer, VkDeviceSize, VkDeviceSize, VkBuffer, VkDeviceSize, VkDeviceSize, uint32_t, uint32_t, uint32_t);
     void (*p_vkCmdUpdateBuffer)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkDeviceSize, const void *);
-    void (*p_vkCmdWaitEvents)(VkCommandBuffer, uint32_t, const VkEvent *, VkPipelineStageFlags, VkPipelineStageFlags, uint32_t, const VkMemoryBarrier *, uint32_t, const VkBufferMemoryBarrier_host *, uint32_t, const VkImageMemoryBarrier_host *);
-    void (*p_vkCmdWaitEvents2)(VkCommandBuffer, uint32_t, const VkEvent *, const VkDependencyInfo_host *);
-    void (*p_vkCmdWaitEvents2KHR)(VkCommandBuffer, uint32_t, const VkEvent *, const VkDependencyInfo_host *);
+    void (*p_vkCmdWaitEvents)(VkCommandBuffer, uint32_t, const VkEvent *, VkPipelineStageFlags, VkPipelineStageFlags, uint32_t, const VkMemoryBarrier *, uint32_t, const VkBufferMemoryBarrier *, uint32_t, const VkImageMemoryBarrier *);
+    void (*p_vkCmdWaitEvents2)(VkCommandBuffer, uint32_t, const VkEvent *, const VkDependencyInfo *);
+    void (*p_vkCmdWaitEvents2KHR)(VkCommandBuffer, uint32_t, const VkEvent *, const VkDependencyInfo *);
     void (*p_vkCmdWriteAccelerationStructuresPropertiesKHR)(VkCommandBuffer, uint32_t, const VkAccelerationStructureKHR *, VkQueryType, VkQueryPool, uint32_t);
     void (*p_vkCmdWriteAccelerationStructuresPropertiesNV)(VkCommandBuffer, uint32_t, const VkAccelerationStructureNV *, VkQueryType, VkQueryPool, uint32_t);
     void (*p_vkCmdWriteBufferMarker2AMD)(VkCommandBuffer, VkPipelineStageFlags2, VkBuffer, VkDeviceSize, uint32_t);
@@ -2761,41 +297,41 @@ struct vulkan_device_funcs
     void (*p_vkCmdWriteTimestamp2)(VkCommandBuffer, VkPipelineStageFlags2, VkQueryPool, uint32_t);
     void (*p_vkCmdWriteTimestamp2KHR)(VkCommandBuffer, VkPipelineStageFlags2, VkQueryPool, uint32_t);
     VkResult (*p_vkCompileDeferredNV)(VkDevice, VkPipeline, uint32_t);
-    VkResult (*p_vkCopyAccelerationStructureKHR)(VkDevice, VkDeferredOperationKHR, const VkCopyAccelerationStructureInfoKHR_host *);
-    VkResult (*p_vkCopyAccelerationStructureToMemoryKHR)(VkDevice, VkDeferredOperationKHR, const VkCopyAccelerationStructureToMemoryInfoKHR_host *);
-    VkResult (*p_vkCopyMemoryToAccelerationStructureKHR)(VkDevice, VkDeferredOperationKHR, const VkCopyMemoryToAccelerationStructureInfoKHR_host *);
-    VkResult (*p_vkCopyMemoryToMicromapEXT)(VkDevice, VkDeferredOperationKHR, const VkCopyMemoryToMicromapInfoEXT_host *);
-    VkResult (*p_vkCopyMicromapEXT)(VkDevice, VkDeferredOperationKHR, const VkCopyMicromapInfoEXT_host *);
-    VkResult (*p_vkCopyMicromapToMemoryEXT)(VkDevice, VkDeferredOperationKHR, const VkCopyMicromapToMemoryInfoEXT_host *);
-    VkResult (*p_vkCreateAccelerationStructureKHR)(VkDevice, const VkAccelerationStructureCreateInfoKHR_host *, const VkAllocationCallbacks *, VkAccelerationStructureKHR *);
-    VkResult (*p_vkCreateAccelerationStructureNV)(VkDevice, const VkAccelerationStructureCreateInfoNV_host *, const VkAllocationCallbacks *, VkAccelerationStructureNV *);
-    VkResult (*p_vkCreateBuffer)(VkDevice, const VkBufferCreateInfo_host *, const VkAllocationCallbacks *, VkBuffer *);
-    VkResult (*p_vkCreateBufferView)(VkDevice, const VkBufferViewCreateInfo_host *, const VkAllocationCallbacks *, VkBufferView *);
+    VkResult (*p_vkCopyAccelerationStructureKHR)(VkDevice, VkDeferredOperationKHR, const VkCopyAccelerationStructureInfoKHR *);
+    VkResult (*p_vkCopyAccelerationStructureToMemoryKHR)(VkDevice, VkDeferredOperationKHR, const VkCopyAccelerationStructureToMemoryInfoKHR *);
+    VkResult (*p_vkCopyMemoryToAccelerationStructureKHR)(VkDevice, VkDeferredOperationKHR, const VkCopyMemoryToAccelerationStructureInfoKHR *);
+    VkResult (*p_vkCopyMemoryToMicromapEXT)(VkDevice, VkDeferredOperationKHR, const VkCopyMemoryToMicromapInfoEXT *);
+    VkResult (*p_vkCopyMicromapEXT)(VkDevice, VkDeferredOperationKHR, const VkCopyMicromapInfoEXT *);
+    VkResult (*p_vkCopyMicromapToMemoryEXT)(VkDevice, VkDeferredOperationKHR, const VkCopyMicromapToMemoryInfoEXT *);
+    VkResult (*p_vkCreateAccelerationStructureKHR)(VkDevice, const VkAccelerationStructureCreateInfoKHR *, const VkAllocationCallbacks *, VkAccelerationStructureKHR *);
+    VkResult (*p_vkCreateAccelerationStructureNV)(VkDevice, const VkAccelerationStructureCreateInfoNV *, const VkAllocationCallbacks *, VkAccelerationStructureNV *);
+    VkResult (*p_vkCreateBuffer)(VkDevice, const VkBufferCreateInfo *, const VkAllocationCallbacks *, VkBuffer *);
+    VkResult (*p_vkCreateBufferView)(VkDevice, const VkBufferViewCreateInfo *, const VkAllocationCallbacks *, VkBufferView *);
     VkResult (*p_vkCreateCommandPool)(VkDevice, const VkCommandPoolCreateInfo *, const VkAllocationCallbacks *, VkCommandPool *);
-    VkResult (*p_vkCreateComputePipelines)(VkDevice, VkPipelineCache, uint32_t, const VkComputePipelineCreateInfo_host *, const VkAllocationCallbacks *, VkPipeline *);
-    VkResult (*p_vkCreateCuFunctionNVX)(VkDevice, const VkCuFunctionCreateInfoNVX_host *, const VkAllocationCallbacks *, VkCuFunctionNVX *);
+    VkResult (*p_vkCreateComputePipelines)(VkDevice, VkPipelineCache, uint32_t, const VkComputePipelineCreateInfo *, const VkAllocationCallbacks *, VkPipeline *);
+    VkResult (*p_vkCreateCuFunctionNVX)(VkDevice, const VkCuFunctionCreateInfoNVX *, const VkAllocationCallbacks *, VkCuFunctionNVX *);
     VkResult (*p_vkCreateCuModuleNVX)(VkDevice, const VkCuModuleCreateInfoNVX *, const VkAllocationCallbacks *, VkCuModuleNVX *);
     VkResult (*p_vkCreateDeferredOperationKHR)(VkDevice, const VkAllocationCallbacks *, VkDeferredOperationKHR *);
     VkResult (*p_vkCreateDescriptorPool)(VkDevice, const VkDescriptorPoolCreateInfo *, const VkAllocationCallbacks *, VkDescriptorPool *);
     VkResult (*p_vkCreateDescriptorSetLayout)(VkDevice, const VkDescriptorSetLayoutCreateInfo *, const VkAllocationCallbacks *, VkDescriptorSetLayout *);
-    VkResult (*p_vkCreateDescriptorUpdateTemplate)(VkDevice, const VkDescriptorUpdateTemplateCreateInfo_host *, const VkAllocationCallbacks *, VkDescriptorUpdateTemplate *);
-    VkResult (*p_vkCreateDescriptorUpdateTemplateKHR)(VkDevice, const VkDescriptorUpdateTemplateCreateInfo_host *, const VkAllocationCallbacks *, VkDescriptorUpdateTemplate *);
+    VkResult (*p_vkCreateDescriptorUpdateTemplate)(VkDevice, const VkDescriptorUpdateTemplateCreateInfo *, const VkAllocationCallbacks *, VkDescriptorUpdateTemplate *);
+    VkResult (*p_vkCreateDescriptorUpdateTemplateKHR)(VkDevice, const VkDescriptorUpdateTemplateCreateInfo *, const VkAllocationCallbacks *, VkDescriptorUpdateTemplate *);
     VkResult (*p_vkCreateEvent)(VkDevice, const VkEventCreateInfo *, const VkAllocationCallbacks *, VkEvent *);
     VkResult (*p_vkCreateFence)(VkDevice, const VkFenceCreateInfo *, const VkAllocationCallbacks *, VkFence *);
-    VkResult (*p_vkCreateFramebuffer)(VkDevice, const VkFramebufferCreateInfo_host *, const VkAllocationCallbacks *, VkFramebuffer *);
-    VkResult (*p_vkCreateGraphicsPipelines)(VkDevice, VkPipelineCache, uint32_t, const VkGraphicsPipelineCreateInfo_host *, const VkAllocationCallbacks *, VkPipeline *);
+    VkResult (*p_vkCreateFramebuffer)(VkDevice, const VkFramebufferCreateInfo *, const VkAllocationCallbacks *, VkFramebuffer *);
+    VkResult (*p_vkCreateGraphicsPipelines)(VkDevice, VkPipelineCache, uint32_t, const VkGraphicsPipelineCreateInfo *, const VkAllocationCallbacks *, VkPipeline *);
     VkResult (*p_vkCreateImage)(VkDevice, const VkImageCreateInfo *, const VkAllocationCallbacks *, VkImage *);
-    VkResult (*p_vkCreateImageView)(VkDevice, const VkImageViewCreateInfo_host *, const VkAllocationCallbacks *, VkImageView *);
-    VkResult (*p_vkCreateIndirectCommandsLayoutNV)(VkDevice, const VkIndirectCommandsLayoutCreateInfoNV_host *, const VkAllocationCallbacks *, VkIndirectCommandsLayoutNV *);
-    VkResult (*p_vkCreateMicromapEXT)(VkDevice, const VkMicromapCreateInfoEXT_host *, const VkAllocationCallbacks *, VkMicromapEXT *);
+    VkResult (*p_vkCreateImageView)(VkDevice, const VkImageViewCreateInfo *, const VkAllocationCallbacks *, VkImageView *);
+    VkResult (*p_vkCreateIndirectCommandsLayoutNV)(VkDevice, const VkIndirectCommandsLayoutCreateInfoNV *, const VkAllocationCallbacks *, VkIndirectCommandsLayoutNV *);
+    VkResult (*p_vkCreateMicromapEXT)(VkDevice, const VkMicromapCreateInfoEXT *, const VkAllocationCallbacks *, VkMicromapEXT *);
     VkResult (*p_vkCreateOpticalFlowSessionNV)(VkDevice, const VkOpticalFlowSessionCreateInfoNV *, const VkAllocationCallbacks *, VkOpticalFlowSessionNV *);
     VkResult (*p_vkCreatePipelineCache)(VkDevice, const VkPipelineCacheCreateInfo *, const VkAllocationCallbacks *, VkPipelineCache *);
     VkResult (*p_vkCreatePipelineLayout)(VkDevice, const VkPipelineLayoutCreateInfo *, const VkAllocationCallbacks *, VkPipelineLayout *);
     VkResult (*p_vkCreatePrivateDataSlot)(VkDevice, const VkPrivateDataSlotCreateInfo *, const VkAllocationCallbacks *, VkPrivateDataSlot *);
     VkResult (*p_vkCreatePrivateDataSlotEXT)(VkDevice, const VkPrivateDataSlotCreateInfo *, const VkAllocationCallbacks *, VkPrivateDataSlot *);
     VkResult (*p_vkCreateQueryPool)(VkDevice, const VkQueryPoolCreateInfo *, const VkAllocationCallbacks *, VkQueryPool *);
-    VkResult (*p_vkCreateRayTracingPipelinesKHR)(VkDevice, VkDeferredOperationKHR, VkPipelineCache, uint32_t, const VkRayTracingPipelineCreateInfoKHR_host *, const VkAllocationCallbacks *, VkPipeline *);
-    VkResult (*p_vkCreateRayTracingPipelinesNV)(VkDevice, VkPipelineCache, uint32_t, const VkRayTracingPipelineCreateInfoNV_host *, const VkAllocationCallbacks *, VkPipeline *);
+    VkResult (*p_vkCreateRayTracingPipelinesKHR)(VkDevice, VkDeferredOperationKHR, VkPipelineCache, uint32_t, const VkRayTracingPipelineCreateInfoKHR *, const VkAllocationCallbacks *, VkPipeline *);
+    VkResult (*p_vkCreateRayTracingPipelinesNV)(VkDevice, VkPipelineCache, uint32_t, const VkRayTracingPipelineCreateInfoNV *, const VkAllocationCallbacks *, VkPipeline *);
     VkResult (*p_vkCreateRenderPass)(VkDevice, const VkRenderPassCreateInfo *, const VkAllocationCallbacks *, VkRenderPass *);
     VkResult (*p_vkCreateRenderPass2)(VkDevice, const VkRenderPassCreateInfo2 *, const VkAllocationCallbacks *, VkRenderPass *);
     VkResult (*p_vkCreateRenderPass2KHR)(VkDevice, const VkRenderPassCreateInfo2 *, const VkAllocationCallbacks *, VkRenderPass *);
@@ -2804,10 +340,10 @@ struct vulkan_device_funcs
     VkResult (*p_vkCreateSamplerYcbcrConversionKHR)(VkDevice, const VkSamplerYcbcrConversionCreateInfo *, const VkAllocationCallbacks *, VkSamplerYcbcrConversion *);
     VkResult (*p_vkCreateSemaphore)(VkDevice, const VkSemaphoreCreateInfo *, const VkAllocationCallbacks *, VkSemaphore *);
     VkResult (*p_vkCreateShaderModule)(VkDevice, const VkShaderModuleCreateInfo *, const VkAllocationCallbacks *, VkShaderModule *);
-    VkResult (*p_vkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR_host *, const VkAllocationCallbacks *, VkSwapchainKHR *);
+    VkResult (*p_vkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *);
     VkResult (*p_vkCreateValidationCacheEXT)(VkDevice, const VkValidationCacheCreateInfoEXT *, const VkAllocationCallbacks *, VkValidationCacheEXT *);
-    VkResult (*p_vkDebugMarkerSetObjectNameEXT)(VkDevice, const VkDebugMarkerObjectNameInfoEXT_host *);
-    VkResult (*p_vkDebugMarkerSetObjectTagEXT)(VkDevice, const VkDebugMarkerObjectTagInfoEXT_host *);
+    VkResult (*p_vkDebugMarkerSetObjectNameEXT)(VkDevice, const VkDebugMarkerObjectNameInfoEXT *);
+    VkResult (*p_vkDebugMarkerSetObjectTagEXT)(VkDevice, const VkDebugMarkerObjectTagInfoEXT *);
     VkResult (*p_vkDeferredOperationJoinKHR)(VkDevice, VkDeferredOperationKHR);
     void (*p_vkDestroyAccelerationStructureKHR)(VkDevice, VkAccelerationStructureKHR, const VkAllocationCallbacks *);
     void (*p_vkDestroyAccelerationStructureNV)(VkDevice, VkAccelerationStructureNV, const VkAllocationCallbacks *);
@@ -2846,71 +382,71 @@ struct vulkan_device_funcs
     void (*p_vkDestroyValidationCacheEXT)(VkDevice, VkValidationCacheEXT, const VkAllocationCallbacks *);
     VkResult (*p_vkDeviceWaitIdle)(VkDevice);
     VkResult (*p_vkEndCommandBuffer)(VkCommandBuffer);
-    VkResult (*p_vkFlushMappedMemoryRanges)(VkDevice, uint32_t, const VkMappedMemoryRange_host *);
+    VkResult (*p_vkFlushMappedMemoryRanges)(VkDevice, uint32_t, const VkMappedMemoryRange *);
     void (*p_vkFreeCommandBuffers)(VkDevice, VkCommandPool, uint32_t, const VkCommandBuffer *);
     VkResult (*p_vkFreeDescriptorSets)(VkDevice, VkDescriptorPool, uint32_t, const VkDescriptorSet *);
     void (*p_vkFreeMemory)(VkDevice, VkDeviceMemory, const VkAllocationCallbacks *);
-    void (*p_vkGetAccelerationStructureBuildSizesKHR)(VkDevice, VkAccelerationStructureBuildTypeKHR, const VkAccelerationStructureBuildGeometryInfoKHR_host *, const uint32_t *, VkAccelerationStructureBuildSizesInfoKHR_host *);
-    VkDeviceAddress (*p_vkGetAccelerationStructureDeviceAddressKHR)(VkDevice, const VkAccelerationStructureDeviceAddressInfoKHR_host *);
+    void (*p_vkGetAccelerationStructureBuildSizesKHR)(VkDevice, VkAccelerationStructureBuildTypeKHR, const VkAccelerationStructureBuildGeometryInfoKHR *, const uint32_t *, VkAccelerationStructureBuildSizesInfoKHR *);
+    VkDeviceAddress (*p_vkGetAccelerationStructureDeviceAddressKHR)(VkDevice, const VkAccelerationStructureDeviceAddressInfoKHR *);
     VkResult (*p_vkGetAccelerationStructureHandleNV)(VkDevice, VkAccelerationStructureNV, size_t, void *);
-    void (*p_vkGetAccelerationStructureMemoryRequirementsNV)(VkDevice, const VkAccelerationStructureMemoryRequirementsInfoNV_host *, VkMemoryRequirements2KHR_host *);
-    VkDeviceAddress (*p_vkGetBufferDeviceAddress)(VkDevice, const VkBufferDeviceAddressInfo_host *);
-    VkDeviceAddress (*p_vkGetBufferDeviceAddressEXT)(VkDevice, const VkBufferDeviceAddressInfo_host *);
-    VkDeviceAddress (*p_vkGetBufferDeviceAddressKHR)(VkDevice, const VkBufferDeviceAddressInfo_host *);
-    void (*p_vkGetBufferMemoryRequirements)(VkDevice, VkBuffer, VkMemoryRequirements_host *);
-    void (*p_vkGetBufferMemoryRequirements2)(VkDevice, const VkBufferMemoryRequirementsInfo2_host *, VkMemoryRequirements2_host *);
-    void (*p_vkGetBufferMemoryRequirements2KHR)(VkDevice, const VkBufferMemoryRequirementsInfo2_host *, VkMemoryRequirements2_host *);
-    uint64_t (*p_vkGetBufferOpaqueCaptureAddress)(VkDevice, const VkBufferDeviceAddressInfo_host *);
-    uint64_t (*p_vkGetBufferOpaqueCaptureAddressKHR)(VkDevice, const VkBufferDeviceAddressInfo_host *);
+    void (*p_vkGetAccelerationStructureMemoryRequirementsNV)(VkDevice, const VkAccelerationStructureMemoryRequirementsInfoNV *, VkMemoryRequirements2KHR *);
+    VkDeviceAddress (*p_vkGetBufferDeviceAddress)(VkDevice, const VkBufferDeviceAddressInfo *);
+    VkDeviceAddress (*p_vkGetBufferDeviceAddressEXT)(VkDevice, const VkBufferDeviceAddressInfo *);
+    VkDeviceAddress (*p_vkGetBufferDeviceAddressKHR)(VkDevice, const VkBufferDeviceAddressInfo *);
+    void (*p_vkGetBufferMemoryRequirements)(VkDevice, VkBuffer, VkMemoryRequirements *);
+    void (*p_vkGetBufferMemoryRequirements2)(VkDevice, const VkBufferMemoryRequirementsInfo2 *, VkMemoryRequirements2 *);
+    void (*p_vkGetBufferMemoryRequirements2KHR)(VkDevice, const VkBufferMemoryRequirementsInfo2 *, VkMemoryRequirements2 *);
+    uint64_t (*p_vkGetBufferOpaqueCaptureAddress)(VkDevice, const VkBufferDeviceAddressInfo *);
+    uint64_t (*p_vkGetBufferOpaqueCaptureAddressKHR)(VkDevice, const VkBufferDeviceAddressInfo *);
     VkResult (*p_vkGetCalibratedTimestampsEXT)(VkDevice, uint32_t, const VkCalibratedTimestampInfoEXT *, uint64_t *, uint64_t *);
     uint32_t (*p_vkGetDeferredOperationMaxConcurrencyKHR)(VkDevice, VkDeferredOperationKHR);
     VkResult (*p_vkGetDeferredOperationResultKHR)(VkDevice, VkDeferredOperationKHR);
     void (*p_vkGetDescriptorSetHostMappingVALVE)(VkDevice, VkDescriptorSet, void **);
-    void (*p_vkGetDescriptorSetLayoutHostMappingInfoVALVE)(VkDevice, const VkDescriptorSetBindingReferenceVALVE_host *, VkDescriptorSetLayoutHostMappingInfoVALVE *);
+    void (*p_vkGetDescriptorSetLayoutHostMappingInfoVALVE)(VkDevice, const VkDescriptorSetBindingReferenceVALVE *, VkDescriptorSetLayoutHostMappingInfoVALVE *);
     void (*p_vkGetDescriptorSetLayoutSupport)(VkDevice, const VkDescriptorSetLayoutCreateInfo *, VkDescriptorSetLayoutSupport *);
     void (*p_vkGetDescriptorSetLayoutSupportKHR)(VkDevice, const VkDescriptorSetLayoutCreateInfo *, VkDescriptorSetLayoutSupport *);
     void (*p_vkGetDeviceAccelerationStructureCompatibilityKHR)(VkDevice, const VkAccelerationStructureVersionInfoKHR *, VkAccelerationStructureCompatibilityKHR *);
-    void (*p_vkGetDeviceBufferMemoryRequirements)(VkDevice, const VkDeviceBufferMemoryRequirements_host *, VkMemoryRequirements2_host *);
-    void (*p_vkGetDeviceBufferMemoryRequirementsKHR)(VkDevice, const VkDeviceBufferMemoryRequirements_host *, VkMemoryRequirements2_host *);
-    VkResult (*p_vkGetDeviceFaultInfoEXT)(VkDevice, VkDeviceFaultCountsEXT_host *, VkDeviceFaultInfoEXT_host *);
+    void (*p_vkGetDeviceBufferMemoryRequirements)(VkDevice, const VkDeviceBufferMemoryRequirements *, VkMemoryRequirements2 *);
+    void (*p_vkGetDeviceBufferMemoryRequirementsKHR)(VkDevice, const VkDeviceBufferMemoryRequirements *, VkMemoryRequirements2 *);
+    VkResult (*p_vkGetDeviceFaultInfoEXT)(VkDevice, VkDeviceFaultCountsEXT *, VkDeviceFaultInfoEXT *);
     void (*p_vkGetDeviceGroupPeerMemoryFeatures)(VkDevice, uint32_t, uint32_t, uint32_t, VkPeerMemoryFeatureFlags *);
     void (*p_vkGetDeviceGroupPeerMemoryFeaturesKHR)(VkDevice, uint32_t, uint32_t, uint32_t, VkPeerMemoryFeatureFlags *);
     VkResult (*p_vkGetDeviceGroupPresentCapabilitiesKHR)(VkDevice, VkDeviceGroupPresentCapabilitiesKHR *);
     VkResult (*p_vkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *);
-    void (*p_vkGetDeviceImageMemoryRequirements)(VkDevice, const VkDeviceImageMemoryRequirements *, VkMemoryRequirements2_host *);
-    void (*p_vkGetDeviceImageMemoryRequirementsKHR)(VkDevice, const VkDeviceImageMemoryRequirements *, VkMemoryRequirements2_host *);
-    void (*p_vkGetDeviceImageSparseMemoryRequirements)(VkDevice, const VkDeviceImageMemoryRequirements *, uint32_t *, VkSparseImageMemoryRequirements2_host *);
-    void (*p_vkGetDeviceImageSparseMemoryRequirementsKHR)(VkDevice, const VkDeviceImageMemoryRequirements *, uint32_t *, VkSparseImageMemoryRequirements2_host *);
+    void (*p_vkGetDeviceImageMemoryRequirements)(VkDevice, const VkDeviceImageMemoryRequirements *, VkMemoryRequirements2 *);
+    void (*p_vkGetDeviceImageMemoryRequirementsKHR)(VkDevice, const VkDeviceImageMemoryRequirements *, VkMemoryRequirements2 *);
+    void (*p_vkGetDeviceImageSparseMemoryRequirements)(VkDevice, const VkDeviceImageMemoryRequirements *, uint32_t *, VkSparseImageMemoryRequirements2 *);
+    void (*p_vkGetDeviceImageSparseMemoryRequirementsKHR)(VkDevice, const VkDeviceImageMemoryRequirements *, uint32_t *, VkSparseImageMemoryRequirements2 *);
     void (*p_vkGetDeviceMemoryCommitment)(VkDevice, VkDeviceMemory, VkDeviceSize *);
-    uint64_t (*p_vkGetDeviceMemoryOpaqueCaptureAddress)(VkDevice, const VkDeviceMemoryOpaqueCaptureAddressInfo_host *);
-    uint64_t (*p_vkGetDeviceMemoryOpaqueCaptureAddressKHR)(VkDevice, const VkDeviceMemoryOpaqueCaptureAddressInfo_host *);
+    uint64_t (*p_vkGetDeviceMemoryOpaqueCaptureAddress)(VkDevice, const VkDeviceMemoryOpaqueCaptureAddressInfo *);
+    uint64_t (*p_vkGetDeviceMemoryOpaqueCaptureAddressKHR)(VkDevice, const VkDeviceMemoryOpaqueCaptureAddressInfo *);
     void (*p_vkGetDeviceMicromapCompatibilityEXT)(VkDevice, const VkMicromapVersionInfoEXT *, VkAccelerationStructureCompatibilityKHR *);
     void (*p_vkGetDeviceQueue)(VkDevice, uint32_t, uint32_t, VkQueue *);
     void (*p_vkGetDeviceQueue2)(VkDevice, const VkDeviceQueueInfo2 *, VkQueue *);
     VkResult (*p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI)(VkDevice, VkRenderPass, VkExtent2D *);
-    VkResult (*p_vkGetDynamicRenderingTilePropertiesQCOM)(VkDevice, const VkRenderingInfo_host *, VkTilePropertiesQCOM *);
+    VkResult (*p_vkGetDynamicRenderingTilePropertiesQCOM)(VkDevice, const VkRenderingInfo *, VkTilePropertiesQCOM *);
     VkResult (*p_vkGetEventStatus)(VkDevice, VkEvent);
     VkResult (*p_vkGetFenceStatus)(VkDevice, VkFence);
     VkResult (*p_vkGetFramebufferTilePropertiesQCOM)(VkDevice, VkFramebuffer, uint32_t *, VkTilePropertiesQCOM *);
-    void (*p_vkGetGeneratedCommandsMemoryRequirementsNV)(VkDevice, const VkGeneratedCommandsMemoryRequirementsInfoNV_host *, VkMemoryRequirements2_host *);
-    void (*p_vkGetImageMemoryRequirements)(VkDevice, VkImage, VkMemoryRequirements_host *);
-    void (*p_vkGetImageMemoryRequirements2)(VkDevice, const VkImageMemoryRequirementsInfo2_host *, VkMemoryRequirements2_host *);
-    void (*p_vkGetImageMemoryRequirements2KHR)(VkDevice, const VkImageMemoryRequirementsInfo2_host *, VkMemoryRequirements2_host *);
-    void (*p_vkGetImageSparseMemoryRequirements)(VkDevice, VkImage, uint32_t *, VkSparseImageMemoryRequirements_host *);
-    void (*p_vkGetImageSparseMemoryRequirements2)(VkDevice, const VkImageSparseMemoryRequirementsInfo2_host *, uint32_t *, VkSparseImageMemoryRequirements2_host *);
-    void (*p_vkGetImageSparseMemoryRequirements2KHR)(VkDevice, const VkImageSparseMemoryRequirementsInfo2_host *, uint32_t *, VkSparseImageMemoryRequirements2_host *);
-    void (*p_vkGetImageSubresourceLayout)(VkDevice, VkImage, const VkImageSubresource *, VkSubresourceLayout_host *);
-    void (*p_vkGetImageSubresourceLayout2EXT)(VkDevice, VkImage, const VkImageSubresource2EXT *, VkSubresourceLayout2EXT_host *);
-    VkResult (*p_vkGetImageViewAddressNVX)(VkDevice, VkImageView, VkImageViewAddressPropertiesNVX_host *);
-    uint32_t (*p_vkGetImageViewHandleNVX)(VkDevice, const VkImageViewHandleInfoNVX_host *);
+    void (*p_vkGetGeneratedCommandsMemoryRequirementsNV)(VkDevice, const VkGeneratedCommandsMemoryRequirementsInfoNV *, VkMemoryRequirements2 *);
+    void (*p_vkGetImageMemoryRequirements)(VkDevice, VkImage, VkMemoryRequirements *);
+    void (*p_vkGetImageMemoryRequirements2)(VkDevice, const VkImageMemoryRequirementsInfo2 *, VkMemoryRequirements2 *);
+    void (*p_vkGetImageMemoryRequirements2KHR)(VkDevice, const VkImageMemoryRequirementsInfo2 *, VkMemoryRequirements2 *);
+    void (*p_vkGetImageSparseMemoryRequirements)(VkDevice, VkImage, uint32_t *, VkSparseImageMemoryRequirements *);
+    void (*p_vkGetImageSparseMemoryRequirements2)(VkDevice, const VkImageSparseMemoryRequirementsInfo2 *, uint32_t *, VkSparseImageMemoryRequirements2 *);
+    void (*p_vkGetImageSparseMemoryRequirements2KHR)(VkDevice, const VkImageSparseMemoryRequirementsInfo2 *, uint32_t *, VkSparseImageMemoryRequirements2 *);
+    void (*p_vkGetImageSubresourceLayout)(VkDevice, VkImage, const VkImageSubresource *, VkSubresourceLayout *);
+    void (*p_vkGetImageSubresourceLayout2EXT)(VkDevice, VkImage, const VkImageSubresource2EXT *, VkSubresourceLayout2EXT *);
+    VkResult (*p_vkGetImageViewAddressNVX)(VkDevice, VkImageView, VkImageViewAddressPropertiesNVX *);
+    uint32_t (*p_vkGetImageViewHandleNVX)(VkDevice, const VkImageViewHandleInfoNVX *);
     VkResult (*p_vkGetMemoryHostPointerPropertiesEXT)(VkDevice, VkExternalMemoryHandleTypeFlagBits, const void *, VkMemoryHostPointerPropertiesEXT *);
-    void (*p_vkGetMicromapBuildSizesEXT)(VkDevice, VkAccelerationStructureBuildTypeKHR, const VkMicromapBuildInfoEXT_host *, VkMicromapBuildSizesInfoEXT_host *);
-    VkResult (*p_vkGetPerformanceParameterINTEL)(VkDevice, VkPerformanceParameterTypeINTEL, VkPerformanceValueINTEL_host *);
+    void (*p_vkGetMicromapBuildSizesEXT)(VkDevice, VkAccelerationStructureBuildTypeKHR, const VkMicromapBuildInfoEXT *, VkMicromapBuildSizesInfoEXT *);
+    VkResult (*p_vkGetPerformanceParameterINTEL)(VkDevice, VkPerformanceParameterTypeINTEL, VkPerformanceValueINTEL *);
     VkResult (*p_vkGetPipelineCacheData)(VkDevice, VkPipelineCache, size_t *, void *);
-    VkResult (*p_vkGetPipelineExecutableInternalRepresentationsKHR)(VkDevice, const VkPipelineExecutableInfoKHR_host *, uint32_t *, VkPipelineExecutableInternalRepresentationKHR *);
-    VkResult (*p_vkGetPipelineExecutablePropertiesKHR)(VkDevice, const VkPipelineInfoKHR_host *, uint32_t *, VkPipelineExecutablePropertiesKHR *);
-    VkResult (*p_vkGetPipelineExecutableStatisticsKHR)(VkDevice, const VkPipelineExecutableInfoKHR_host *, uint32_t *, VkPipelineExecutableStatisticKHR_host *);
-    VkResult (*p_vkGetPipelinePropertiesEXT)(VkDevice, const VkPipelineInfoEXT_host *, VkBaseOutStructure *);
+    VkResult (*p_vkGetPipelineExecutableInternalRepresentationsKHR)(VkDevice, const VkPipelineExecutableInfoKHR *, uint32_t *, VkPipelineExecutableInternalRepresentationKHR *);
+    VkResult (*p_vkGetPipelineExecutablePropertiesKHR)(VkDevice, const VkPipelineInfoKHR *, uint32_t *, VkPipelineExecutablePropertiesKHR *);
+    VkResult (*p_vkGetPipelineExecutableStatisticsKHR)(VkDevice, const VkPipelineExecutableInfoKHR *, uint32_t *, VkPipelineExecutableStatisticKHR *);
+    VkResult (*p_vkGetPipelinePropertiesEXT)(VkDevice, const VkPipelineInfoEXT *, VkBaseOutStructure *);
     void (*p_vkGetPrivateData)(VkDevice, VkObjectType, uint64_t, VkPrivateDataSlot, uint64_t *);
     void (*p_vkGetPrivateDataEXT)(VkDevice, VkObjectType, uint64_t, VkPrivateDataSlot, uint64_t *);
     VkResult (*p_vkGetQueryPoolResults)(VkDevice, VkQueryPool, uint32_t, uint32_t, size_t, void *, VkDeviceSize, VkQueryResultFlags);
@@ -2929,19 +465,19 @@ struct vulkan_device_funcs
     VkResult (*p_vkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *);
     VkResult (*p_vkGetValidationCacheDataEXT)(VkDevice, VkValidationCacheEXT, size_t *, void *);
     VkResult (*p_vkInitializePerformanceApiINTEL)(VkDevice, const VkInitializePerformanceApiInfoINTEL *);
-    VkResult (*p_vkInvalidateMappedMemoryRanges)(VkDevice, uint32_t, const VkMappedMemoryRange_host *);
+    VkResult (*p_vkInvalidateMappedMemoryRanges)(VkDevice, uint32_t, const VkMappedMemoryRange *);
     VkResult (*p_vkMapMemory)(VkDevice, VkDeviceMemory, VkDeviceSize, VkDeviceSize, VkMemoryMapFlags, void **);
     VkResult (*p_vkMergePipelineCaches)(VkDevice, VkPipelineCache, uint32_t, const VkPipelineCache *);
     VkResult (*p_vkMergeValidationCachesEXT)(VkDevice, VkValidationCacheEXT, uint32_t, const VkValidationCacheEXT *);
     void (*p_vkQueueBeginDebugUtilsLabelEXT)(VkQueue, const VkDebugUtilsLabelEXT *);
-    VkResult (*p_vkQueueBindSparse)(VkQueue, uint32_t, const VkBindSparseInfo_host *, VkFence);
+    VkResult (*p_vkQueueBindSparse)(VkQueue, uint32_t, const VkBindSparseInfo *, VkFence);
     void (*p_vkQueueEndDebugUtilsLabelEXT)(VkQueue);
     void (*p_vkQueueInsertDebugUtilsLabelEXT)(VkQueue, const VkDebugUtilsLabelEXT *);
     VkResult (*p_vkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *);
     VkResult (*p_vkQueueSetPerformanceConfigurationINTEL)(VkQueue, VkPerformanceConfigurationINTEL);
     VkResult (*p_vkQueueSubmit)(VkQueue, uint32_t, const VkSubmitInfo *, VkFence);
-    VkResult (*p_vkQueueSubmit2)(VkQueue, uint32_t, const VkSubmitInfo2_host *, VkFence);
-    VkResult (*p_vkQueueSubmit2KHR)(VkQueue, uint32_t, const VkSubmitInfo2_host *, VkFence);
+    VkResult (*p_vkQueueSubmit2)(VkQueue, uint32_t, const VkSubmitInfo2 *, VkFence);
+    VkResult (*p_vkQueueSubmit2KHR)(VkQueue, uint32_t, const VkSubmitInfo2 *, VkFence);
     VkResult (*p_vkQueueWaitIdle)(VkQueue);
     VkResult (*p_vkReleasePerformanceConfigurationINTEL)(VkDevice, VkPerformanceConfigurationINTEL);
     void (*p_vkReleaseProfilingLockKHR)(VkDevice);
@@ -2952,21 +488,21 @@ struct vulkan_device_funcs
     VkResult (*p_vkResetFences)(VkDevice, uint32_t, const VkFence *);
     void (*p_vkResetQueryPool)(VkDevice, VkQueryPool, uint32_t, uint32_t);
     void (*p_vkResetQueryPoolEXT)(VkDevice, VkQueryPool, uint32_t, uint32_t);
-    VkResult (*p_vkSetDebugUtilsObjectNameEXT)(VkDevice, const VkDebugUtilsObjectNameInfoEXT_host *);
-    VkResult (*p_vkSetDebugUtilsObjectTagEXT)(VkDevice, const VkDebugUtilsObjectTagInfoEXT_host *);
+    VkResult (*p_vkSetDebugUtilsObjectNameEXT)(VkDevice, const VkDebugUtilsObjectNameInfoEXT *);
+    VkResult (*p_vkSetDebugUtilsObjectTagEXT)(VkDevice, const VkDebugUtilsObjectTagInfoEXT *);
     void (*p_vkSetDeviceMemoryPriorityEXT)(VkDevice, VkDeviceMemory, float);
     VkResult (*p_vkSetEvent)(VkDevice, VkEvent);
     VkResult (*p_vkSetPrivateData)(VkDevice, VkObjectType, uint64_t, VkPrivateDataSlot, uint64_t);
     VkResult (*p_vkSetPrivateDataEXT)(VkDevice, VkObjectType, uint64_t, VkPrivateDataSlot, uint64_t);
-    VkResult (*p_vkSignalSemaphore)(VkDevice, const VkSemaphoreSignalInfo_host *);
-    VkResult (*p_vkSignalSemaphoreKHR)(VkDevice, const VkSemaphoreSignalInfo_host *);
+    VkResult (*p_vkSignalSemaphore)(VkDevice, const VkSemaphoreSignalInfo *);
+    VkResult (*p_vkSignalSemaphoreKHR)(VkDevice, const VkSemaphoreSignalInfo *);
     void (*p_vkTrimCommandPool)(VkDevice, VkCommandPool, VkCommandPoolTrimFlags);
     void (*p_vkTrimCommandPoolKHR)(VkDevice, VkCommandPool, VkCommandPoolTrimFlags);
     void (*p_vkUninitializePerformanceApiINTEL)(VkDevice);
     void (*p_vkUnmapMemory)(VkDevice, VkDeviceMemory);
     void (*p_vkUpdateDescriptorSetWithTemplate)(VkDevice, VkDescriptorSet, VkDescriptorUpdateTemplate, const void *);
     void (*p_vkUpdateDescriptorSetWithTemplateKHR)(VkDevice, VkDescriptorSet, VkDescriptorUpdateTemplate, const void *);
-    void (*p_vkUpdateDescriptorSets)(VkDevice, uint32_t, const VkWriteDescriptorSet_host *, uint32_t, const VkCopyDescriptorSet_host *);
+    void (*p_vkUpdateDescriptorSets)(VkDevice, uint32_t, const VkWriteDescriptorSet *, uint32_t, const VkCopyDescriptorSet *);
     VkResult (*p_vkWaitForFences)(VkDevice, uint32_t, const VkFence *, VkBool32, uint64_t);
     VkResult (*p_vkWaitForPresentKHR)(VkDevice, VkSwapchainKHR, uint64_t, uint64_t);
     VkResult (*p_vkWaitSemaphores)(VkDevice, const VkSemaphoreWaitInfo *, uint64_t);
@@ -2988,7 +524,7 @@ struct vulkan_instance_funcs
     VkResult (*p_vkEnumeratePhysicalDeviceGroups)(VkInstance, uint32_t *, VkPhysicalDeviceGroupProperties *);
     VkResult (*p_vkEnumeratePhysicalDeviceGroupsKHR)(VkInstance, uint32_t *, VkPhysicalDeviceGroupProperties *);
     VkResult (*p_vkEnumeratePhysicalDevices)(VkInstance, uint32_t *, VkPhysicalDevice *);
-    void (*p_vkSubmitDebugUtilsMessageEXT)(VkInstance, VkDebugUtilsMessageSeverityFlagBitsEXT, VkDebugUtilsMessageTypeFlagsEXT, const VkDebugUtilsMessengerCallbackDataEXT_host *);
+    void (*p_vkSubmitDebugUtilsMessageEXT)(VkInstance, VkDebugUtilsMessageSeverityFlagBitsEXT, VkDebugUtilsMessageTypeFlagsEXT, const VkDebugUtilsMessengerCallbackDataEXT *);
     VkResult (*p_vkCreateDevice)(VkPhysicalDevice, const VkDeviceCreateInfo *, const VkAllocationCallbacks *, VkDevice *);
     VkResult (*p_vkEnumerateDeviceExtensionProperties)(VkPhysicalDevice, const char *, uint32_t *, VkExtensionProperties *);
     VkResult (*p_vkEnumerateDeviceLayerProperties)(VkPhysicalDevice, uint32_t *, VkLayerProperties *);
@@ -3002,18 +538,18 @@ struct vulkan_instance_funcs
     void (*p_vkGetPhysicalDeviceFormatProperties2)(VkPhysicalDevice, VkFormat, VkFormatProperties2 *);
     void (*p_vkGetPhysicalDeviceFormatProperties2KHR)(VkPhysicalDevice, VkFormat, VkFormatProperties2 *);
     VkResult (*p_vkGetPhysicalDeviceFragmentShadingRatesKHR)(VkPhysicalDevice, uint32_t *, VkPhysicalDeviceFragmentShadingRateKHR *);
-    VkResult (*p_vkGetPhysicalDeviceImageFormatProperties)(VkPhysicalDevice, VkFormat, VkImageType, VkImageTiling, VkImageUsageFlags, VkImageCreateFlags, VkImageFormatProperties_host *);
-    VkResult (*p_vkGetPhysicalDeviceImageFormatProperties2)(VkPhysicalDevice, const VkPhysicalDeviceImageFormatInfo2 *, VkImageFormatProperties2_host *);
-    VkResult (*p_vkGetPhysicalDeviceImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceImageFormatInfo2 *, VkImageFormatProperties2_host *);
-    void (*p_vkGetPhysicalDeviceMemoryProperties)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties_host *);
-    void (*p_vkGetPhysicalDeviceMemoryProperties2)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties2_host *);
-    void (*p_vkGetPhysicalDeviceMemoryProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties2_host *);
+    VkResult (*p_vkGetPhysicalDeviceImageFormatProperties)(VkPhysicalDevice, VkFormat, VkImageType, VkImageTiling, VkImageUsageFlags, VkImageCreateFlags, VkImageFormatProperties *);
+    VkResult (*p_vkGetPhysicalDeviceImageFormatProperties2)(VkPhysicalDevice, const VkPhysicalDeviceImageFormatInfo2 *, VkImageFormatProperties2 *);
+    VkResult (*p_vkGetPhysicalDeviceImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceImageFormatInfo2 *, VkImageFormatProperties2 *);
+    void (*p_vkGetPhysicalDeviceMemoryProperties)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties *);
+    void (*p_vkGetPhysicalDeviceMemoryProperties2)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties2 *);
+    void (*p_vkGetPhysicalDeviceMemoryProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties2 *);
     void (*p_vkGetPhysicalDeviceMultisamplePropertiesEXT)(VkPhysicalDevice, VkSampleCountFlagBits, VkMultisamplePropertiesEXT *);
     VkResult (*p_vkGetPhysicalDeviceOpticalFlowImageFormatsNV)(VkPhysicalDevice, const VkOpticalFlowImageFormatInfoNV *, uint32_t *, VkOpticalFlowImageFormatPropertiesNV *);
     VkResult (*p_vkGetPhysicalDevicePresentRectanglesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkRect2D *);
-    void (*p_vkGetPhysicalDeviceProperties)(VkPhysicalDevice, VkPhysicalDeviceProperties_host *);
-    void (*p_vkGetPhysicalDeviceProperties2)(VkPhysicalDevice, VkPhysicalDeviceProperties2_host *);
-    void (*p_vkGetPhysicalDeviceProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceProperties2_host *);
+    void (*p_vkGetPhysicalDeviceProperties)(VkPhysicalDevice, VkPhysicalDeviceProperties *);
+    void (*p_vkGetPhysicalDeviceProperties2)(VkPhysicalDevice, VkPhysicalDeviceProperties2 *);
+    void (*p_vkGetPhysicalDeviceProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceProperties2 *);
     void (*p_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR)(VkPhysicalDevice, const VkQueryPoolPerformanceCreateInfoKHR *, uint32_t *);
     void (*p_vkGetPhysicalDeviceQueueFamilyProperties)(VkPhysicalDevice, uint32_t *, VkQueueFamilyProperties *);
     void (*p_vkGetPhysicalDeviceQueueFamilyProperties2)(VkPhysicalDevice, uint32_t *, VkQueueFamilyProperties2 *);
@@ -3022,9 +558,9 @@ struct vulkan_instance_funcs
     void (*p_vkGetPhysicalDeviceSparseImageFormatProperties2)(VkPhysicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2 *, uint32_t *, VkSparseImageFormatProperties2 *);
     void (*p_vkGetPhysicalDeviceSparseImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2 *, uint32_t *, VkSparseImageFormatProperties2 *);
     VkResult (*p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV)(VkPhysicalDevice, uint32_t *, VkFramebufferMixedSamplesCombinationNV *);
-    VkResult (*p_vkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR_host *, VkSurfaceCapabilities2KHR *);
+    VkResult (*p_vkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, VkSurfaceCapabilities2KHR *);
     VkResult (*p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPhysicalDevice, VkSurfaceKHR, VkSurfaceCapabilitiesKHR *);
-    VkResult (*p_vkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR_host *, uint32_t *, VkSurfaceFormat2KHR *);
+    VkResult (*p_vkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, uint32_t *, VkSurfaceFormat2KHR *);
     VkResult (*p_vkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkSurfaceFormatKHR *);
     VkResult (*p_vkGetPhysicalDeviceSurfacePresentModesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkPresentModeKHR *);
     VkResult (*p_vkGetPhysicalDeviceSurfaceSupportKHR)(VkPhysicalDevice, uint32_t, VkSurfaceKHR, VkBool32 *);