winevulkan: Update to VK spec version 1.3.233.

dlls/winevulkan/loader_thunks.c

@@ -766,6 +766,18 @@ void WINAPI vkCmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, const VkCo
     assert(!status);
 }
 
+void WINAPI vkCmdCopyMemoryIndirectNV(VkCommandBuffer commandBuffer, VkDeviceAddress copyBufferAddress, uint32_t copyCount, uint32_t stride)
+{
+    struct vkCmdCopyMemoryIndirectNV_params params;
+    NTSTATUS status;
+    params.commandBuffer = commandBuffer;
+    params.copyBufferAddress = copyBufferAddress;
+    params.copyCount = copyCount;
+    params.stride = stride;
+    status = p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyMemoryIndirectNV, &params);
+    assert(!status);
+}
+
 void WINAPI vkCmdCopyMemoryToAccelerationStructureKHR(VkCommandBuffer commandBuffer, const VkCopyMemoryToAccelerationStructureInfoKHR *pInfo)
 {
     struct vkCmdCopyMemoryToAccelerationStructureKHR_params params;
@@ -776,6 +788,21 @@ void WINAPI vkCmdCopyMemoryToAccelerationStructureKHR(VkCommandBuffer commandBuf
     assert(!status);
 }
 
+void WINAPI vkCmdCopyMemoryToImageIndirectNV(VkCommandBuffer commandBuffer, VkDeviceAddress copyBufferAddress, uint32_t copyCount, uint32_t stride, VkImage dstImage, VkImageLayout dstImageLayout, const VkImageSubresourceLayers *pImageSubresources)
+{
+    struct vkCmdCopyMemoryToImageIndirectNV_params params;
+    NTSTATUS status;
+    params.commandBuffer = commandBuffer;
+    params.copyBufferAddress = copyBufferAddress;
+    params.copyCount = copyCount;
+    params.stride = stride;
+    params.dstImage = dstImage;
+    params.dstImageLayout = dstImageLayout;
+    params.pImageSubresources = pImageSubresources;
+    status = p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyMemoryToImageIndirectNV, &params);
+    assert(!status);
+}
+
 void WINAPI vkCmdCopyMemoryToMicromapEXT(VkCommandBuffer commandBuffer, const VkCopyMemoryToMicromapInfoEXT *pInfo)
 {
     struct vkCmdCopyMemoryToMicromapEXT_params params;
@@ -861,6 +888,29 @@ void WINAPI vkCmdDebugMarkerInsertEXT(VkCommandBuffer commandBuffer, const VkDeb
     assert(!status);
 }
 
+void WINAPI vkCmdDecompressMemoryIndirectCountNV(VkCommandBuffer commandBuffer, VkDeviceAddress indirectCommandsAddress, VkDeviceAddress indirectCommandsCountAddress, uint32_t stride)
+{
+    struct vkCmdDecompressMemoryIndirectCountNV_params params;
+    NTSTATUS status;
+    params.commandBuffer = commandBuffer;
+    params.indirectCommandsAddress = indirectCommandsAddress;
+    params.indirectCommandsCountAddress = indirectCommandsCountAddress;
+    params.stride = stride;
+    status = p_vk_direct_unix_call(unix_handle, unix_vkCmdDecompressMemoryIndirectCountNV, &params);
+    assert(!status);
+}
+
+void WINAPI vkCmdDecompressMemoryNV(VkCommandBuffer commandBuffer, uint32_t decompressRegionCount, const VkDecompressMemoryRegionNV *pDecompressMemoryRegions)
+{
+    struct vkCmdDecompressMemoryNV_params params;
+    NTSTATUS status;
+    params.commandBuffer = commandBuffer;
+    params.decompressRegionCount = decompressRegionCount;
+    params.pDecompressMemoryRegions = pDecompressMemoryRegions;
+    status = p_vk_direct_unix_call(unix_handle, unix_vkCmdDecompressMemoryNV, &params);
+    assert(!status);
+}
+
 void WINAPI vkCmdDispatch(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ)
 {
     struct vkCmdDispatch_params params;
@@ -5969,7 +6019,9 @@ static const struct vulkan_func vk_device_dispatch_table[] =
     {"vkCmdCopyImageToBuffer", vkCmdCopyImageToBuffer},
     {"vkCmdCopyImageToBuffer2", vkCmdCopyImageToBuffer2},
     {"vkCmdCopyImageToBuffer2KHR", vkCmdCopyImageToBuffer2KHR},
+    {"vkCmdCopyMemoryIndirectNV", vkCmdCopyMemoryIndirectNV},
     {"vkCmdCopyMemoryToAccelerationStructureKHR", vkCmdCopyMemoryToAccelerationStructureKHR},
+    {"vkCmdCopyMemoryToImageIndirectNV", vkCmdCopyMemoryToImageIndirectNV},
     {"vkCmdCopyMemoryToMicromapEXT", vkCmdCopyMemoryToMicromapEXT},
     {"vkCmdCopyMicromapEXT", vkCmdCopyMicromapEXT},
     {"vkCmdCopyMicromapToMemoryEXT", vkCmdCopyMicromapToMemoryEXT},
@@ -5978,6 +6030,8 @@ static const struct vulkan_func vk_device_dispatch_table[] =
     {"vkCmdDebugMarkerBeginEXT", vkCmdDebugMarkerBeginEXT},
     {"vkCmdDebugMarkerEndEXT", vkCmdDebugMarkerEndEXT},
     {"vkCmdDebugMarkerInsertEXT", vkCmdDebugMarkerInsertEXT},
+    {"vkCmdDecompressMemoryIndirectCountNV", vkCmdDecompressMemoryIndirectCountNV},
+    {"vkCmdDecompressMemoryNV", vkCmdDecompressMemoryNV},
     {"vkCmdDispatch", vkCmdDispatch},
     {"vkCmdDispatchBase", vkCmdDispatchBase},
     {"vkCmdDispatchBaseKHR", vkCmdDispatchBaseKHR},

dlls/winevulkan/loader_thunks.h

@@ -80,7 +80,9 @@ enum unix_call
     unix_vkCmdCopyImageToBuffer,
     unix_vkCmdCopyImageToBuffer2,
     unix_vkCmdCopyImageToBuffer2KHR,
+    unix_vkCmdCopyMemoryIndirectNV,
     unix_vkCmdCopyMemoryToAccelerationStructureKHR,
+    unix_vkCmdCopyMemoryToImageIndirectNV,
     unix_vkCmdCopyMemoryToMicromapEXT,
     unix_vkCmdCopyMicromapEXT,
     unix_vkCmdCopyMicromapToMemoryEXT,
@@ -89,6 +91,8 @@ enum unix_call
     unix_vkCmdDebugMarkerBeginEXT,
     unix_vkCmdDebugMarkerEndEXT,
     unix_vkCmdDebugMarkerInsertEXT,
+    unix_vkCmdDecompressMemoryIndirectCountNV,
+    unix_vkCmdDecompressMemoryNV,
     unix_vkCmdDispatch,
     unix_vkCmdDispatchBase,
     unix_vkCmdDispatchBaseKHR,
@@ -1044,12 +1048,31 @@ struct vkCmdCopyImageToBuffer2KHR_params
     const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo;
 };
 
+struct vkCmdCopyMemoryIndirectNV_params
+{
+    VkCommandBuffer commandBuffer;
+    VkDeviceAddress copyBufferAddress;
+    uint32_t copyCount;
+    uint32_t stride;
+};
+
 struct vkCmdCopyMemoryToAccelerationStructureKHR_params
 {
     VkCommandBuffer commandBuffer;
     const VkCopyMemoryToAccelerationStructureInfoKHR *pInfo;
 };
 
+struct vkCmdCopyMemoryToImageIndirectNV_params
+{
+    VkCommandBuffer commandBuffer;
+    VkDeviceAddress copyBufferAddress;
+    uint32_t copyCount;
+    uint32_t stride;
+    VkImage DECLSPEC_ALIGN(8) dstImage;
+    VkImageLayout dstImageLayout;
+    const VkImageSubresourceLayers *pImageSubresources;
+};
+
 struct vkCmdCopyMemoryToMicromapEXT_params
 {
     VkCommandBuffer commandBuffer;
@@ -1103,6 +1126,21 @@ struct vkCmdDebugMarkerInsertEXT_params
     const VkDebugMarkerMarkerInfoEXT *pMarkerInfo;
 };
 
+struct vkCmdDecompressMemoryIndirectCountNV_params
+{
+    VkCommandBuffer commandBuffer;
+    VkDeviceAddress indirectCommandsAddress;
+    VkDeviceAddress indirectCommandsCountAddress;
+    uint32_t stride;
+};
+
+struct vkCmdDecompressMemoryNV_params
+{
+    VkCommandBuffer commandBuffer;
+    uint32_t decompressRegionCount;
+    const VkDecompressMemoryRegionNV *pDecompressMemoryRegions;
+};
+
 struct vkCmdDispatch_params
 {
     VkCommandBuffer commandBuffer;

dlls/winevulkan/make_vulkan

@@ -64,7 +64,7 @@ from enum import Enum
 LOGGER = logging.Logger("vulkan")
 LOGGER.addHandler(logging.StreamHandler())
 
-VK_XML_VERSION = "1.3.230"
+VK_XML_VERSION = "1.3.233"
 WINE_VK_VERSION = (1, 3)
 
 # Filenames to create.

dlls/winevulkan/vulkan_thunks.h

@@ -568,6 +568,19 @@ 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;
@@ -2005,7 +2018,9 @@ struct vulkan_device_funcs
     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_vkCmdCopyMemoryIndirectNV)(VkCommandBuffer, VkDeviceAddress, uint32_t, uint32_t);
     void (*p_vkCmdCopyMemoryToAccelerationStructureKHR)(VkCommandBuffer, const VkCopyMemoryToAccelerationStructureInfoKHR_host *);
+    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 *);
@@ -2014,6 +2029,8 @@ struct vulkan_device_funcs
     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_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);
@@ -2516,7 +2533,9 @@ struct vulkan_instance_funcs
     USE_VK_FUNC(vkCmdCopyImageToBuffer) \
     USE_VK_FUNC(vkCmdCopyImageToBuffer2) \
     USE_VK_FUNC(vkCmdCopyImageToBuffer2KHR) \
+    USE_VK_FUNC(vkCmdCopyMemoryIndirectNV) \
     USE_VK_FUNC(vkCmdCopyMemoryToAccelerationStructureKHR) \
+    USE_VK_FUNC(vkCmdCopyMemoryToImageIndirectNV) \
     USE_VK_FUNC(vkCmdCopyMemoryToMicromapEXT) \
     USE_VK_FUNC(vkCmdCopyMicromapEXT) \
     USE_VK_FUNC(vkCmdCopyMicromapToMemoryEXT) \
@@ -2525,6 +2544,8 @@ struct vulkan_instance_funcs
     USE_VK_FUNC(vkCmdDebugMarkerBeginEXT) \
     USE_VK_FUNC(vkCmdDebugMarkerEndEXT) \
     USE_VK_FUNC(vkCmdDebugMarkerInsertEXT) \
+    USE_VK_FUNC(vkCmdDecompressMemoryIndirectCountNV) \
+    USE_VK_FUNC(vkCmdDecompressMemoryNV) \
     USE_VK_FUNC(vkCmdDispatch) \
     USE_VK_FUNC(vkCmdDispatchBase) \
     USE_VK_FUNC(vkCmdDispatchBaseKHR) \

dlls/winevulkan/winevulkan.json

@@ -2,6 +2,6 @@
     "file_format_version": "1.0.0",
     "ICD": {
         "library_path": ".\\winevulkan.dll",
-        "api_version": "1.3.230"
+        "api_version": "1.3.233"
     }
 }