From 2c4bbf3f049e561125501baab93c79d149d49394 Mon Sep 17 00:00:00 2001 From: Mark Young Date: Fri, 7 Jul 2017 07:59:56 -0600 Subject: header: Update to 1.0.54 Vulkan release Update the headers and xml file with the latest spec changes for Vulkan 1.0.54. Also, make corresponding loader and layer changes to support the new extensions. Change-Id: I11273c5e3e828743f904e4f0b4b2f2c3a7804df0 --- scripts/helper_file_generator.py | 7 +- scripts/loader_extension_generator.py | 5 +- scripts/unique_objects_generator.py | 3 + scripts/vk.xml | 849 ++++++++++++++++++++++------------ scripts/vuid_mapping.py | 102 ++-- 5 files changed, 634 insertions(+), 332 deletions(-) (limited to 'scripts') diff --git a/scripts/helper_file_generator.py b/scripts/helper_file_generator.py index 27f4440b..895075bb 100644 --- a/scripts/helper_file_generator.py +++ b/scripts/helper_file_generator.py @@ -667,10 +667,7 @@ class HelperFileOutputGenerator(OutputGenerator): done = True break if done == False: - if object_type == 'kVulkanObjectTypeDebugReportCallbackEXT': - object_types_header += ' VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT, // kVulkanObjectTypeDebugReportCallbackEXT\n' - else: - object_types_header += ' VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT; // No Match\n' + object_types_header += ' VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // No Match\n' object_types_header += '};\n' # Output a conversion routine from the layer object definitions to the core object type definitions @@ -688,7 +685,7 @@ class HelperFileOutputGenerator(OutputGenerator): done = True break if done == False: - object_types_header += ' VK_OBJECT_TYPE_UNKNOWN; // No Match\n' + object_types_header += ' VK_OBJECT_TYPE_UNKNOWN, // No Match\n' object_types_header += '};\n' return object_types_header diff --git a/scripts/loader_extension_generator.py b/scripts/loader_extension_generator.py index d9169140..84cc4ca4 100644 --- a/scripts/loader_extension_generator.py +++ b/scripts/loader_extension_generator.py @@ -848,7 +848,10 @@ class LoaderExtensionOutputGenerator(OutputGenerator): 'vkGetPhysicalDeviceSurfaceCapabilities2EXT', 'vkReleaseDisplayEXT', 'vkAcquireXlibDisplayEXT', - 'vkGetRandROutputDisplayEXT'] + 'vkGetRandROutputDisplayEXT', + 'vkGetPhysicalDeviceExternalBufferPropertiesKHR', + 'vkGetPhysicalDeviceExternalSemaphorePropertiesKHR', + 'vkGetPhysicalDeviceExternalFencePropertiesKHR'] for ext_cmd in self.ext_commands: if (ext_cmd.ext_name in WSI_EXT_NAMES or diff --git a/scripts/unique_objects_generator.py b/scripts/unique_objects_generator.py index 7effe03f..3af26fb0 100644 --- a/scripts/unique_objects_generator.py +++ b/scripts/unique_objects_generator.py @@ -147,6 +147,9 @@ class UniqueObjectsOutputGenerator(OutputGenerator): 'vkCmdPushDescriptorSetWithTemplateKHR', 'vkDebugMarkerSetObjectTagEXT', 'vkDebugMarkerSetObjectNameEXT', + 'vkGetPhysicalDeviceDisplayProperties2KHR', + 'vkGetPhysicalDeviceDisplayPlaneProperties2KHR', + 'vkGetDisplayModeProperties2KHR', ] # Commands shadowed by interface functions and are not implemented self.interface_functions = [ diff --git a/scripts/vk.xml b/scripts/vk.xml index 3959ca6f..3e0010bc 100644 --- a/scripts/vk.xml +++ b/scripts/vk.xml @@ -106,7 +106,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. // Vulkan 1.0 version number #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) // Version of this file -#define VK_HEADER_VERSION 53 +#define VK_HEADER_VERSION 54 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -129,6 +129,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. typedef uint32_t VkBool32; typedef uint32_t VkFlags; typedef uint64_t VkDeviceSize; + @@ -227,10 +228,14 @@ private version is maintained in the 1.0 branch of the member gitlab server. typedef VkFlags VkCommandPoolTrimFlagsKHR; typedef VkFlags VkExternalMemoryHandleTypeFlagsNV; typedef VkFlags VkExternalMemoryFeatureFlagsNV; - typedef VkFlags VkExternalMemoryHandleTypeFlagsKHX; - typedef VkFlags VkExternalMemoryFeatureFlagsKHX; - typedef VkFlags VkExternalSemaphoreHandleTypeFlagsKHX; - typedef VkFlags VkExternalSemaphoreFeatureFlagsKHX; + typedef VkFlags VkExternalMemoryHandleTypeFlagsKHR; + typedef VkFlags VkExternalMemoryFeatureFlagsKHR; + typedef VkFlags VkExternalSemaphoreHandleTypeFlagsKHR; + typedef VkFlags VkExternalSemaphoreFeatureFlagsKHR; + typedef VkFlags VkSemaphoreImportFlagsKHR; + typedef VkFlags VkExternalFenceHandleTypeFlagsKHR; + typedef VkFlags VkExternalFenceFeatureFlagsKHR; + typedef VkFlags VkFenceImportFlagsKHR; typedef VkFlags VkSurfaceCounterFlagsEXT; typedef VkFlags VkPipelineViewportSwizzleStateCreateFlagsNV; typedef VkFlags VkPipelineDiscardRectangleStateCreateFlagsEXT; @@ -384,10 +389,14 @@ private version is maintained in the 1.0 branch of the member gitlab server. - - - - + + + + + + + + @@ -533,7 +542,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkDeviceCreateFlags flags uint32_t queueCreateInfoCount const VkDeviceQueueCreateInfo* pQueueCreateInfos @@ -545,7 +554,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkInstanceCreateFlags flags const VkApplicationInfo* pApplicationInfo uint32_t enabledLayerCount @@ -567,7 +576,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkDeviceSize allocationSize uint32_t memoryTypeIndex @@ -650,7 +659,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkBufferCreateFlags flags VkDeviceSize size VkBufferUsageFlags usage @@ -716,7 +725,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkImageCreateFlags flags VkImageType imageType VkFormat format @@ -929,7 +938,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkPipelineViewportStateCreateFlags flags uint32_t viewportCount const VkViewport* pViewports @@ -1014,7 +1023,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkPipelineCreateFlags flags uint32_t stageCount const VkPipelineShaderStageCreateInfo* pStages @@ -1168,7 +1177,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkRenderPassCreateFlags flags uint32_t attachmentCount const VkAttachmentDescription* pAttachments @@ -1184,7 +1193,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkFenceCreateFlags flags @@ -1370,7 +1379,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkSemaphoreCreateFlags flags @@ -1412,7 +1421,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t waitSemaphoreCount const VkSemaphore* pWaitSemaphores const VkPipelineStageFlags* pWaitDstStageMask @@ -1544,7 +1553,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkSwapchainCreateFlagsKHR flags VkSurfaceKHR surface uint32_t minImageCount @@ -1769,12 +1778,12 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - void* pNext + void* pNext VkPhysicalDeviceFeatures features VkStructureType sType - void* pNext + void* pNext VkPhysicalDeviceProperties properties @@ -1784,12 +1793,12 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - void* pNext + void* pNext VkImageFormatProperties imageFormatProperties VkStructureType sType - const void* pNext + const void* pNext VkFormat format VkImageType type VkImageTiling tiling @@ -1840,87 +1849,107 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkExtent2D extent uint32_t layer - - VkExternalMemoryFeatureFlagsKHX externalMemoryFeatures - VkExternalMemoryHandleTypeFlagsKHX exportFromImportedHandleTypes - VkExternalMemoryHandleTypeFlagsKHX compatibleHandleTypes + + VkStructureType sType + void* pNext + VkBool32 variablePointersStorageBuffer + VkBool32 variablePointers + + + VkExternalMemoryFeatureFlagsKHR externalMemoryFeatures + VkExternalMemoryHandleTypeFlagsKHR exportFromImportedHandleTypes + VkExternalMemoryHandleTypeFlagsKHR compatibleHandleTypes - - VkStructureType sType + + VkStructureType sType const void* pNext - VkExternalMemoryHandleTypeFlagBitsKHX handleType + VkExternalMemoryHandleTypeFlagBitsKHR handleType - - VkStructureType sType + + VkStructureType sType void* pNext - VkExternalMemoryPropertiesKHX externalMemoryProperties + VkExternalMemoryPropertiesKHR externalMemoryProperties - - VkStructureType sType + + VkStructureType sType const void* pNext VkBufferCreateFlags flags VkBufferUsageFlags usage - VkExternalMemoryHandleTypeFlagBitsKHX handleType + VkExternalMemoryHandleTypeFlagBitsKHR handleType - - VkStructureType sType + + VkStructureType sType void* pNext - VkExternalMemoryPropertiesKHX externalMemoryProperties + VkExternalMemoryPropertiesKHR externalMemoryProperties - - VkStructureType sType + + VkStructureType sType void* pNext uint8_t deviceUUID[VK_UUID_SIZE] uint8_t driverUUID[VK_UUID_SIZE] - uint8_t deviceLUID[VK_LUID_SIZE_KHX] + uint8_t deviceLUID[VK_LUID_SIZE_KHR] + uint32_t deviceNodeMask VkBool32 deviceLUIDValid - - VkStructureType sType + + VkStructureType sType const void* pNext - VkExternalMemoryHandleTypeFlagsKHX handleTypes + VkExternalMemoryHandleTypeFlagsKHR handleTypes - - VkStructureType sType + + VkStructureType sType const void* pNext - VkExternalMemoryHandleTypeFlagsKHX handleTypes + VkExternalMemoryHandleTypeFlagsKHR handleTypes - - VkStructureType sType + + VkStructureType sType const void* pNext - VkExternalMemoryHandleTypeFlagsKHX handleTypes + VkExternalMemoryHandleTypeFlagsKHR handleTypes - - VkStructureType sType + + VkStructureType sType const void* pNext - VkExternalMemoryHandleTypeFlagBitsKHX handleType - HANDLE handle + VkExternalMemoryHandleTypeFlagBitsKHR handleType + HANDLE handle + LPCWSTR name - - VkStructureType sType + + VkStructureType sType const void* pNext const SECURITY_ATTRIBUTES* pAttributes DWORD dwAccess LPCWSTR name - - VkStructureType sType + + VkStructureType sType void* pNext uint32_t memoryTypeBits - - VkStructureType sType + + VkStructureType sType const void* pNext - VkExternalMemoryHandleTypeFlagBitsKHX handleType + VkDeviceMemory memory + VkExternalMemoryHandleTypeFlagBitsKHR handleType + + + VkStructureType sType + const void* pNext + VkExternalMemoryHandleTypeFlagBitsKHR handleType int fd - - VkStructureType sType + + VkStructureType sType void* pNext uint32_t memoryTypeBits - - VkStructureType sType + + VkStructureType sType + const void* pNext + VkDeviceMemory memory + VkExternalMemoryHandleTypeFlagBitsKHR handleType + + + VkStructureType sType const void* pNext uint32_t acquireCount const VkDeviceMemory* pAcquireSyncs @@ -1930,52 +1959,120 @@ private version is maintained in the 1.0 branch of the member gitlab server. const VkDeviceMemory* pReleaseSyncs const uint64_t* pReleaseKeys - - VkStructureType sType + + VkStructureType sType const void* pNext - VkExternalSemaphoreHandleTypeFlagBitsKHX handleType + VkExternalSemaphoreHandleTypeFlagBitsKHR handleType - - VkStructureType sType + + VkStructureType sType void* pNext - VkExternalSemaphoreHandleTypeFlagsKHX exportFromImportedHandleTypes - VkExternalSemaphoreHandleTypeFlagsKHX compatibleHandleTypes - VkExternalSemaphoreFeatureFlagsKHX externalSemaphoreFeatures + VkExternalSemaphoreHandleTypeFlagsKHR exportFromImportedHandleTypes + VkExternalSemaphoreHandleTypeFlagsKHR compatibleHandleTypes + VkExternalSemaphoreFeatureFlagsKHR externalSemaphoreFeatures - - VkStructureType sType + + VkStructureType sType const void* pNext - VkExternalSemaphoreHandleTypeFlagsKHX handleTypes + VkExternalSemaphoreHandleTypeFlagsKHR handleTypes - - VkStructureType sType + + VkStructureType sType const void* pNext - VkSemaphore semaphore - VkExternalSemaphoreHandleTypeFlagsKHX handleType - HANDLE handle - - - VkStructureType sType + VkSemaphore semaphore + VkSemaphoreImportFlagsKHR flags + VkExternalSemaphoreHandleTypeFlagBitsKHR handleType + HANDLE handle + LPCWSTR name + + + VkStructureType sType const void* pNext const SECURITY_ATTRIBUTES* pAttributes DWORD dwAccess LPCWSTR name - - VkStructureType sType + + VkStructureType sType const void* pNext uint32_t waitSemaphoreValuesCount const uint64_t* pWaitSemaphoreValues uint32_t signalSemaphoreValuesCount const uint64_t* pSignalSemaphoreValues - - VkStructureType sType + + VkStructureType sType const void* pNext VkSemaphore semaphore - VkExternalSemaphoreHandleTypeFlagBitsKHX handleType + VkExternalSemaphoreHandleTypeFlagBitsKHR handleType + + + VkStructureType sType + const void* pNext + VkSemaphore semaphore + VkSemaphoreImportFlagsKHR flags + VkExternalSemaphoreHandleTypeFlagBitsKHR handleType int fd + + VkStructureType sType + const void* pNext + VkSemaphore semaphore + VkExternalSemaphoreHandleTypeFlagBitsKHR handleType + + + VkStructureType sType + const void* pNext + VkExternalFenceHandleTypeFlagBitsKHR handleType + + + VkStructureType sType + void* pNext + VkExternalFenceHandleTypeFlagsKHR exportFromImportedHandleTypes + VkExternalFenceHandleTypeFlagsKHR compatibleHandleTypes + VkExternalFenceFeatureFlagsKHR externalFenceFeatures + + + VkStructureType sType + const void* pNext + VkExternalFenceHandleTypeFlagsKHR handleTypes + + + VkStructureType sType + const void* pNext + VkFence fence + VkFenceImportFlagsKHR flags + VkExternalFenceHandleTypeFlagBitsKHR handleType + HANDLE handle + LPCWSTR name + + + VkStructureType sType + const void* pNext + const SECURITY_ATTRIBUTES* pAttributes + DWORD dwAccess + LPCWSTR name + + + VkStructureType sType + const void* pNext + VkFence fence + VkExternalFenceHandleTypeFlagBitsKHR handleType + + + VkStructureType sType + const void* pNext + VkFence fence + VkFenceImportFlagsKHR flags + VkExternalFenceHandleTypeFlagBitsKHR handleType + int fd + + + VkStructureType sType + const void* pNext + VkFence fence + VkExternalFenceHandleTypeFlagBitsKHR handleType + VkStructureType sType void* pNext @@ -2273,6 +2370,51 @@ private version is maintained in the 1.0 branch of the member gitlab server. void* pNext VkImageUsageFlags sharedPresentSupportedUsageFlags + + VkStructureType sType + void* pNext + VkBool32 storageBuffer16BitAccess + VkBool32 uniformAndStorageBuffer16BitAccess + VkBool32 storagePushConstant16 + VkBool32 storageInputOutput16 + + + VkStructureType sType + const void* pNext + VkBuffer buffer + + + VkStructureType sType + const void* pNext + VkImage image + + + VkStructureType sType + const void* pNext + VkImage image + + + VkStructureType sType + void* pNext + VkMemoryRequirements memoryRequirements + + + VkStructureType sType + void* pNext + VkSparseImageMemoryRequirements memoryRequirements + + + VkStructureType sType + void* pNext + VkBool32 prefersDedicatedAllocation + VkBool32 requiresDedicatedAllocation + + + VkStructureType sType + const void* pNext + VkImage image + VkBuffer buffer + VkStructureType sType void* pNext @@ -2335,7 +2477,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -2348,7 +2490,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -3216,30 +3358,46 @@ private version is maintained in the 1.0 branch of the member gitlab server. - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - + + + + + + + + + + + + + + + + + + + @@ -3432,7 +3590,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. all sname:VkQueue objects created from pname:device - + VkResult vkAllocateMemory VkDevice device const VkMemoryAllocateInfo* pAllocateInfo @@ -4656,68 +4814,92 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkCommandPoolTrimFlagsKHR flags - void vkGetPhysicalDeviceExternalBufferPropertiesKHX + void vkGetPhysicalDeviceExternalBufferPropertiesKHR VkPhysicalDevice physicalDevice - const VkPhysicalDeviceExternalBufferInfoKHX* pExternalBufferInfo - VkExternalBufferPropertiesKHX* pExternalBufferProperties + const VkPhysicalDeviceExternalBufferInfoKHR* pExternalBufferInfo + VkExternalBufferPropertiesKHR* pExternalBufferProperties - VkResult vkGetMemoryWin32HandleKHX + VkResult vkGetMemoryWin32HandleKHR VkDevice device - VkDeviceMemory memory - VkExternalMemoryHandleTypeFlagBitsKHX handleType + const VkMemoryGetWin32HandleInfoKHR* pGetWin32HandleInfo HANDLE* pHandle - - VkResult vkGetMemoryWin32HandlePropertiesKHX + + VkResult vkGetMemoryWin32HandlePropertiesKHR VkDevice device - VkExternalMemoryHandleTypeFlagBitsKHX handleType + VkExternalMemoryHandleTypeFlagBitsKHR handleType HANDLE handle - VkMemoryWin32HandlePropertiesKHX* pMemoryWin32HandleProperties + VkMemoryWin32HandlePropertiesKHR* pMemoryWin32HandleProperties - VkResult vkGetMemoryFdKHX + VkResult vkGetMemoryFdKHR VkDevice device - VkDeviceMemory memory - VkExternalMemoryHandleTypeFlagBitsKHX handleType + const VkMemoryGetFdInfoKHR* pGetFdInfo int* pFd - - VkResult vkGetMemoryFdPropertiesKHX + + VkResult vkGetMemoryFdPropertiesKHR VkDevice device - VkExternalMemoryHandleTypeFlagBitsKHX handleType + VkExternalMemoryHandleTypeFlagBitsKHR handleType int fd - VkMemoryFdPropertiesKHX* pMemoryFdProperties + VkMemoryFdPropertiesKHR* pMemoryFdProperties + + + void vkGetPhysicalDeviceExternalSemaphorePropertiesKHR + VkPhysicalDevice physicalDevice + const VkPhysicalDeviceExternalSemaphoreInfoKHR* pExternalSemaphoreInfo + VkExternalSemaphorePropertiesKHR* pExternalSemaphoreProperties + + + VkResult vkGetSemaphoreWin32HandleKHR + VkDevice device + const VkSemaphoreGetWin32HandleInfoKHR* pGetWin32HandleInfo + HANDLE* pHandle + + + VkResult vkImportSemaphoreWin32HandleKHR + VkDevice device + const VkImportSemaphoreWin32HandleInfoKHR* pImportSemaphoreWin32HandleInfo + + + VkResult vkGetSemaphoreFdKHR + VkDevice device + const VkSemaphoreGetFdInfoKHR* pGetFdInfo + int* pFd + + + VkResult vkImportSemaphoreFdKHR + VkDevice device + const VkImportSemaphoreFdInfoKHR* pImportSemaphoreFdInfo - void vkGetPhysicalDeviceExternalSemaphorePropertiesKHX + void vkGetPhysicalDeviceExternalFencePropertiesKHR VkPhysicalDevice physicalDevice - const VkPhysicalDeviceExternalSemaphoreInfoKHX* pExternalSemaphoreInfo - VkExternalSemaphorePropertiesKHX* pExternalSemaphoreProperties + const VkPhysicalDeviceExternalFenceInfoKHR* pExternalFenceInfo + VkExternalFencePropertiesKHR* pExternalFenceProperties - VkResult vkGetSemaphoreWin32HandleKHX + VkResult vkGetFenceWin32HandleKHR VkDevice device - VkSemaphore semaphore - VkExternalSemaphoreHandleTypeFlagBitsKHX handleType + const VkFenceGetWin32HandleInfoKHR* pGetWin32HandleInfo HANDLE* pHandle - - VkResult vkImportSemaphoreWin32HandleKHX + + VkResult vkImportFenceWin32HandleKHR VkDevice device - const VkImportSemaphoreWin32HandleInfoKHX* pImportSemaphoreWin32HandleInfo + const VkImportFenceWin32HandleInfoKHR* pImportFenceWin32HandleInfo - VkResult vkGetSemaphoreFdKHX + VkResult vkGetFenceFdKHR VkDevice device - VkSemaphore semaphore - VkExternalSemaphoreHandleTypeFlagBitsKHX handleType + const VkFenceGetFdInfoKHR* pGetFdInfo int* pFd - - VkResult vkImportSemaphoreFdKHX + + VkResult vkImportFenceFdKHR VkDevice device - const VkImportSemaphoreFdInfoKHX* pImportSemaphoreFdInfo + const VkImportFenceFdInfoKHR* pImportFenceFdInfo VkResult vkReleaseDisplayEXT @@ -4930,6 +5112,25 @@ private version is maintained in the 1.0 branch of the member gitlab server. uint32_t* pSurfaceFormatCount VkSurfaceFormat2KHR* pSurfaceFormats + + void vkGetBufferMemoryRequirements2KHR + VkDevice device + const VkBufferMemoryRequirementsInfo2KHR* pInfo + VkMemoryRequirements2KHR* pMemoryRequirements + + + void vkGetImageMemoryRequirements2KHR + VkDevice device + const VkImageMemoryRequirementsInfo2KHR* pInfo + VkMemoryRequirements2KHR* pMemoryRequirements + + + void vkGetImageSparseMemoryRequirements2KHR + VkDevice device + const VkImageSparseMemoryRequirementsInfo2KHR* pInfo + uint32_t* pSparseMemoryRequirementCount + VkSparseImageMemoryRequirements2KHR* pSparseMemoryRequirements + @@ -5826,124 +6027,134 @@ private version is maintained in the 1.0 branch of the member gitlab server. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5968,10 +6179,12 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + + + @@ -6275,28 +6488,57 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + + + + + + + + + + + + - + - - + + + + + + - + - - + + + + + + + + + + - + - - + + + + + + + + @@ -6331,10 +6573,12 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + + + @@ -6381,10 +6625,14 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + + + + + @@ -6411,10 +6659,10 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + @@ -6501,10 +6749,23 @@ private version is maintained in the 1.0 branch of the member gitlab server. - - - - + + + + + + + + + + + + + + + + + diff --git a/scripts/vuid_mapping.py b/scripts/vuid_mapping.py index 78c620fd..65165d60 100644 --- a/scripts/vuid_mapping.py +++ b/scripts/vuid_mapping.py @@ -79,7 +79,7 @@ func_struct_id_map = { 'VkComponentMapping' : 23, 'VkComputePipelineCreateInfo' : 24, 'VkCopyDescriptorSet' : 25, -'VkD3D12FenceSubmitInfoKHX' : 26, +'VkD3D12FenceSubmitInfoKHR' : 26, 'VkDebugMarkerMarkerInfoEXT' : 27, 'VkDebugMarkerObjectNameInfoEXT' : 28, 'VkDebugMarkerObjectTagInfoEXT' : 29, @@ -117,14 +117,14 @@ func_struct_id_map = { 'VkDrawIndexedIndirectCommand' : 61, 'VkDrawIndirectCommand' : 62, 'VkEventCreateInfo' : 63, -'VkExportMemoryAllocateInfoKHX' : 64, +'VkExportMemoryAllocateInfoKHR' : 64, 'VkExportMemoryAllocateInfoNV' : 65, -'VkExportMemoryWin32HandleInfoKHX' : 66, +'VkExportMemoryWin32HandleInfoKHR' : 66, 'VkExportMemoryWin32HandleInfoNV' : 67, -'VkExportSemaphoreCreateInfoKHX' : 68, -'VkExportSemaphoreWin32HandleInfoKHX' : 69, -'VkExternalMemoryBufferCreateInfoKHX' : 70, -'VkExternalMemoryImageCreateInfoKHX' : 71, +'VkExportSemaphoreCreateInfoKHR' : 68, +'VkExportSemaphoreWin32HandleInfoKHR' : 69, +'VkExternalMemoryBufferCreateInfoKHR' : 70, +'VkExternalMemoryImageCreateInfoKHR' : 71, 'VkExternalMemoryImageCreateInfoNV' : 72, 'VkFenceCreateInfo' : 73, 'VkFramebufferCreateInfo' : 74, @@ -140,11 +140,11 @@ func_struct_id_map = { 'VkImageSubresourceRange' : 84, 'VkImageSwapchainCreateInfoKHX' : 85, 'VkImageViewCreateInfo' : 86, -'VkImportMemoryFdInfoKHX' : 87, -'VkImportMemoryWin32HandleInfoKHX' : 88, +'VkImportMemoryFdInfoKHR' : 87, +'VkImportMemoryWin32HandleInfoKHR' : 88, 'VkImportMemoryWin32HandleInfoNV' : 89, -'VkImportSemaphoreFdInfoKHX' : 90, -'VkImportSemaphoreWin32HandleInfoKHX' : 91, +'VkImportSemaphoreFdInfoKHR' : 90, +'VkImportSemaphoreWin32HandleInfoKHR' : 91, 'VkIndirectCommandsLayoutCreateInfoNVX' : 92, 'VkIndirectCommandsLayoutTokenNVX' : 93, 'VkIndirectCommandsTokenNVX' : 94, @@ -163,9 +163,9 @@ func_struct_id_map = { 'VkObjectTablePushConstantEntryNVX' : 107, 'VkObjectTableVertexBufferEntryNVX' : 108, 'VkPhysicalDeviceDiscardRectanglePropertiesEXT' : 109, -'VkPhysicalDeviceExternalBufferInfoKHX' : 110, -'VkPhysicalDeviceExternalImageFormatInfoKHX' : 111, -'VkPhysicalDeviceExternalSemaphoreInfoKHX' : 112, +'VkPhysicalDeviceExternalBufferInfoKHR' : 110, +'VkPhysicalDeviceExternalImageFormatInfoKHR' : 111, +'VkPhysicalDeviceExternalSemaphoreInfoKHR' : 112, 'VkPhysicalDeviceFeatures' : 113, 'VkPhysicalDeviceFeatures2KHR' : 114, 'VkPhysicalDeviceImageFormatInfo2KHR' : 115, @@ -224,7 +224,7 @@ func_struct_id_map = { 'VkViewport' : 168, 'VkViewportSwizzleNV' : 169, 'VkWaylandSurfaceCreateInfoKHR' : 170, -'VkWin32KeyedMutexAcquireReleaseInfoKHX' : 171, +'VkWin32KeyedMutexAcquireReleaseInfoKHR' : 171, 'VkWin32KeyedMutexAcquireReleaseInfoNV' : 172, 'VkWin32SurfaceCreateInfoKHR' : 173, 'VkWriteDescriptorSet' : 174, @@ -394,17 +394,17 @@ func_struct_id_map = { 'vkGetImageSparseMemoryRequirements' : 338, 'vkGetImageSubresourceLayout' : 339, 'vkGetInstanceProcAddr' : 340, -'vkGetMemoryFdKHX' : 341, -'vkGetMemoryFdPropertiesKHX' : 342, -'vkGetMemoryWin32HandleKHX' : 343, +'vkGetMemoryFdKHR' : 341, +'vkGetMemoryFdPropertiesKHR' : 342, +'vkGetMemoryWin32HandleKHR' : 343, 'vkGetMemoryWin32HandleNV' : 344, -'vkGetMemoryWin32HandlePropertiesKHX' : 345, +'vkGetMemoryWin32HandlePropertiesKHR' : 345, 'vkGetPastPresentationTimingGOOGLE' : 346, 'vkGetPhysicalDeviceDisplayPlanePropertiesKHR' : 347, 'vkGetPhysicalDeviceDisplayPropertiesKHR' : 348, -'vkGetPhysicalDeviceExternalBufferPropertiesKHX' : 349, +'vkGetPhysicalDeviceExternalBufferPropertiesKHR' : 349, 'vkGetPhysicalDeviceExternalImageFormatPropertiesNV' : 350, -'vkGetPhysicalDeviceExternalSemaphorePropertiesKHX' : 351, +'vkGetPhysicalDeviceExternalSemaphorePropertiesKHR' : 351, 'vkGetPhysicalDeviceFeatures' : 352, 'vkGetPhysicalDeviceFeatures2KHR' : 353, 'vkGetPhysicalDeviceFormatProperties' : 354, @@ -438,13 +438,13 @@ func_struct_id_map = { 'vkGetRandROutputDisplayEXT' : 382, 'vkGetRefreshCycleDurationGOOGLE' : 383, 'vkGetRenderAreaGranularity' : 384, -'vkGetSemaphoreFdKHX' : 385, -'vkGetSemaphoreWin32HandleKHX' : 386, +'vkGetSemaphoreFdKHR' : 385, +'vkGetSemaphoreWin32HandleKHR' : 386, 'vkGetSwapchainCounterEXT' : 387, 'vkGetSwapchainImagesKHR' : 388, 'vkGetSwapchainStatusKHR' : 389, -'vkImportSemaphoreFdKHX' : 390, -'vkImportSemaphoreWin32HandleKHX' : 391, +'vkImportSemaphoreFdKHR' : 390, +'vkImportSemaphoreWin32HandleKHR' : 391, 'vkInvalidateMappedMemoryRanges' : 392, 'vkMapMemory' : 393, 'vkMergePipelineCaches' : 394, @@ -475,21 +475,21 @@ func_struct_id_map = { 'VkPhysicalDeviceMemoryProperties2KHR' : 419, 'VkSurfaceCapabilities2KHR' : 420, 'VkDeviceGroupPresentCapabilitiesKHX' : 421, -'VkExternalBufferPropertiesKHX' : 422, -'VkMemoryWin32HandlePropertiesKHX' : 423, -'VkMemoryFdPropertiesKHX' : 424, -'VkExternalSemaphorePropertiesKHX' : 425, +'VkExternalBufferPropertiesKHR' : 422, +'VkMemoryWin32HandlePropertiesKHR' : 423, +'VkMemoryFdPropertiesKHR' : 424, +'VkExternalSemaphorePropertiesKHR' : 425, 'VkQueueFamilyProperties2KHR' : 426, 'VkSparseImageFormatProperties2KHR' : 427, 'VkSurfaceFormat2KHR' : 428, 'VkTextureLODGatherFormatPropertiesAMD' : 429, 'VkPhysicalDeviceMultiviewPropertiesKHX' : 430, 'VkPhysicalDeviceGroupPropertiesKHX' : 431, -'VkExternalImageFormatPropertiesKHX' : 432, -'VkPhysicalDeviceIDPropertiesKHX' : 433, +'VkExternalImageFormatPropertiesKHR' : 432, +'VkPhysicalDeviceIDPropertiesKHR' : 433, 'VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX' : 434, 'VkHdrMetadataEXT' : 435, -'VkExternalMemoryPropertiesKHX' : 436, +'VkExternalMemoryPropertiesKHR' : 436, 'VkFormatProperties' : 437, 'VkImageFormatProperties' : 438, 'VkPhysicalDeviceLimits' : 439, @@ -511,6 +511,35 @@ func_struct_id_map = { 'VkSamplerReductionModeCreateInfoEXT' : 455, 'VkPhysicalDeviceProperties' : 456, 'VkSurfaceFormatKHR' : 457, +'VkExportFenceCreateInfoKHR' : 458, +'VkPhysicalDeviceExternalFenceInfoKHR' : 459, +'VkExternalFencePropertiesKHR' : 460, +'vkGetPhysicalDeviceExternalFencePropertiesKHR' : 461, +'VkImportFenceFdInfoKHR' : 462, +'VkFenceGetFdInfoKHR' : 463, +'vkImportFenceFdKHR' : 464, +'vkGetFenceFdKHR' : 465, +'VkImportFenceWin32HandleInfoKHR' : 466, +'VkExportFenceWin32HandleInfoKHR' : 467, +'VkFenceGetWin32HandleInfoKHR' : 468, +'vkImportFenceWin32HandleKHR' : 469, +'vkGetFenceWin32HandleKHR' : 470, +'VkSemaphoreGetFdInfoKHR' : 471, +'VkSemaphoreGetWin32HandleInfoKHR' : 472, +'VkMemoryGetFdInfoKHR' : 473, +'VkMemoryGetWin32HandleInfoKHR' : 474, +'VkMemoryDedicatedRequirementsKHR' : 475, +'VkMemoryDedicatedAllocateInfoKHR' : 476, +'VkBufferMemoryRequirementsInfo2KHR' : 477, +'VkImageMemoryRequirementsInfo2KHR' : 478, +'VkImageSparseMemoryRequirementsInfo2KHR' : 479, +'VkMemoryRequirements2KHR' : 480, +'VkSparseImageMemoryRequirements2KHR' : 481, +'vkGetImageMemoryRequirements2KHR' : 482, +'vkGetBufferMemoryRequirements2KHR' : 483, +'vkGetImageSparseMemoryRequirements2KHR' : 484, +'VkPhysicalDevice16BitStorageFeaturesKHR' : 485, +'VkPhysicalDeviceVariablePointerFeaturesKHR' : 486, ### ADD New func/struct mappings above this line } # Mapping of params to unique IDs @@ -976,6 +1005,15 @@ implicit_param_map = { 'blendConstants' : 458, 'displayName' : 459, 'pfnCallback' : 460, +'externalFenceFeatures' : 461, +'pInfo' : 462, +'pGetFdInfo' : 463, +'pGetWin32HandleInfo' : 464, +'pExternalFenceInfo' : 465, +'pExternalFenceProperties' : 466, +'pImportFenceProperties' : 467, +'pImportFenceFdInfo' : 468, +'pImportFenceWin32HandleInfo' : 469, ### ADD New implicit param mappings above this line } -- cgit v1.2.3