diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2017-11-27 12:00:45 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2017-11-28 13:15:37 -0700 |
| commit | 67d12020496164151f5961190d860195d5da9c06 (patch) | |
| tree | 153fb37c9a213f2abce18c69a6836966840dc67f /scripts | |
| parent | 490a13ba461ae52ac561f7109929eb0e7faac9a4 (diff) | |
| download | usermoji-67d12020496164151f5961190d860195d5da9c06.tar.xz | |
header: Update to version 1.0.66 of the Vulkan hdr
- update vulkan.h
- update Lin/Win json file versions
- update vk.xml
- update vuid_mapping.py
- update vk_validation_error_messages.h
- update vk_validation_error_database.txt
- update vulkan.hpp
- fixed error in vk.xml, unofficially
Change-Id: Ia719bc069cb776c5b174f41667d591b43aaaf4d7
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/vk.xml | 71 | ||||
| -rw-r--r-- | scripts/vuid_mapping.py | 6 |
2 files changed, 62 insertions, 15 deletions
diff --git a/scripts/vk.xml b/scripts/vk.xml index f2f93b2d..c0869973 100644 --- a/scripts/vk.xml +++ b/scripts/vk.xml @@ -107,7 +107,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. <type category="define">// Vulkan 1.0 version number #define <name>VK_API_VERSION_1_0</name> <type>VK_MAKE_VERSION</type>(1, 0, 0)// Patch version should always be set to 0</type> <type category="define">// Version of this file -#define <name>VK_HEADER_VERSION</name> 65</type> +#define <name>VK_HEADER_VERSION</name> 66</type> <type category="define"> #define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T* object;</type> @@ -2646,6 +2646,22 @@ private version is maintained in the 1.0 branch of the member gitlab server. <member>const <type>void</type>* <name>pNext</name></member> <!-- Pointer to next structure --> <member><type>VkQueueGlobalPriorityEXT</type> <name>globalPriority</name></member> </type> + <type category="struct" name="VkImportMemoryHostPointerInfoEXT" structextends="VkMemoryAllocateInfo"> + <member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkExternalMemoryHandleTypeFlagBitsKHR</type> <name>handleType</name></member> + <member optional="false"><type>void</type>* <name>pHostPointer</name></member> + </type> + <type category="struct" name="VkMemoryHostPointerPropertiesEXT"> + <member values="VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>memoryTypeBits</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceExternalMemoryHostPropertiesEXT" structextends="VkPhysicalDeviceProperties2KHR"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkDeviceSize</type> <name>minImportedHostPointerAlignment</name></member> + </type> </types> <comment>Vulkan enumerant (token) definitions</comment> @@ -2667,6 +2683,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. <enum value="0" name="VK_FALSE"/> <enum value="(~0U)" name="VK_QUEUE_FAMILY_IGNORED"/> <enum value="(~0U-1)" name="VK_QUEUE_FAMILY_EXTERNAL_KHR"/> + <enum value="(~0U-2)" name="VK_QUEUE_FAMILY_FOREIGN_EXT"/> <enum value="(~0U)" name="VK_SUBPASS_EXTERNAL"/> <enum value="32" name="VK_MAX_DEVICE_GROUP_SIZE_KHX"/> </enums> @@ -3678,10 +3695,10 @@ private version is maintained in the 1.0 branch of the member gitlab server. <enum value="2" name="VK_SHADER_INFO_TYPE_DISASSEMBLY_AMD"/> </enums> <enums name="VkQueueGlobalPriorityEXT" type="enum"> - <enum value="128" name="VK_QUEUE_GLOBAL_PRIORITY_LOW"/> - <enum value="256" name="VK_QUEUE_GLOBAL_PRIORITY_MEDIUM"/> - <enum value="512" name="VK_QUEUE_GLOBAL_PRIORITY_HIGH"/> - <enum value="1024" name="VK_QUEUE_GLOBAL_PRIORITY_REALTIME"/> + <enum value="128" name="VK_QUEUE_GLOBAL_PRIORITY_LOW_EXT"/> + <enum value="256" name="VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT"/> + <enum value="512" name="VK_QUEUE_GLOBAL_PRIORITY_HIGH_EXT"/> + <enum value="1024" name="VK_QUEUE_GLOBAL_PRIORITY_REALTIME_EXT"/> </enums> <commands comment="Vulkan command definitions"> @@ -5434,6 +5451,13 @@ private version is maintained in the 1.0 branch of the member gitlab server. <param optional="false,true"><type>size_t</type>* <name>pInfoSize</name></param> <param optional="true" len="pInfoSize"><type>void</type>* <name>pInfo</name></param> </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR"> + <proto><type>VkResult</type> <name>vkGetMemoryHostPointerPropertiesEXT</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param><type>VkExternalMemoryHandleTypeFlagBitsKHR</type> <name>handleType</name></param> + <param optional="false">const <type>void</type>* <name>pHostPointer</name></param> + <param><type>VkMemoryHostPointerPropertiesEXT</type>* <name>pMemoryHostPointerProperties</name></param> + </command> </commands> <feature api="vulkan" name="VK_VERSION_1_0" number="1.0" comment="Vulkan core API interface definitions"> @@ -6940,16 +6964,18 @@ private version is maintained in the 1.0 branch of the member gitlab server. <enum value=""VK_MVK_moltenvk"" name="VK_MVK_MOLTENVK_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_MESA_extension_126" number="126" author="MESA" contact="Chad Versace @chadversary" supported="disabled"> + <extension name="VK_EXT_external_memory_dma_buf" number="126" type="device" requires="VK_KHR_external_memory_fd" author="EXT" contact="Chad Versace @chadversary" supported="vulkan"> <require> - <enum value="0" name="VK_MESA_EXTENSION_126_SPEC_VERSION"/> - <enum value=""VK_MESA_extension_126"" name="VK_MESA_EXTENSION_126_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_EXTERNAL_MEMORY_DMA_BUF_SPEC_VERSION"/> + <enum value=""VK_EXT_external_memory_dma_buf"" name="VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME"/> + <enum bitpos="9" extends="VkExternalMemoryHandleTypeFlagBitsKHR" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT"/> </require> </extension> - <extension name="VK_MESA_extension_127" number="127" author="MESA" contact="Chad Versace @chadversary" supported="disabled"> + <extension name="VK_EXT_queue_family_foreign" number="127" type="device" author="EXT" requires="VK_KHR_external_memory" contact="Chad Versace @chadversary" supported="vulkan"> <require> - <enum value="0" name="VK_MESA_EXTENSION_127_SPEC_VERSION"/> - <enum value=""VK_MESA_extension_127"" name="VK_MESA_EXTENSION_127_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_QUEUE_FAMILY_FOREIGN_SPEC_VERSION"/> + <enum value=""VK_EXT_queue_family_foreign"" name="VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME"/> + <enum name="VK_QUEUE_FAMILY_FOREIGN_EXT"/> </require> </extension> <extension name="VK_KHR_dedicated_allocation" number="128" type="device" author="KHR" requires="VK_KHR_get_memory_requirements2" contact="James Jones @cubanismo" supported="vulkan"> @@ -7420,7 +7446,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. </extension> <extension name="VK_EXT_global_priority" number="175" type="device" author="EXT" contact="Andres Rodriguez @lostgoat" supported="vulkan"> <require> - <enum value="1" name="VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION"/> + <enum value="2" name="VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION"/> <enum value=""VK_EXT_global_priority"" name="VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME"/> <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT"/> <enum offset="1" dir="-" extends="VkResult" name="VK_ERROR_NOT_PERMITTED_EXT"/> @@ -7446,10 +7472,19 @@ private version is maintained in the 1.0 branch of the member gitlab server. <enum value=""VK_KHR_extension_178"" name="VK_KHR_EXTENSION_178_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_179" number="179" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_EXT_external_memory_host" number="179" type="device" author="EXT" requires="VK_KHR_external_memory" contact="Daniel Rakos @aqnuep" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_EXTENSION_179_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_179"" name="VK_KHR_EXTENSION_179_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_EXTERNAL_MEMORY_HOST_SPEC_VERSION"/> + <enum value=""VK_EXT_external_memory_host"" name="VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT"/> + <enum bitpos="7" extends="VkExternalMemoryHandleTypeFlagBitsKHR" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT"/> + <enum bitpos="8" extends="VkExternalMemoryHandleTypeFlagBitsKHR" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT"/> + <type name="VkImportMemoryHostPointerInfoEXT"/> + <type name="VkMemoryHostPointerPropertiesEXT"/> + <type name="VkPhysicalDeviceExternalMemoryHostPropertiesEXT"/> + <command name="vkGetMemoryHostPointerPropertiesEXT"/> </require> </extension> <extension name="VK_AMD_extension_180" number="180" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> @@ -7518,5 +7553,11 @@ private version is maintained in the 1.0 branch of the member gitlab server. <enum value=""VK_AMD_extension_190"" name="VK_KHR_EXTENSION_190_EXTENSION_NAME"/> </require> </extension> + <extension name="VK_NV_extension_191" number="191" author="NV" contact="Vikram Kushwaha @vkushwaha" supported="disabled"> + <require> + <enum value="0" name="VK_NV_EXTENSION_191_SPEC_VERSION"/> + <enum value=""VK_NV_extension_191"" name="VK_NV_EXTENSION_191_EXTENSION_NAME"/> + </require> + </extension> </extensions> </registry> diff --git a/scripts/vuid_mapping.py b/scripts/vuid_mapping.py index bcffc38b..9c9324e3 100644 --- a/scripts/vuid_mapping.py +++ b/scripts/vuid_mapping.py @@ -574,6 +574,10 @@ func_struct_id_map = { 'VkDeviceQueueGlobalPriorityCreateInfoEXT' : 518, 'vkGetShaderInfoAMD' : 519, 'VkShaderStatisticsInfoAMD' : 520, +'VkImportMemoryHostPointerInfoEXT' : 521, +'VkMemoryHostPointerPropertiesEXT' : 522, +'VkPhysicalDeviceExternalMemoryHostPropertiesEXT' : 523, +'vkGetMemoryHostPointerPropertiesEXT' : 524, ### ADD New func/struct mappings above this line } # Mapping of params to unique IDs @@ -1084,6 +1088,8 @@ implicit_param_map = { 'infoType' : 503, 'pInfoSize' : 504, 'shaderStageMask' : 505, +'pMemoryHostPointerProperties' : 506, +'pHostPointer' : 507, ### ADD New implicit param mappings above this line } |
