From 888eefd6fd1fd50fa4f235f547755cf01ae88371 Mon Sep 17 00:00:00 2001 From: Lenny Komow Date: Mon, 18 Sep 2017 17:07:00 -0600 Subject: build: Update for 1.0.61.0 SDK Change-Id: I4b1f0289dace648153b6efdbfea0d83d37b28e60 --- scripts/object_tracker_generator.py | 2 +- scripts/parameter_validation_generator.py | 2 +- scripts/vk.xml | 285 ++++++++++++++++++++++++++---- scripts/vuid_mapping.py | 38 +++- 4 files changed, 282 insertions(+), 45 deletions(-) (limited to 'scripts') diff --git a/scripts/object_tracker_generator.py b/scripts/object_tracker_generator.py index 21dcb04a..5106bb46 100644 --- a/scripts/object_tracker_generator.py +++ b/scripts/object_tracker_generator.py @@ -242,7 +242,7 @@ class ObjectTrackerOutputGenerator(OutputGenerator): ] for vuid_filename in vuid_filename_locations: if os.path.isfile(vuid_filename): - self.vuid_file = open(vuid_filename, "r") + self.vuid_file = open(vuid_filename, "r", encoding="utf8") break if self.vuid_file == None: print("Error: Could not find vk_validation_error_messages.h") diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py index 23a54f69..032b9fd8 100644 --- a/scripts/parameter_validation_generator.py +++ b/scripts/parameter_validation_generator.py @@ -197,7 +197,7 @@ class ParameterValidationOutputGenerator(OutputGenerator): ] for vuid_filename in vuid_filename_locations: if os.path.isfile(vuid_filename): - self.vuid_file = open(vuid_filename, "r") + self.vuid_file = open(vuid_filename, "r", encoding="utf8") break if self.vuid_file == None: print("Error: Could not find vk_validation_error_messages.h") diff --git a/scripts/vk.xml b/scripts/vk.xml index 9e1c5fe6..e1c3f568 100644 --- a/scripts/vk.xml +++ b/scripts/vk.xml @@ -31,6 +31,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. + @@ -106,7 +107,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 60 +#define VK_HEADER_VERSION 61 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -274,6 +275,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(VkSamplerYcbcrConversionKHR) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkValidationCacheEXT) WSI extensions @@ -381,6 +383,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. + @@ -412,6 +415,10 @@ private version is maintained in the 1.0 branch of the member gitlab server. + + + + @@ -846,7 +853,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. const void* pNext VkShaderModuleCreateFlags flags size_t codeSizeSpecified in bytes - const uint32_t* pCodeBinary code of size codeSize + const uint32_t* pCodeBinary code of size codeSize uint32_t bindingBinding number for this entry @@ -974,7 +981,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkSampleCountFlagBits rasterizationSamplesNumber of samples used for rasterization VkBool32 sampleShadingEnableoptional (GL45) float minSampleShadingoptional (GL45) - const VkSampleMask* pSampleMaskArray of sampleMask words + const VkSampleMask* pSampleMaskArray of sampleMask words VkBool32 alphaToCoverageEnable VkBool32 alphaToOneEnable @@ -2151,21 +2158,29 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkMemoryAllocateFlagsKHX flags uint32_t deviceMask - - VkStructureType sType + + VkStructureType sType const void* pNext VkBuffer buffer VkDeviceMemory memory VkDeviceSize memoryOffset + + + VkStructureType sType + const void* pNext uint32_t deviceIndexCount const uint32_t* pDeviceIndices - - VkStructureType sType + + VkStructureType sType const void* pNext VkImage image - VkDeviceMemory memory + VkDeviceMemory memory VkDeviceSize memoryOffset + + + VkStructureType sType + const void* pNext uint32_t deviceIndexCount const uint32_t* pDeviceIndices uint32_t SFRRectCount @@ -2210,7 +2225,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. const void* pNext VkSwapchainKHR swapchain - + VkStructureType sType const void* pNext VkSwapchainKHR swapchain @@ -2356,6 +2371,17 @@ private version is maintained in the 1.0 branch of the member gitlab server. void* pNext VkBool32 perViewPositionAllComponents + + uint32_t subpass + uint32_t inputAttachmentIndex + VkImageAspectFlags aspectMask + + + VkStructureType sType + const void* pNext + uint32_t aspectReferenceCount + const VkInputAttachmentAspectReferenceKHR* pAspectReferences + VkStructureType sType const void* pNext @@ -2409,6 +2435,11 @@ private version is maintained in the 1.0 branch of the member gitlab server. void* pNext VkSparseImageMemoryRequirements memoryRequirements + + VkStructureType sType + void* pNext + VkPointClippingBehaviorKHR pointClippingBehavior + VkStructureType sType void* pNext @@ -2421,6 +2452,53 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkImage imageImage that this allocation will be bound to VkBuffer bufferBuffer that this allocation will be bound to + + VkStructureType sType + const void* pNext + VkImageUsageFlags usage + + + VkStructureType sType + const void* pNext + VkTessellationDomainOriginKHR domainOrigin + + + VkStructureType sType + const void* pNext + VkSamplerYcbcrConversionKHR conversion + + + VkStructureType sType + const void* pNext + VkFormat format + VkSamplerYcbcrModelConversionKHR ycbcrModel + VkSamplerYcbcrRangeKHR ycbcrRange + VkComponentMapping components + VkChromaLocationKHR xChromaOffset + VkChromaLocationKHR yChromaOffset + VkFilter chromaFilter + VkBool32 forceExplicitReconstruction + + + VkStructureType sType + const void* pNext + VkImageAspectFlagBits planeAspect + + + VkStructureType sType + const void* pNext + VkImageAspectFlagBits planeAspect + + + VkStructureType sType + void* pNext + VkBool32 samplerYcbcrConversionSampler color conversion supported + + + VkStructureType sType + void* pNext + uint32_t combinedImageSamplerDescriptorCount + VkStructureType sType void* pNext @@ -2523,6 +2601,12 @@ 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 + uint32_t viewFormatCount + const VkFormat* pViewFormats + VkStructureType sType const void* pNext @@ -3519,11 +3603,34 @@ private version is maintained in the 1.0 branch of the member gitlab server. + + + + + + + + + + + + + + + + + + + + + + + @@ -5004,7 +5111,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkResult vkRegisterDeviceEventEXT VkDevice device const VkDeviceEventInfoEXT* pDeviceEventInfo - const VkAllocationCallbacks* pAllocator + const VkAllocationCallbacks* pAllocator VkFence* pFence @@ -5012,7 +5119,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkDevice device VkDisplayKHR display const VkDisplayEventInfoEXT* pDisplayEventInfo - const VkAllocationCallbacks* pAllocator + const VkAllocationCallbacks* pAllocator VkFence* pFence @@ -5043,16 +5150,16 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkPeerMemoryFeatureFlagsKHX* pPeerMemoryFeatures - VkResult vkBindBufferMemory2KHX + VkResult vkBindBufferMemory2KHR VkDevice device uint32_t bindInfoCount - const VkBindBufferMemoryInfoKHX* pBindInfos + const VkBindBufferMemoryInfoKHR* pBindInfos - VkResult vkBindImageMemory2KHX + VkResult vkBindImageMemory2KHR VkDevice device uint32_t bindInfoCount - const VkBindImageMemoryInfoKHX* pBindInfos + const VkBindImageMemoryInfoKHR* pBindInfos void vkCmdSetDeviceMaskKHX @@ -5218,6 +5325,19 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkSparseImageMemoryRequirements2KHR* pSparseMemoryRequirements + VkResult vkCreateSamplerYcbcrConversionKHR + VkDevice device + const VkSamplerYcbcrConversionCreateInfoKHR* pCreateInfo + const VkAllocationCallbacks* pAllocator + VkSamplerYcbcrConversionKHR* pYcbcrConversion + + + void vkDestroySamplerYcbcrConversionKHR + VkDevice device + VkSamplerYcbcrConversionKHR ycbcrConversion + const VkAllocationCallbacks* pAllocator + + VkResult vkCreateValidationCacheEXT VkDevice device const VkValidationCacheCreateInfoEXT* pCreateInfo @@ -6004,11 +6124,11 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + offset 1 reserved for the old VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHX enum + offset 2 reserved for the old VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHX enum @@ -6019,22 +6139,24 @@ private version is maintained in the 1.0 branch of the member gitlab server. - - - - - + + + + + + + @@ -6658,10 +6780,25 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + + + + + + + + + + + + + + + + @@ -6896,10 +7033,12 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + + + @@ -7012,16 +7151,84 @@ 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 59022eef..284c58fb 100644 --- a/scripts/vuid_mapping.py +++ b/scripts/vuid_mapping.py @@ -59,8 +59,8 @@ func_struct_id_map = { 'VkApplicationInfo' : 3, 'VkAttachmentDescription' : 4, 'VkAttachmentReference' : 5, -'VkBindBufferMemoryInfoKHX' : 6, -'VkBindImageMemoryInfoKHX' : 7, +'VkBindBufferMemoryInfoKHR' : 6, +'VkBindImageMemoryInfoKHR' : 7, 'VkBindImageMemorySwapchainInfoKHX' : 8, 'VkBindSparseInfo' : 9, 'VkBufferCreateInfo' : 10, @@ -238,9 +238,9 @@ func_struct_id_map = { 'vkAllocateMemory' : 182, 'vkBeginCommandBuffer' : 183, 'vkBindBufferMemory' : 184, -'vkBindBufferMemory2KHX' : 185, +'vkBindBufferMemory2KHR' : 185, 'vkBindImageMemory' : 186, -'vkBindImageMemory2KHX' : 187, +'vkBindImageMemory2KHR' : 187, 'vkCmdBeginQuery' : 188, 'vkCmdBeginRenderPass' : 189, 'vkCmdBindDescriptorSets' : 190, @@ -555,6 +555,22 @@ func_struct_id_map = { 'vkMergeValidationCachesEXT' : 499, 'VkAttachmentSampleLocationsEXT' : 500, 'VkSubpassSampleLocationsEXT' : 501, +'VkPhysicalDevicePointClippingPropertiesKHR' : 502, +'VkInputAttachmentAspectReferenceKHR' : 503, +'VkRenderPassInputAttachmentAspectCreateInfoKHR' : 504, +'VkImageViewUsageCreateInfoKHR' : 505, +'VkPipelineTessellationDomainOriginStateCreateInfoKHR' : 506, +'VkImageFormatListCreateInfoKHR' : 507, +'VkSamplerYcbcrConversionCreateInfoKHR' : 508, +'VkBindImagePlaneMemoryInfoKHR' : 509, +'VkImagePlaneMemoryRequirementsInfoKHR' : 510, +'vkCreateSamplerYcbcrConversionKHR' : 511, +'VkBindBufferMemoryDeviceGroupInfoKHX' : 512, +'VkBindImageMemoryDeviceGroupInfoKHX' : 513, +'vkDestroySamplerYcbcrConversionKHR' : 514, +'VkPhysicalDeviceSamplerYcbcrConversionFeaturesKHR' : 515, +'VkSamplerYcbcrConversionImageFormatPropertiesKHR' : 516, +'VkSamplerYcbcrConversionInfoKHR' : 517, ### ADD New func/struct mappings above this line } # Mapping of params to unique IDs @@ -1045,6 +1061,20 @@ implicit_param_map = { 'sampleLocationsInfo' : 483, 'pSampleLocationsInfo' : 484, 'pMultisampleProperties' : 485, +'pointClippingBehavior' : 486, +'aspectReferenceCount' : 487, +'pAspectReferences' : 488, +'domainOrigin' : 489, +'ycbcrModel' : 490, +'ycbcrRange' : 491, +'xChromaOffset' : 492, +'yChromaOffset' : 493, +'chromaFilter' : 494, +'planeAspect' : 495, +'pYcbcrConversion' : 496, +'ycbcrConversion' : 497, +'pViewFormats' : 498, +'conversion' : 499, ### ADD New implicit param mappings above this line } -- cgit v1.2.3