From 342a870d6f0ba80d969268be3881ec9bb31142dd Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Tue, 5 Sep 2017 16:10:20 -0600 Subject: header: Update to 1.0.60 Change-Id: I118be4455c68800e27fd9b8293699037449f1413 --- scripts/vk.xml | 257 ++++++++++++++++++++++++++++++++++++++---------- scripts/vuid_mapping.py | 28 ++++++ 2 files changed, 231 insertions(+), 54 deletions(-) (limited to 'scripts') diff --git a/scripts/vk.xml b/scripts/vk.xml index f0a1cd62..9e1c5fe6 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)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 59 +#define VK_HEADER_VERSION 60 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -243,6 +243,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. typedef VkFlags VkPipelineDiscardRectangleStateCreateFlagsEXT; typedef VkFlags VkPipelineCoverageToColorStateCreateFlagsNV; typedef VkFlags VkPipelineCoverageModulationStateCreateFlagsNV; + typedef VkFlags VkValidationCacheCreateFlagsEXT; Types which can be void pointers or class pointers, selected at compile time VK_DEFINE_HANDLE(VkInstance) @@ -273,6 +274,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkObjectTableNVX) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkIndirectCommandsLayoutNVX) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorUpdateTemplateKHR) + VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkValidationCacheEXT) WSI extensions VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR) @@ -380,6 +382,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. + WSI extensions @@ -2436,6 +2439,54 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkBool32 filterMinmaxSingleComponentFormats VkBool32 filterMinmaxImageComponentMapping + + float x + float y + + + VkStructureType sType + const void* pNext + VkSampleCountFlagBits sampleLocationsPerPixel + VkExtent2D sampleLocationGridSize + uint32_t sampleLocationsCount + const VkSampleLocationEXT* pSampleLocations + + + uint32_t attachmentIndex + VkSampleLocationsInfoEXT sampleLocationsInfo + + + uint32_t subpassIndex + VkSampleLocationsInfoEXT sampleLocationsInfo + + + VkStructureType sType + const void* pNext + uint32_t attachmentInitialSampleLocationsCount + const VkAttachmentSampleLocationsEXT* pAttachmentInitialSampleLocations + uint32_t postSubpassSampleLocationsCount + const VkSubpassSampleLocationsEXT* pSubpassSampleLocations + + + VkStructureType sType + const void* pNext + VkBool32 sampleLocationsEnable + VkSampleLocationsInfoEXT sampleLocationsInfo + + + VkStructureType sType + void* pNext + VkSampleCountFlags sampleLocationSampleCounts + VkExtent2D maxSampleLocationGridSize + float sampleLocationCoordinateRange[2] + uint32_t sampleLocationSubPixelBits + VkBool32 variableSampleLocations + + + VkStructureType sType + void* pNext + VkExtent2D maxSampleLocationGridSize + VkStructureType sType const void* pNext @@ -2472,6 +2523,18 @@ private version is maintained in the 1.0 branch of the member gitlab server. uint32_t coverageModulationTableCount const float* pCoverageModulationTable + + VkStructureType sType + const void* pNext + VkValidationCacheCreateFlagsEXT flags + size_t initialDataSize + const void* pInitialData + + + VkStructureType sType + const void* pNext + VkValidationCacheEXT validationCache + Vulkan enumerant (token) definitions @@ -3317,6 +3380,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. + @@ -3471,6 +3535,9 @@ private version is maintained in the 1.0 branch of the member gitlab server. + + + @@ -5107,6 +5174,17 @@ private version is maintained in the 1.0 branch of the member gitlab server. uint32_t discardRectangleCount const VkRect2D* pDiscardRectangles + + void vkCmdSetSampleLocationsEXT + VkCommandBuffer commandBuffer + const VkSampleLocationsInfoEXT* pSampleLocationsInfo + + + void vkGetPhysicalDeviceMultisamplePropertiesEXT + VkPhysicalDevice physicalDevice + VkSampleCountFlagBits samples + VkMultisamplePropertiesEXT* pMultisampleProperties + VkResult vkGetPhysicalDeviceSurfaceCapabilities2KHR VkPhysicalDevice physicalDevice @@ -5139,6 +5217,33 @@ private version is maintained in the 1.0 branch of the member gitlab server. uint32_t* pSparseMemoryRequirementCount VkSparseImageMemoryRequirements2KHR* pSparseMemoryRequirements + + VkResult vkCreateValidationCacheEXT + VkDevice device + const VkValidationCacheCreateInfoEXT* pCreateInfo + const VkAllocationCallbacks* pAllocator + VkValidationCacheEXT* pValidationCache + + + void vkDestroyValidationCacheEXT + VkDevice device + VkValidationCacheEXT validationCache + const VkAllocationCallbacks* pAllocator + + + VkResult vkGetValidationCacheDataEXT + VkDevice device + VkValidationCacheEXT validationCache + size_t* pDataSize + void* pData + + + VkResult vkMergeValidationCachesEXT + VkDevice device + VkValidationCacheEXT dstCache + uint32_t srcCacheCount + const VkValidationCacheEXT* pSrcCaches + @@ -5367,7 +5472,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5382,7 +5487,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5399,7 +5504,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5425,7 +5530,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5435,7 +5540,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5446,7 +5551,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5457,7 +5562,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5468,7 +5573,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5479,7 +5584,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5489,7 +5594,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5536,7 +5641,6 @@ private version is maintained in the 1.0 branch of the member gitlab server. - @@ -5848,7 +5952,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5859,7 +5963,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5898,7 +6002,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -5909,18 +6013,11 @@ private version is maintained in the 1.0 branch of the member gitlab server. - - - - - - - @@ -5928,26 +6025,37 @@ private version is maintained in the 1.0 branch of the member gitlab server. - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -6065,7 +6173,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6081,7 +6189,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6095,7 +6203,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6130,7 +6238,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6146,7 +6254,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6282,7 +6390,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6302,7 +6410,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6360,7 +6468,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6439,7 +6547,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6479,7 +6587,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6628,7 +6736,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6692,16 +6800,16 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + - - + + @@ -6734,10 +6842,27 @@ private version is maintained in the 1.0 branch of the member gitlab server. - - - - + + + + + + + + + + + + + + + + + + + + + @@ -6911,10 +7036,22 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + + + + + + + + + + + + + @@ -6959,5 +7096,17 @@ 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 28bf188c..59022eef 100644 --- a/scripts/vuid_mapping.py +++ b/scripts/vuid_mapping.py @@ -540,6 +540,21 @@ func_struct_id_map = { 'vkGetImageSparseMemoryRequirements2KHR' : 484, 'VkPhysicalDevice16BitStorageFeaturesKHR' : 485, 'VkPhysicalDeviceVariablePointerFeaturesKHR' : 486, +'VkSampleLocationsInfoEXT' : 487, +'VkRenderPassSampleLocationsBeginInfoEXT' : 488, +'VkPipelineSampleLocationsStateCreateInfoEXT' : 489, +'VkPhysicalDeviceSampleLocationsPropertiesEXT' : 490, +'VkMultisamplePropertiesEXT' : 491, +'vkGetPhysicalDeviceMultisamplePropertiesEXT' : 492, +'VkValidationCacheCreateInfoEXT' : 493, +'VkShaderModuleValidationCacheCreateInfoEXT' : 494, +'vkCreateValidationCacheEXT' : 495, +'vkGetValidationCacheDataEXT' : 496, +'vkCmdSetSampleLocationsEXT' : 497, +'vkDestroyValidationCacheEXT' : 498, +'vkMergeValidationCachesEXT' : 499, +'VkAttachmentSampleLocationsEXT' : 500, +'VkSubpassSampleLocationsEXT' : 501, ### ADD New func/struct mappings above this line } # Mapping of params to unique IDs @@ -1017,6 +1032,19 @@ implicit_param_map = { 'basePipelineHandle' : 470, 'pImmutableSamplers' : 471, 'pTexelBufferView' : 472, +'sampleLocationsPerPixel' : 473, +'sampleLocationsCount' : 474, +'pSampleLocations' : 475, +'attachmentInitialSampleLocationsCount' : 476, +'pAttachmentInitialSampleLocations' : 477, +'postSubpassSampleLocationsCount' : 478, +'pSubpassSampleLocations' : 479, +'sampleLocationSampleCounts' : 480, +'pValidationCache' : 481, +'validationCache' : 482, +'sampleLocationsInfo' : 483, +'pSampleLocationsInfo' : 484, +'pMultisampleProperties' : 485, ### ADD New implicit param mappings above this line } -- cgit v1.2.3