winevulkan: Update to VK spec version 1.3.242.

dlls/vulkan-1/vulkan-1.spec

@@ -3,7 +3,7 @@
 # This file is generated from Vulkan vk.xml file covered
 # by the following copyright and permission notice:
 #
-# Copyright 2015-2022 The Khronos Group Inc.
+# Copyright 2015-2023 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
@@ -169,6 +169,7 @@
 @ stdcall vkGetBufferMemoryRequirements(ptr int64 ptr) winevulkan.vkGetBufferMemoryRequirements
 @ stdcall vkGetBufferMemoryRequirements2(ptr ptr ptr) winevulkan.vkGetBufferMemoryRequirements2
 @ stdcall vkGetBufferOpaqueCaptureAddress(ptr ptr) winevulkan.vkGetBufferOpaqueCaptureAddress
+@ stub vkGetCommandPoolMemoryConsumption
 @ stdcall vkGetDescriptorSetLayoutSupport(ptr ptr ptr) winevulkan.vkGetDescriptorSetLayoutSupport
 @ stdcall vkGetDeviceBufferMemoryRequirements(ptr ptr ptr) winevulkan.vkGetDeviceBufferMemoryRequirements
 @ stdcall vkGetDeviceGroupPeerMemoryFeatures(ptr long long long ptr) winevulkan.vkGetDeviceGroupPeerMemoryFeatures
@@ -185,6 +186,7 @@
 @ stub vkGetDisplayPlaneCapabilitiesKHR
 @ stub vkGetDisplayPlaneSupportedDisplaysKHR
 @ stdcall vkGetEventStatus(ptr int64) winevulkan.vkGetEventStatus
+@ stub vkGetFaultData
 @ stdcall vkGetFenceStatus(ptr int64) winevulkan.vkGetFenceStatus
 @ stdcall vkGetImageMemoryRequirements(ptr int64 ptr) winevulkan.vkGetImageMemoryRequirements
 @ stdcall vkGetImageMemoryRequirements2(ptr ptr ptr) winevulkan.vkGetImageMemoryRequirements2

dlls/winevulkan/loader_thunks.c

@@ -3,7 +3,7 @@
  * This file is generated from Vulkan vk.xml file covered
  * by the following copyright and permission notice:
  *
- * Copyright 2015-2022 The Khronos Group Inc.
+ * Copyright 2015-2023 The Khronos Group Inc.
  *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
@@ -1726,6 +1726,22 @@ void WINAPI vkCmdSetDiscardRectangleEXT(VkCommandBuffer commandBuffer, uint32_t
     UNIX_CALL(vkCmdSetDiscardRectangleEXT, &params);
 }
 
+void WINAPI vkCmdSetDiscardRectangleEnableEXT(VkCommandBuffer commandBuffer, VkBool32 discardRectangleEnable)
+{
+    struct vkCmdSetDiscardRectangleEnableEXT_params params;
+    params.commandBuffer = commandBuffer;
+    params.discardRectangleEnable = discardRectangleEnable;
+    UNIX_CALL(vkCmdSetDiscardRectangleEnableEXT, &params);
+}
+
+void WINAPI vkCmdSetDiscardRectangleModeEXT(VkCommandBuffer commandBuffer, VkDiscardRectangleModeEXT discardRectangleMode)
+{
+    struct vkCmdSetDiscardRectangleModeEXT_params params;
+    params.commandBuffer = commandBuffer;
+    params.discardRectangleMode = discardRectangleMode;
+    UNIX_CALL(vkCmdSetDiscardRectangleModeEXT, &params);
+}
+
 void WINAPI vkCmdSetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask)
 {
     struct vkCmdSetEvent_params params;
@@ -1753,6 +1769,16 @@ void WINAPI vkCmdSetEvent2KHR(VkCommandBuffer commandBuffer, VkEvent event, cons
     UNIX_CALL(vkCmdSetEvent2KHR, &params);
 }
 
+void WINAPI vkCmdSetExclusiveScissorEnableNV(VkCommandBuffer commandBuffer, uint32_t firstExclusiveScissor, uint32_t exclusiveScissorCount, const VkBool32 *pExclusiveScissorEnables)
+{
+    struct vkCmdSetExclusiveScissorEnableNV_params params;
+    params.commandBuffer = commandBuffer;
+    params.firstExclusiveScissor = firstExclusiveScissor;
+    params.exclusiveScissorCount = exclusiveScissorCount;
+    params.pExclusiveScissorEnables = pExclusiveScissorEnables;
+    UNIX_CALL(vkCmdSetExclusiveScissorEnableNV, &params);
+}
+
 void WINAPI vkCmdSetExclusiveScissorNV(VkCommandBuffer commandBuffer, uint32_t firstExclusiveScissor, uint32_t exclusiveScissorCount, const VkRect2D *pExclusiveScissors)
 {
     struct vkCmdSetExclusiveScissorNV_params params;
@@ -5856,9 +5882,12 @@ static const struct vulkan_func vk_device_dispatch_table[] =
     {"vkCmdSetDeviceMask", vkCmdSetDeviceMask},
     {"vkCmdSetDeviceMaskKHR", vkCmdSetDeviceMaskKHR},
     {"vkCmdSetDiscardRectangleEXT", vkCmdSetDiscardRectangleEXT},
+    {"vkCmdSetDiscardRectangleEnableEXT", vkCmdSetDiscardRectangleEnableEXT},
+    {"vkCmdSetDiscardRectangleModeEXT", vkCmdSetDiscardRectangleModeEXT},
     {"vkCmdSetEvent", vkCmdSetEvent},
     {"vkCmdSetEvent2", vkCmdSetEvent2},
     {"vkCmdSetEvent2KHR", vkCmdSetEvent2KHR},
+    {"vkCmdSetExclusiveScissorEnableNV", vkCmdSetExclusiveScissorEnableNV},
     {"vkCmdSetExclusiveScissorNV", vkCmdSetExclusiveScissorNV},
     {"vkCmdSetExtraPrimitiveOverestimationSizeEXT", vkCmdSetExtraPrimitiveOverestimationSizeEXT},
     {"vkCmdSetFragmentShadingRateEnumNV", vkCmdSetFragmentShadingRateEnumNV},

dlls/winevulkan/loader_thunks.h

@@ -3,7 +3,7 @@
  * This file is generated from Vulkan vk.xml file covered
  * by the following copyright and permission notice:
  *
- * Copyright 2015-2022 The Khronos Group Inc.
+ * Copyright 2015-2023 The Khronos Group Inc.
  *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
@@ -190,9 +190,12 @@ enum unix_call
     unix_vkCmdSetDeviceMask,
     unix_vkCmdSetDeviceMaskKHR,
     unix_vkCmdSetDiscardRectangleEXT,
+    unix_vkCmdSetDiscardRectangleEnableEXT,
+    unix_vkCmdSetDiscardRectangleModeEXT,
     unix_vkCmdSetEvent,
     unix_vkCmdSetEvent2,
     unix_vkCmdSetEvent2KHR,
+    unix_vkCmdSetExclusiveScissorEnableNV,
     unix_vkCmdSetExclusiveScissorNV,
     unix_vkCmdSetExtraPrimitiveOverestimationSizeEXT,
     unix_vkCmdSetFragmentShadingRateEnumNV,
@@ -1893,6 +1896,18 @@ struct vkCmdSetDiscardRectangleEXT_params
     const VkRect2D *pDiscardRectangles;
 };
 
+struct vkCmdSetDiscardRectangleEnableEXT_params
+{
+    VkCommandBuffer commandBuffer;
+    VkBool32 discardRectangleEnable;
+};
+
+struct vkCmdSetDiscardRectangleModeEXT_params
+{
+    VkCommandBuffer commandBuffer;
+    VkDiscardRectangleModeEXT discardRectangleMode;
+};
+
 struct vkCmdSetEvent_params
 {
     VkCommandBuffer commandBuffer;
@@ -1914,6 +1929,14 @@ struct vkCmdSetEvent2KHR_params
     const VkDependencyInfo *pDependencyInfo;
 };
 
+struct vkCmdSetExclusiveScissorEnableNV_params
+{
+    VkCommandBuffer commandBuffer;
+    uint32_t firstExclusiveScissor;
+    uint32_t exclusiveScissorCount;
+    const VkBool32 *pExclusiveScissorEnables;
+};
+
 struct vkCmdSetExclusiveScissorNV_params
 {
     VkCommandBuffer commandBuffer;

dlls/winevulkan/make_vulkan

@@ -65,7 +65,7 @@ from enum import Enum
 LOGGER = logging.Logger("vulkan")
 LOGGER.addHandler(logging.StreamHandler())
 
-VK_XML_VERSION = "1.3.240"
+VK_XML_VERSION = "1.3.242"
 WINE_VK_VERSION = (1, 3)
 
 # Filenames to create.
@@ -1713,7 +1713,7 @@ class VkParam(VkVariable):
                 self.format_conv = "wine_dbgstr_longlong({0})"
             elif self.type == "HANDLE":
                 self.format_str = "%p"
-            elif self.type in ["VisualID", "xcb_visualid_t", "RROutput", "zx_handle_t"]:
+            elif self.type in ["VisualID", "xcb_visualid_t", "RROutput", "zx_handle_t", "NvSciBufObj", "NvSciBufAttrList", "NvSciSyncAttrList"]:
                 # Don't care about specific types for non-Windows platforms.
                 self.format_str = ""
             else:

dlls/winevulkan/vulkan_thunks.h

@@ -3,7 +3,7 @@
  * This file is generated from Vulkan vk.xml file covered
  * by the following copyright and permission notice:
  *
- * Copyright 2015-2022 The Khronos Group Inc.
+ * Copyright 2015-2023 The Khronos Group Inc.
  *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
@@ -233,9 +233,12 @@ struct vulkan_device_funcs
     void (*p_vkCmdSetDeviceMask)(VkCommandBuffer, uint32_t);
     void (*p_vkCmdSetDeviceMaskKHR)(VkCommandBuffer, uint32_t);
     void (*p_vkCmdSetDiscardRectangleEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkRect2D *);
+    void (*p_vkCmdSetDiscardRectangleEnableEXT)(VkCommandBuffer, VkBool32);
+    void (*p_vkCmdSetDiscardRectangleModeEXT)(VkCommandBuffer, VkDiscardRectangleModeEXT);
     void (*p_vkCmdSetEvent)(VkCommandBuffer, VkEvent, VkPipelineStageFlags);
     void (*p_vkCmdSetEvent2)(VkCommandBuffer, VkEvent, const VkDependencyInfo *);
     void (*p_vkCmdSetEvent2KHR)(VkCommandBuffer, VkEvent, const VkDependencyInfo *);
+    void (*p_vkCmdSetExclusiveScissorEnableNV)(VkCommandBuffer, uint32_t, uint32_t, const VkBool32 *);
     void (*p_vkCmdSetExclusiveScissorNV)(VkCommandBuffer, uint32_t, uint32_t, const VkRect2D *);
     void (*p_vkCmdSetExtraPrimitiveOverestimationSizeEXT)(VkCommandBuffer, float);
     void (*p_vkCmdSetFragmentShadingRateEnumNV)(VkCommandBuffer, VkFragmentShadingRateNV, const VkFragmentShadingRateCombinerOpKHR[2]);
@@ -761,9 +764,12 @@ struct vulkan_instance_funcs
     USE_VK_FUNC(vkCmdSetDeviceMask) \
     USE_VK_FUNC(vkCmdSetDeviceMaskKHR) \
     USE_VK_FUNC(vkCmdSetDiscardRectangleEXT) \
+    USE_VK_FUNC(vkCmdSetDiscardRectangleEnableEXT) \
+    USE_VK_FUNC(vkCmdSetDiscardRectangleModeEXT) \
     USE_VK_FUNC(vkCmdSetEvent) \
     USE_VK_FUNC(vkCmdSetEvent2) \
     USE_VK_FUNC(vkCmdSetEvent2KHR) \
+    USE_VK_FUNC(vkCmdSetExclusiveScissorEnableNV) \
     USE_VK_FUNC(vkCmdSetExclusiveScissorNV) \
     USE_VK_FUNC(vkCmdSetExtraPrimitiveOverestimationSizeEXT) \
     USE_VK_FUNC(vkCmdSetFragmentShadingRateEnumNV) \

dlls/winevulkan/winevulkan.json

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

dlls/winevulkan/winevulkan.spec

@@ -3,7 +3,7 @@
 # This file is generated from Vulkan vk.xml file covered
 # by the following copyright and permission notice:
 #
-# Copyright 2015-2022 The Khronos Group Inc.
+# Copyright 2015-2023 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
@@ -172,6 +172,7 @@
 @ stdcall vkGetBufferMemoryRequirements(ptr int64 ptr)
 @ stdcall vkGetBufferMemoryRequirements2(ptr ptr ptr)
 @ stdcall vkGetBufferOpaqueCaptureAddress(ptr ptr)
+@ stub vkGetCommandPoolMemoryConsumption
 @ stdcall vkGetDescriptorSetLayoutSupport(ptr ptr ptr)
 @ stdcall vkGetDeviceBufferMemoryRequirements(ptr ptr ptr)
 @ stdcall vkGetDeviceGroupPeerMemoryFeatures(ptr long long long ptr)
@@ -188,6 +189,7 @@
 @ stub vkGetDisplayPlaneCapabilitiesKHR
 @ stub vkGetDisplayPlaneSupportedDisplaysKHR
 @ stdcall vkGetEventStatus(ptr int64)
+@ stub vkGetFaultData
 @ stdcall vkGetFenceStatus(ptr int64)
 @ stdcall vkGetImageMemoryRequirements(ptr int64 ptr)
 @ stdcall vkGetImageMemoryRequirements2(ptr ptr ptr)

include/wine/vulkan_driver.h

@@ -3,7 +3,7 @@
  * This file is generated from Vulkan vk.xml file covered
  * by the following copyright and permission notice:
  *
- * Copyright 2015-2022 The Khronos Group Inc.
+ * Copyright 2015-2023 The Khronos Group Inc.
  *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *