winevulkan: Generate code for supported core commands.

dlls/vulkan-1/vulkan-1.spec

@@ -41,9 +41,9 @@
 @ stdcall vkAllocateMemory(ptr ptr ptr ptr) winevulkan.wine_vkAllocateMemory
 @ stdcall vkBeginCommandBuffer(ptr ptr) winevulkan.wine_vkBeginCommandBuffer
 @ stdcall vkBindBufferMemory(ptr int64 int64 int64) winevulkan.wine_vkBindBufferMemory
-@ stub vkBindBufferMemory2
+@ stdcall vkBindBufferMemory2(ptr long ptr) winevulkan.wine_vkBindBufferMemory2
 @ stdcall vkBindImageMemory(ptr int64 int64 int64) winevulkan.wine_vkBindImageMemory
-@ stub vkBindImageMemory2
+@ stdcall vkBindImageMemory2(ptr long ptr) winevulkan.wine_vkBindImageMemory2
 @ stdcall vkCmdBeginQuery(ptr int64 long long) winevulkan.wine_vkCmdBeginQuery
 @ stdcall vkCmdBeginRenderPass(ptr ptr long) winevulkan.wine_vkCmdBeginRenderPass
 @ stdcall vkCmdBindDescriptorSets(ptr long int64 long long ptr long ptr) winevulkan.wine_vkCmdBindDescriptorSets
@@ -96,7 +96,7 @@
 @ stdcall vkCreateComputePipelines(ptr int64 long ptr ptr ptr) winevulkan.wine_vkCreateComputePipelines
 @ stdcall vkCreateDescriptorPool(ptr ptr ptr ptr) winevulkan.wine_vkCreateDescriptorPool
 @ stdcall vkCreateDescriptorSetLayout(ptr ptr ptr ptr) winevulkan.wine_vkCreateDescriptorSetLayout
-@ stub vkCreateDescriptorUpdateTemplate
+@ stdcall vkCreateDescriptorUpdateTemplate(ptr ptr ptr ptr) winevulkan.wine_vkCreateDescriptorUpdateTemplate
 @ stdcall vkCreateDevice(ptr ptr ptr ptr) winevulkan.wine_vkCreateDevice
 @ stub vkCreateDisplayModeKHR
 @ stub vkCreateDisplayPlaneSurfaceKHR
@@ -112,7 +112,7 @@
 @ stdcall vkCreateQueryPool(ptr ptr ptr ptr) winevulkan.wine_vkCreateQueryPool
 @ stdcall vkCreateRenderPass(ptr ptr ptr ptr) winevulkan.wine_vkCreateRenderPass
 @ stdcall vkCreateSampler(ptr ptr ptr ptr) winevulkan.wine_vkCreateSampler
-@ stub vkCreateSamplerYcbcrConversion
+@ stdcall vkCreateSamplerYcbcrConversion(ptr ptr ptr ptr) winevulkan.wine_vkCreateSamplerYcbcrConversion
 @ stdcall vkCreateSemaphore(ptr ptr ptr ptr) winevulkan.wine_vkCreateSemaphore
 @ stdcall vkCreateShaderModule(ptr ptr ptr ptr) winevulkan.wine_vkCreateShaderModule
 @ stub vkCreateSharedSwapchainsKHR
@@ -123,7 +123,7 @@
 @ stdcall vkDestroyCommandPool(ptr int64 ptr) winevulkan.wine_vkDestroyCommandPool
 @ stdcall vkDestroyDescriptorPool(ptr int64 ptr) winevulkan.wine_vkDestroyDescriptorPool
 @ stdcall vkDestroyDescriptorSetLayout(ptr int64 ptr) winevulkan.wine_vkDestroyDescriptorSetLayout
-@ stub vkDestroyDescriptorUpdateTemplate
+@ stdcall vkDestroyDescriptorUpdateTemplate(ptr int64 ptr) winevulkan.wine_vkDestroyDescriptorUpdateTemplate
 @ stdcall vkDestroyDevice(ptr ptr) winevulkan.wine_vkDestroyDevice
 @ stdcall vkDestroyEvent(ptr int64 ptr) winevulkan.wine_vkDestroyEvent
 @ stdcall vkDestroyFence(ptr int64 ptr) winevulkan.wine_vkDestroyFence
@@ -137,7 +137,7 @@
 @ stdcall vkDestroyQueryPool(ptr int64 ptr) winevulkan.wine_vkDestroyQueryPool
 @ stdcall vkDestroyRenderPass(ptr int64 ptr) winevulkan.wine_vkDestroyRenderPass
 @ stdcall vkDestroySampler(ptr int64 ptr) winevulkan.wine_vkDestroySampler
-@ stub vkDestroySamplerYcbcrConversion
+@ stdcall vkDestroySamplerYcbcrConversion(ptr int64 ptr) winevulkan.wine_vkDestroySamplerYcbcrConversion
 @ stdcall vkDestroySemaphore(ptr int64 ptr) winevulkan.wine_vkDestroySemaphore
 @ stdcall vkDestroyShaderModule(ptr int64 ptr) winevulkan.wine_vkDestroyShaderModule
 @ stdcall vkDestroySurfaceKHR(ptr int64 ptr) winevulkan.wine_vkDestroySurfaceKHR
@@ -156,8 +156,8 @@
 @ stdcall vkFreeDescriptorSets(ptr int64 long ptr) winevulkan.wine_vkFreeDescriptorSets
 @ stdcall vkFreeMemory(ptr int64 ptr) winevulkan.wine_vkFreeMemory
 @ stdcall vkGetBufferMemoryRequirements(ptr int64 ptr) winevulkan.wine_vkGetBufferMemoryRequirements
-@ stub vkGetBufferMemoryRequirements2
-@ stub vkGetDescriptorSetLayoutSupport
+@ stdcall vkGetBufferMemoryRequirements2(ptr ptr ptr) winevulkan.wine_vkGetBufferMemoryRequirements2
+@ stdcall vkGetDescriptorSetLayoutSupport(ptr ptr ptr) winevulkan.wine_vkGetDescriptorSetLayoutSupport
 @ stub vkGetDeviceGroupPeerMemoryFeatures
 @ stub vkGetDeviceGroupPresentCapabilitiesKHR
 @ stub vkGetDeviceGroupSurfacePresentModesKHR
@@ -171,9 +171,9 @@
 @ stdcall vkGetEventStatus(ptr int64) winevulkan.wine_vkGetEventStatus
 @ stdcall vkGetFenceStatus(ptr int64) winevulkan.wine_vkGetFenceStatus
 @ stdcall vkGetImageMemoryRequirements(ptr int64 ptr) winevulkan.wine_vkGetImageMemoryRequirements
-@ stub vkGetImageMemoryRequirements2
+@ stdcall vkGetImageMemoryRequirements2(ptr ptr ptr) winevulkan.wine_vkGetImageMemoryRequirements2
 @ stdcall vkGetImageSparseMemoryRequirements(ptr int64 ptr ptr) winevulkan.wine_vkGetImageSparseMemoryRequirements
-@ stub vkGetImageSparseMemoryRequirements2
+@ stdcall vkGetImageSparseMemoryRequirements2(ptr ptr ptr ptr) winevulkan.wine_vkGetImageSparseMemoryRequirements2
 @ stdcall vkGetImageSubresourceLayout(ptr int64 ptr ptr) winevulkan.wine_vkGetImageSubresourceLayout
 @ stdcall vkGetInstanceProcAddr(ptr str)
 @ stub vkGetPhysicalDeviceDisplayPlanePropertiesKHR
@@ -182,20 +182,20 @@
 @ stub vkGetPhysicalDeviceExternalFenceProperties
 @ stub vkGetPhysicalDeviceExternalSemaphoreProperties
 @ stdcall vkGetPhysicalDeviceFeatures(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceFeatures
-@ stub vkGetPhysicalDeviceFeatures2
+@ stdcall vkGetPhysicalDeviceFeatures2(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceFeatures2
 @ stdcall vkGetPhysicalDeviceFormatProperties(ptr long ptr) winevulkan.wine_vkGetPhysicalDeviceFormatProperties
-@ stub vkGetPhysicalDeviceFormatProperties2
+@ stdcall vkGetPhysicalDeviceFormatProperties2(ptr long ptr) winevulkan.wine_vkGetPhysicalDeviceFormatProperties2
 @ stdcall vkGetPhysicalDeviceImageFormatProperties(ptr long long long long long ptr) winevulkan.wine_vkGetPhysicalDeviceImageFormatProperties
-@ stub vkGetPhysicalDeviceImageFormatProperties2
+@ stdcall vkGetPhysicalDeviceImageFormatProperties2(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceImageFormatProperties2
 @ stdcall vkGetPhysicalDeviceMemoryProperties(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceMemoryProperties
-@ stub vkGetPhysicalDeviceMemoryProperties2
+@ stdcall vkGetPhysicalDeviceMemoryProperties2(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceMemoryProperties2
 @ stub vkGetPhysicalDevicePresentRectanglesKHR
 @ stdcall vkGetPhysicalDeviceProperties(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceProperties
-@ stub vkGetPhysicalDeviceProperties2
+@ stdcall vkGetPhysicalDeviceProperties2(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceProperties2
 @ stdcall vkGetPhysicalDeviceQueueFamilyProperties(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceQueueFamilyProperties
-@ stub vkGetPhysicalDeviceQueueFamilyProperties2
+@ stdcall vkGetPhysicalDeviceQueueFamilyProperties2(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceQueueFamilyProperties2
 @ stdcall vkGetPhysicalDeviceSparseImageFormatProperties(ptr long long long long long ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSparseImageFormatProperties
-@ stub vkGetPhysicalDeviceSparseImageFormatProperties2
+@ stdcall vkGetPhysicalDeviceSparseImageFormatProperties2(ptr ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSparseImageFormatProperties2
 @ stdcall vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR
 @ stdcall vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceFormatsKHR
 @ stdcall vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr long) winevulkan.wine_vkGetPhysicalDeviceSurfacePresentModesKHR
@@ -218,8 +218,8 @@
 @ stdcall vkResetEvent(ptr int64) winevulkan.wine_vkResetEvent
 @ stdcall vkResetFences(ptr long ptr) winevulkan.wine_vkResetFences
 @ stdcall vkSetEvent(ptr int64) winevulkan.wine_vkSetEvent
-@ stub vkTrimCommandPool
+@ stdcall vkTrimCommandPool(ptr int64 long) winevulkan.wine_vkTrimCommandPool
 @ stdcall vkUnmapMemory(ptr int64) winevulkan.wine_vkUnmapMemory
-@ stub vkUpdateDescriptorSetWithTemplate
+@ stdcall vkUpdateDescriptorSetWithTemplate(ptr int64 int64 ptr) winevulkan.wine_vkUpdateDescriptorSetWithTemplate
 @ stdcall vkUpdateDescriptorSets(ptr long ptr long ptr) winevulkan.wine_vkUpdateDescriptorSets
 @ stdcall vkWaitForFences(ptr long ptr long int64) winevulkan.wine_vkWaitForFences

dlls/winevulkan/make_vulkan

@@ -377,7 +377,7 @@ class VkEnumValue(object):
 
 
 class VkFunction(object):
-    def __init__(self, _type=None, name=None, params=[], extensions=[], alias=False):
+    def __init__(self, _type=None, name=None, params=[], extensions=[], alias=None):
         self.extensions = []
         self.name = name
         self.type = _type
@@ -409,7 +409,7 @@ class VkFunction(object):
         func_type = alias.type
         params = alias.params
 
-        return VkFunction(_type=func_type, name=func_name, params=params, alias=True)
+        return VkFunction(_type=func_type, name=func_name, params=params, alias=alias)
 
     @staticmethod
     def from_xml(command, types):
@@ -440,7 +440,7 @@ class VkFunction(object):
         return conversions
 
     def is_alias(self):
-        return self.alias
+        return bool(self.alias)
 
     def is_core_func(self):
         """ Returns whether the function is a Vulkan core function.
@@ -2364,6 +2364,9 @@ class VkRegistry(object):
                 struct = type_info["data"]
                 mark_struct_dependencies(struct, self.types)
 
+        if func.is_alias():
+            func.alias.required = True
+
     def _parse_commands(self, root):
         """ Parse command section containing the Vulkan function calls. """
         funcs = {}

dlls/winevulkan/winevulkan.spec

@@ -43,9 +43,9 @@
 @ stdcall wine_vkAllocateMemory(ptr ptr ptr ptr)
 @ stdcall wine_vkBeginCommandBuffer(ptr ptr)
 @ stdcall wine_vkBindBufferMemory(ptr int64 int64 int64)
-@ stub vkBindBufferMemory2
+@ stdcall wine_vkBindBufferMemory2(ptr long ptr)
 @ stdcall wine_vkBindImageMemory(ptr int64 int64 int64)
-@ stub vkBindImageMemory2
+@ stdcall wine_vkBindImageMemory2(ptr long ptr)
 @ stdcall wine_vkCmdBeginQuery(ptr int64 long long)
 @ stdcall wine_vkCmdBeginRenderPass(ptr ptr long)
 @ stdcall wine_vkCmdBindDescriptorSets(ptr long int64 long long ptr long ptr)
@@ -98,7 +98,7 @@
 @ stdcall wine_vkCreateComputePipelines(ptr int64 long ptr ptr ptr)
 @ stdcall wine_vkCreateDescriptorPool(ptr ptr ptr ptr)
 @ stdcall wine_vkCreateDescriptorSetLayout(ptr ptr ptr ptr)
-@ stub vkCreateDescriptorUpdateTemplate
+@ stdcall wine_vkCreateDescriptorUpdateTemplate(ptr ptr ptr ptr)
 @ stdcall wine_vkCreateDevice(ptr ptr ptr ptr)
 @ stub vkCreateDisplayModeKHR
 @ stub vkCreateDisplayPlaneSurfaceKHR
@@ -114,7 +114,7 @@
 @ stdcall wine_vkCreateQueryPool(ptr ptr ptr ptr)
 @ stdcall wine_vkCreateRenderPass(ptr ptr ptr ptr)
 @ stdcall wine_vkCreateSampler(ptr ptr ptr ptr)
-@ stub vkCreateSamplerYcbcrConversion
+@ stdcall wine_vkCreateSamplerYcbcrConversion(ptr ptr ptr ptr)
 @ stdcall wine_vkCreateSemaphore(ptr ptr ptr ptr)
 @ stdcall wine_vkCreateShaderModule(ptr ptr ptr ptr)
 @ stub vkCreateSharedSwapchainsKHR
@@ -125,7 +125,7 @@
 @ stdcall wine_vkDestroyCommandPool(ptr int64 ptr)
 @ stdcall wine_vkDestroyDescriptorPool(ptr int64 ptr)
 @ stdcall wine_vkDestroyDescriptorSetLayout(ptr int64 ptr)
-@ stub vkDestroyDescriptorUpdateTemplate
+@ stdcall wine_vkDestroyDescriptorUpdateTemplate(ptr int64 ptr)
 @ stdcall wine_vkDestroyDevice(ptr ptr)
 @ stdcall wine_vkDestroyEvent(ptr int64 ptr)
 @ stdcall wine_vkDestroyFence(ptr int64 ptr)
@@ -139,7 +139,7 @@
 @ stdcall wine_vkDestroyQueryPool(ptr int64 ptr)
 @ stdcall wine_vkDestroyRenderPass(ptr int64 ptr)
 @ stdcall wine_vkDestroySampler(ptr int64 ptr)
-@ stub vkDestroySamplerYcbcrConversion
+@ stdcall wine_vkDestroySamplerYcbcrConversion(ptr int64 ptr)
 @ stdcall wine_vkDestroySemaphore(ptr int64 ptr)
 @ stdcall wine_vkDestroyShaderModule(ptr int64 ptr)
 @ stdcall wine_vkDestroySurfaceKHR(ptr int64 ptr)
@@ -157,8 +157,8 @@
 @ stdcall wine_vkFreeDescriptorSets(ptr int64 long ptr)
 @ stdcall wine_vkFreeMemory(ptr int64 ptr)
 @ stdcall wine_vkGetBufferMemoryRequirements(ptr int64 ptr)
-@ stub vkGetBufferMemoryRequirements2
-@ stub vkGetDescriptorSetLayoutSupport
+@ stdcall wine_vkGetBufferMemoryRequirements2(ptr ptr ptr)
+@ stdcall wine_vkGetDescriptorSetLayoutSupport(ptr ptr ptr)
 @ stub vkGetDeviceGroupPeerMemoryFeatures
 @ stub vkGetDeviceGroupPresentCapabilitiesKHR
 @ stub vkGetDeviceGroupSurfacePresentModesKHR
@@ -172,9 +172,9 @@
 @ stdcall wine_vkGetEventStatus(ptr int64)
 @ stdcall wine_vkGetFenceStatus(ptr int64)
 @ stdcall wine_vkGetImageMemoryRequirements(ptr int64 ptr)
-@ stub vkGetImageMemoryRequirements2
+@ stdcall wine_vkGetImageMemoryRequirements2(ptr ptr ptr)
 @ stdcall wine_vkGetImageSparseMemoryRequirements(ptr int64 ptr ptr)
-@ stub vkGetImageSparseMemoryRequirements2
+@ stdcall wine_vkGetImageSparseMemoryRequirements2(ptr ptr ptr ptr)
 @ stdcall wine_vkGetImageSubresourceLayout(ptr int64 ptr ptr)
 @ stdcall wine_vkGetInstanceProcAddr(ptr str)
 @ stub vkGetPhysicalDeviceDisplayPlanePropertiesKHR
@@ -183,20 +183,20 @@
 @ stub vkGetPhysicalDeviceExternalFenceProperties
 @ stub vkGetPhysicalDeviceExternalSemaphoreProperties
 @ stdcall wine_vkGetPhysicalDeviceFeatures(ptr ptr)
-@ stub vkGetPhysicalDeviceFeatures2
+@ stdcall wine_vkGetPhysicalDeviceFeatures2(ptr ptr)
 @ stdcall wine_vkGetPhysicalDeviceFormatProperties(ptr long ptr)
-@ stub vkGetPhysicalDeviceFormatProperties2
+@ stdcall wine_vkGetPhysicalDeviceFormatProperties2(ptr long ptr)
 @ stdcall wine_vkGetPhysicalDeviceImageFormatProperties(ptr long long long long long ptr)
-@ stub vkGetPhysicalDeviceImageFormatProperties2
+@ stdcall wine_vkGetPhysicalDeviceImageFormatProperties2(ptr ptr ptr)
 @ stdcall wine_vkGetPhysicalDeviceMemoryProperties(ptr ptr)
-@ stub vkGetPhysicalDeviceMemoryProperties2
+@ stdcall wine_vkGetPhysicalDeviceMemoryProperties2(ptr ptr)
 @ stub vkGetPhysicalDevicePresentRectanglesKHR
 @ stdcall wine_vkGetPhysicalDeviceProperties(ptr ptr)
-@ stub vkGetPhysicalDeviceProperties2
+@ stdcall wine_vkGetPhysicalDeviceProperties2(ptr ptr)
 @ stdcall wine_vkGetPhysicalDeviceQueueFamilyProperties(ptr ptr ptr)
-@ stub vkGetPhysicalDeviceQueueFamilyProperties2
+@ stdcall wine_vkGetPhysicalDeviceQueueFamilyProperties2(ptr ptr ptr)
 @ stdcall wine_vkGetPhysicalDeviceSparseImageFormatProperties(ptr long long long long long ptr ptr)
-@ stub vkGetPhysicalDeviceSparseImageFormatProperties2
+@ stdcall wine_vkGetPhysicalDeviceSparseImageFormatProperties2(ptr ptr ptr ptr)
 @ stdcall wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr)
 @ stdcall wine_vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr)
 @ stdcall wine_vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr long)
@@ -219,8 +219,8 @@
 @ stdcall wine_vkResetEvent(ptr int64)
 @ stdcall wine_vkResetFences(ptr long ptr)
 @ stdcall wine_vkSetEvent(ptr int64)
-@ stub vkTrimCommandPool
+@ stdcall wine_vkTrimCommandPool(ptr int64 long)
 @ stdcall wine_vkUnmapMemory(ptr int64)
-@ stub vkUpdateDescriptorSetWithTemplate
+@ stdcall wine_vkUpdateDescriptorSetWithTemplate(ptr int64 int64 ptr)
 @ stdcall wine_vkUpdateDescriptorSets(ptr long ptr long ptr)
 @ stdcall wine_vkWaitForFences(ptr long ptr long int64)