Module: Mesa Branch: master Commit: 90a7893ca8a191124908fdcc013b3274ebb8c1ab URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=90a7893ca8a191124908fdcc013b3274ebb8c1ab
Author: Caio Marcelo de Oliveira Filho <[email protected]> Date: Mon Oct 14 08:14:25 2019 -0700 vulkan: Update the XML and headers to 1.1.125 Acked-by: Jason Ekstrand <[email protected]> --- include/vulkan/vulkan_core.h | 7 ++++++- src/vulkan/registry/vk.xml | 16 +++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h index 4cf54f48222..9770c3b9be7 100644 --- a/include/vulkan/vulkan_core.h +++ b/include/vulkan/vulkan_core.h @@ -44,7 +44,7 @@ extern "C" { #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff) #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff) // Version of this file -#define VK_HEADER_VERSION 124 +#define VK_HEADER_VERSION 125 #define VK_NULL_HANDLE 0 @@ -6469,6 +6469,11 @@ typedef struct VkPhysicalDeviceVulkanMemoryModelFeaturesKHR { +#define VK_KHR_spirv_1_4 1 +#define VK_KHR_SPIRV_1_4_SPEC_VERSION 1 +#define VK_KHR_SPIRV_1_4_EXTENSION_NAME "VK_KHR_spirv_1_4" + + #define VK_KHR_surface_protected_capabilities 1 #define VK_KHR_SURFACE_PROTECTED_CAPABILITIES_SPEC_VERSION 1 #define VK_KHR_SURFACE_PROTECTED_CAPABILITIES_EXTENSION_NAME "VK_KHR_surface_protected_capabilities" diff --git a/src/vulkan/registry/vk.xml b/src/vulkan/registry/vk.xml index 832a41a5240..3f5ca9c826f 100644 --- a/src/vulkan/registry/vk.xml +++ b/src/vulkan/registry/vk.xml @@ -154,7 +154,7 @@ 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> 124</type> +#define <name>VK_HEADER_VERSION</name> 125</type> <type category="define"> #define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T* object;</type> @@ -3812,7 +3812,7 @@ typedef void <name>CAMetalLayer</name>; <member><type>VkExtent2D</type> <name>maxFragmentDensityTexelSize</name></member> <member><type>VkBool32</type> <name>fragmentDensityInvocations</name></member> </type> - <type category="struct" name="VkRenderPassFragmentDensityMapCreateInfoEXT" structextends="VkRenderPassCreateInfo"> + <type category="struct" name="VkRenderPassFragmentDensityMapCreateInfoEXT" structextends="VkRenderPassCreateInfo,VkRenderPassCreateInfo2KHR"> <member values="VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> <member>const <type>void</type>* <name>pNext</name></member> <member><type>VkAttachmentReference</type> <name>fragmentDensityMapAttachment</name></member> @@ -11173,10 +11173,10 @@ typedef void <name>CAMetalLayer</name>; <enum value=""VK_AMD_extension_236"" name="VK_AMD_EXTENSION_236_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_KHR_extension_237" number="237" author="KHR" contact="Jesse Hall @critsec" supported="disabled"> + <extension name="VK_KHR_spirv_1_4" number="237" type="device" requiresCore="1.1" requires="VK_KHR_shader_float_controls" author="KHR" contact="Jesse Hall @critsec" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_EXTENSION_237_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_237"" name="VK_KHR_EXTENSION_237_EXTENSION_NAME"/> + <enum value="1" name="VK_KHR_SPIRV_1_4_SPEC_VERSION"/> + <enum value=""VK_KHR_spirv_1_4"" name="VK_KHR_SPIRV_1_4_EXTENSION_NAME"/> </require> </extension> <extension name="VK_EXT_memory_budget" number="238" type="device" requires="VK_KHR_get_physical_device_properties2" author="EXT" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> @@ -11629,5 +11629,11 @@ typedef void <name>CAMetalLayer</name>; <enum value=""VK_NV_extension_293"" name="VK_NV_EXTENSION_293_EXTENSION_NAME"/> </require> </extension> + <extension name="VK_KHR_extension_294" number="294" author="KHR" contact="Baldur Karlsson @baldurk" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_294_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_294"" name="VK_KHR_EXTENSION_294_EXTENSION_NAME"/> + </require> + </extension> </extensions> </registry> _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
