openharmony/third_party_vulkan-loader
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_vulkan-loader synced 2024-11-27 09:21:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

header: Update to version 1.1.71 of the Vulkan hdr

Browse Source 
- updated vulkan_core.h
- updated vulkan-android.h
- updated vk.xml
- updated validusage.json
- updated layer json files
- updated vulkan.hpp
- updated vuid_mapping.py
- marked 27 VUIDs as complete

Change-Id: Ia5abee76e5346b3a1b769664033d91403946f7a9
This commit is contained in:
Mark Lobodzinski 2018-03-20 13:44:19 -06:00
parent 299b31902c
commit c32d82fbd0
7 changed files with 1111 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1112
scripts/validusage.json
View File

File diff suppressed because it is too large Load Diff

92
scripts/vk.xml
View File

@ -136,7 +136,7 @@ private version is maintained in the 1.0 branch of the member gitlab server.
<type category="define">// Vulkan 1.1 version number
#define <name>VK_API_VERSION_1_1</name> <type>VK_MAKE_VERSION</type>(1, 1, 0)// Patch version should always be set to 0</type>
<type category="define">// Version of this file
#define <name>VK_HEADER_VERSION</name> 70</type>
#define <name>VK_HEADER_VERSION</name> 71</type>
<type category="define">
#define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T* object;</type>
@ -156,6 +156,7 @@ private version is maintained in the 1.0 branch of the member gitlab server.
</type>
<type category="define">struct <name>ANativeWindow</name>;</type>
<type category="define">struct <name>AHardwareBuffer</name>;</type>
<type category="basetype">typedef <type>uint32_t</type> <name>VkSampleMask</name>;</type>
<type category="basetype">typedef <type>uint32_t</type> <name>VkBool32</name>;</type>
@ -2929,6 +2930,44 @@ private version is maintained in the 1.0 branch of the member gitlab server.
<member><type>void</type>* <name>pNext</name></member>
<member><type>uint32_t</type> <name>maxVertexAttribDivisor</name><comment>max value of vertex attribute divisor</comment></member>
</type>
<type category="struct" name="VkImportAndroidHardwareBufferInfoANDROID" structextends="VkMemoryAllocateInfo">
<member values="VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID"><type>VkStructureType</type> <name>sType</name></member>
<member>const <type>void</type>* <name>pNext</name></member>
<member>struct <type>AHardwareBuffer</type>* <name>buffer</name></member>
</type>
<type category="struct" name="VkAndroidHardwareBufferUsageANDROID" structextends="VkImageFormatProperties2" returnedonly="true">
<member values="VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_USAGE_ANDROID"><type>VkStructureType</type> <name>sType</name></member>
<member><type>void</type>* <name>pNext</name></member>
<member><type>uint64_t</type> <name>androidHardwareBufferUsage</name></member>
</type>
<type category="struct" name="VkAndroidHardwareBufferPropertiesANDROID" returnedonly="true">
<member values="VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID"><type>VkStructureType</type> <name>sType</name></member>
<member><type>void</type>* <name>pNext</name></member>
<member><type>VkDeviceSize</type> <name>allocationSize</name></member>
<member><type>uint32_t</type> <name>memoryTypeBits</name></member>
</type>
<type category="struct" name="VkMemoryGetAndroidHardwareBufferInfoANDROID">
<member values="VK_STRUCTURE_TYPE_MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID"><type>VkStructureType</type> <name>sType</name></member>
<member>const <type>void</type>* <name>pNext</name></member>
<member><type>VkDeviceMemory</type> <name>memory</name></member>
</type>
<type category="struct" name="VkAndroidHardwareBufferFormatPropertiesANDROID" structextends="VkAndroidHardwareBufferPropertiesANDROID" returnedonly="true">
<member values="VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID"><type>VkStructureType</type> <name>sType</name></member>
<member><type>void</type>* <name>pNext</name></member>
<member><type>VkFormat</type> <name>format</name></member>
<member><type>uint64_t</type> <name>externalFormat</name></member>
<member><type>VkFormatFeatureFlags</type> <name>formatFeatures</name></member>
<member><type>VkComponentMapping</type> <name>samplerYcbcrConversionComponents</name></member>
<member><type>VkSamplerYcbcrModelConversion</type> <name>suggestedYcbcrModel</name></member>
<member><type>VkSamplerYcbcrRange</type> <name>suggestedYcbcrRange</name></member>
<member><type>VkChromaLocation</type> <name>suggestedXChromaOffset</name></member>
<member><type>VkChromaLocation</type> <name>suggestedYChromaOffset</name></member>
</type>
<type category="struct" name="VkExternalFormatANDROID" structextends="VkImageCreateInfo,VkSamplerYcbcrConversionCreateInfo">
<member values="VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID"><type>VkStructureType</type> <name>sType</name></member>
<member><type>void</type>* <name>pNext</name></member>
<member><type>uint64_t</type> <name>externalFormat</name></member>
</type>
</types>
<comment>Vulkan enumerant (token) definitions</comment>
@ -5488,7 +5527,7 @@ private version is maintained in the 1.0 branch of the member gitlab server.
<param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param>
<param><type>VkFence</type>* <name>pFence</name></param>
</command>
<command successcodes="VK_SUCCESS,VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR">
<command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR">
<proto><type>VkResult</type> <name>vkGetSwapchainCounterEXT</name></proto>
<param><type>VkDevice</type> <name>device</name></param>
<param><type>VkSwapchainKHR</type> <name>swapchain</name></param>
@ -5862,6 +5901,18 @@ private version is maintained in the 1.0 branch of the member gitlab server.
<param><type>VkDeviceSize</type> <name>dstOffset</name></param>
<param><type>uint32_t</type> <name>marker</name></param>
</command>
<command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR">
<proto><type>VkResult</type> <name>vkGetAndroidHardwareBufferPropertiesANDROID</name></proto>
<param><type>VkDevice</type> <name>device</name></param>
<param>const struct <type>AHardwareBuffer</type>* <name>buffer</name></param>
<param><type>VkAndroidHardwareBufferPropertiesANDROID</type>* <name>pProperties</name></param>
</command>
<command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY">
<proto><type>VkResult</type> <name>vkGetMemoryAndroidHardwareBufferANDROID</name></proto>
<param><type>VkDevice</type> <name>device</name></param>
<param>const <type>VkMemoryGetAndroidHardwareBufferInfoANDROID</type>* <name>pInfo</name></param>
<param>struct <type>AHardwareBuffer</type>** <name>pBuffer</name></param>
</command>
</commands>
<feature api="vulkan" name="VK_VERSION_1_0" number="1.0" comment="Vulkan core API interface definitions">
@ -7102,7 +7153,7 @@ private version is maintained in the 1.0 branch of the member gitlab server.
</extension>
<extension name="VK_KHR_maintenance1" number="70" type="device" author="KHR" contact="Piers Daniell @pdaniell" supported="vulkan">
<require>
<enum value="1" name="VK_KHR_MAINTENANCE1_SPEC_VERSION"/>
<enum value="2" name="VK_KHR_MAINTENANCE1_SPEC_VERSION"/>
<enum value="&quot;VK_KHR_maintenance1&quot;" name="VK_KHR_MAINTENANCE1_EXTENSION_NAME"/>
<enum extends="VkResult" name="VK_ERROR_OUT_OF_POOL_MEMORY_KHR" alias="VK_ERROR_OUT_OF_POOL_MEMORY"/>
<enum extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR" alias="VK_FORMAT_FEATURE_TRANSFER_SRC_BIT"/>
@ -7287,12 +7338,10 @@ private version is maintained in the 1.0 branch of the member gitlab server.
<enum value="1" extends="VkDescriptorUpdateTemplateType" name="VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR" comment="Create descriptor update template for pushed descriptor updates"/>
</require>
</extension>
<extension name="VK_KHX_depth_stencil_layouts" number="82" type="device" author="KHR" contact="Piers Daniell @pdaniell" supported="disabled">
<extension name="VK_EXT_extension_82" number="82" type="device" author="EXT" contact="Piers Daniell @pdaniell" supported="disabled">
<require>
<enum value="1" name="VK_KHX_DEPTH_STENCIL_LAYOUTS_SPEC_VERSION"/>
<enum value="&quot;VK_KHX_depth_stencil_layouts&quot;" name="VK_KHX_DEPTH_STENCIL_LAYOUTS_EXTENSION_NAME"/>
<enum offset="0" extends="VkImageLayout" name="VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHX"/>
<enum offset="1" extends="VkImageLayout" name="VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHX"/>
<enum value="0" name="VK_EXT_EXTENSION_82_SPEC_VERSION"/>
<enum value="&quot;VK_EXT_extension_82&quot;" name="VK_EXT_EXTENSION_82_EXTENSION_NAME"/>
</require>
</extension>
<extension name="VK_KHR_extension_83" number="83" author="KHR" contact="Jan-Harald Fredriksen @janharald" supported="disabled">
@ -7828,10 +7877,25 @@ private version is maintained in the 1.0 branch of the member gitlab server.
<command name="vkSubmitDebugUtilsMessageEXT"/>
</require>
</extension>
<extension name="VK_KHR_extension_130" number="130" author="KHR" contact="Jesse Hall @jessehall" supported="disabled">
<extension name="VK_ANDROID_external_memory_android_hardware_buffer" number="130" type="device" author="ANDROID" requires="VK_KHR_sampler_ycbcr_conversion,VK_KHR_external_memory" platform="android" contact="Jesse Hall @jessehall" supported="vulkan">
<require>
<enum value="0" name="VK_KHR_EXTENSION_130_SPEC_VERSION"/>
<enum value="&quot;VK_KHR_extension_130&quot;" name="VK_KHR_EXTENSION_130_EXTENSION_NAME"/>
<enum value="3" name="VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_SPEC_VERSION"/>
<enum value="&quot;VK_ANDROID_external_memory_android_hardware_buffer&quot;" name="VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME"/>
<enum bitpos="10" extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID"/>
<enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_USAGE_ANDROID"/>
<enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID"/>
<enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID"/>
<enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID"/>
<enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID"/>
<enum offset="5" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID"/>
<type name="VkAndroidHardwareBufferUsageANDROID"/>
<type name="VkAndroidHardwareBufferPropertiesANDROID"/>
<type name="VkAndroidHardwareBufferFormatPropertiesANDROID"/>
<type name="VkImportAndroidHardwareBufferInfoANDROID"/>
<type name="VkMemoryGetAndroidHardwareBufferInfoANDROID"/>
<type name="VkExternalFormatANDROID"/>
<command name="vkGetAndroidHardwareBufferPropertiesANDROID"/>
<command name="vkGetMemoryAndroidHardwareBufferANDROID"/>
</require>
</extension>
<extension name="VK_EXT_sampler_filter_minmax" number="131" type="device" author="NV" requires="VK_KHR_get_physical_device_properties2" contact="Jeff Bolz @jbolz" supported="vulkan">
@ -8455,5 +8519,11 @@ private version is maintained in the 1.0 branch of the member gitlab server.
<enum value="&quot;VK_EXT_extension_197&quot;" name="VK_EXT_EXTENSION_197_EXTENSION_NAME"/>
</require>
</extension>
<extension name="VK_ARM_extension_198" number="198" author="Alexander Galazin" contact="@debater" supported="disabled">
<require>
<enum value="0" name="VK_ARM_EXTENSION_198_SPEC_VERSION"/>
<enum value="&quot;VK_EXT_extension_198&quot;" name="VK_ARM_EXTENSION_198_EXTENSION_NAME"/>
</require>
</extension>
</extensions>
</registry>

26
scripts/vuid_mapping.py
View File

@ -601,6 +601,23 @@ func_struct_id_map = {
'vkSubmitDebugUtilsMessageEXT' : 545,
'VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT' : 546,
'VkPipelineVertexInputDivisorStateCreateInfoEXT' : 547,
'VkExternalFormatANDROID' : 548,
'VkImportAndroidHardwareBufferInfoANDROID' : 549,
'VkMemoryGetAndroidHardwareBufferInfoANDROID' : 550,
'vkCmdEndDebugUtilsLabelEXT' : 551,
'vkDestroyDebugUtilsMessengerEXT' : 552,
'vkGetAndroidHardwareBufferPropertiesANDROID' : 553,
'vkQueueEndDebugUtilsLabelEXT' : 554,
'VkAndroidHardwareBufferUsageANDROID' : 555,
'VkAndroidHardwareBufferPropertiesANDROID' : 556,
'vkGetMemoryAndroidHardwareBufferANDROID' : 557,
'VkAndroidHardwareBufferFormatPropertiesANDROID' : 558,
'vkCmdBeginDebugUtilsLabelEXT' : 559,
'vkCmdInsertDebugUtilsLabelEXT' : 560,
'vkQueueBeginDebugUtilsLabelEXT' : 561,
'vkQueueInsertDebugUtilsLabelEXT' : 562,
'vkSetDebugUtilsObjectNameEXT' : 563,
'vkSetDebugUtilsObjectTagEXT' : 564,
### ADD New func/struct mappings above this line
}
# Mapping of params to unique IDs
@ -1129,6 +1146,15 @@ implicit_param_map = {
'messageTypes' : 521,
'vertexBindingDivisorCount' : 522,
'pVertexBindingDivisors' : 523,
'formatFeatures' : 524,
'suggestedYcbcrModel' : 525,
'suggestedYcbcrRange' : 526,
'suggestedXChromaOffset' : 527,
'suggestedYChromaOffset' : 528,
'pMessageIdName' : 529,
'pLabelInfo' : 530,
'messenger' : 531,
'pCallbackData' : 532,
### ADD New implicit param mappings above this line
}

2
tests/layers/linux/VkLayer_test.json
View File

@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_test",
"type": "GLOBAL",
"library_path": "./libVkLayer_test.so",
"api_version": "1.1.70",
"api_version": "1.1.71",
"implementation_version": "1",
"description": "LunarG Test Layer",
"enable_environment": {

2
tests/layers/linux/VkLayer_wrap_objects.json
View File

@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_wrap_objects",
"type": "GLOBAL",
"library_path": "./libVkLayer_wrap_objects.so",
"api_version": "1.1.70",
"api_version": "1.1.71",
"implementation_version": "1",
"description": "LunarG Dispatchable Object Wrapping Layer"
}

2
tests/layers/windows/VkLayer_test.json
View File

@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_test",
"type": "GLOBAL",
"library_path": ".\\libVkLayer_test.dll",
"api_version": "1.1.70",
"api_version": "1.1.71",
"implementation_version": "1",
"description": "LunarG Test Layer",
"enable_environment": {

2
tests/layers/windows/VkLayer_wrap_objects.json
View File

@ -4,7 +4,7 @@
"name": "VK_LAYER_LUNARG_wrap_objects",
"type": "GLOBAL",
"library_path": ".\\VkLayer_wrap_objects.dll",
"api_version": "1.1.70",
"api_version": "1.1.71",
"implementation_version": "1",
"description": "LunarG Dispatchable Object Wrapping Layer"
}