[Mesa-dev] [PATCH 1/2] vulkan: Update the XML and headers to 1.1.90

Samuel Pitoiset samuel.pitoiset at gmail.com
Mon Oct 29 15:09:31 UTC 2018


Acked-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

On 10/29/18 3:44 PM, Jason Ekstrand wrote:
> This doesn't include any new features but it does include an XML and
> header typo fix for modifiers.
> ---
>   include/vulkan/vulkan_core.h |  8 ++++----
>   src/vulkan/registry/vk.xml   | 36 ++++++++++++++++++++++++++++++------
>   2 files changed, 34 insertions(+), 10 deletions(-)
> 
> diff --git a/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h
> index a7780a0f76b..ac9bb66d1e9 100644
> --- a/include/vulkan/vulkan_core.h
> +++ b/include/vulkan/vulkan_core.h
> @@ -43,11 +43,11 @@ 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 88
> +#define VK_HEADER_VERSION 90
>   
>   
>   #define VK_NULL_HANDLE 0
> -
> +
>   
>   
>   #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object;
> @@ -60,7 +60,7 @@ extern "C" {
>           #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object;
>   #endif
>   #endif
> -
> +
>   
>   
>   typedef uint32_t VkFlags;
> @@ -406,7 +406,7 @@ typedef enum VkStructureType {
>       VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT = 1000158001,
>       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT = 1000158002,
>       VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_LIST_CREATE_INFO_EXT = 1000158003,
> -    VK_STRUCTURE_TYPE_IMAGE_EXCPLICIT_DRM_FORMAT_MODIFIER_CREATE_INFO_EXT = 1000158004,
> +    VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT = 1000158004,
>       VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT = 1000158005,
>       VK_STRUCTURE_TYPE_VALIDATION_CACHE_CREATE_INFO_EXT = 1000160000,
>       VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT = 1000160001,
> diff --git a/src/vulkan/registry/vk.xml b/src/vulkan/registry/vk.xml
> index 5158f534801..863c33f323a 100644
> --- a/src/vulkan/registry/vk.xml
> +++ b/src/vulkan/registry/vk.xml
> @@ -150,7 +150,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> 88</type>
> +#define <name>VK_HEADER_VERSION</name> 90</type>
>   
>           <type category="define">
>   #define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T* object;</type>
> @@ -977,7 +977,7 @@ server.
>               <member>const <type>void</type>*            <name>pNext</name></member>
>               <member optional="true"><type>VkShaderModuleCreateFlags</type> <name>flags</name></member>
>               <member><type>size_t</type>                 <name>codeSize</name><comment>Specified in bytes</comment></member>
> -            <member len="latexmath:[codeSize \over 4]" altlen="codeSize / 4">const <type>uint32_t</type>*            <name>pCode</name><comment>Binary code of size codeSize</comment></member>
> +            <member len="latexmath:[\textrm{codeSize} \over 4]" altlen="codeSize / 4">const <type>uint32_t</type>*            <name>pCode</name><comment>Binary code of size codeSize</comment></member>
>           </type>
>           <type category="struct" name="VkDescriptorSetLayoutBinding">
>               <member><type>uint32_t</type>               <name>binding</name><comment>Binding number for this entry</comment></member>
> @@ -3564,7 +3564,7 @@ server.
>               <member len="drmFormatModifierCount">const <type>uint64_t</type>* <name>pDrmFormatModifiers</name></member>
>           </type>
>           <type category="struct" name="VkImageDrmFormatModifierExplicitCreateInfoEXT" structextends="VkImageCreateInfo">
> -            <member values="VK_STRUCTURE_TYPE_IMAGE_EXCPLICIT_DRM_FORMAT_MODIFIER_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
> +            <member values="VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
>               <member>const <type>void</type>* <name>pNext</name></member>
>               <member><type>uint64_t</type> <name>drmFormatModifier</name></member>
>               <member optional="false"><type>uint32_t</type> <name>drmFormatModifierPlaneCount</name></member>
> @@ -4857,7 +4857,7 @@ server.
>           </command>
>           <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST">
>               <proto><type>VkResult</type> <name>vkQueueWaitIdle</name></proto>
> -            <param><type>VkQueue</type> <name>queue</name></param>
> +            <param externsync="true"><type>VkQueue</type> <name>queue</name></param>
>           </command>
>           <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST">
>               <proto><type>VkResult</type> <name>vkDeviceWaitIdle</name></proto>
> @@ -6931,7 +6931,7 @@ server.
>               <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param>
>               <param len="createInfoCount"><type>VkPipeline</type>* <name>pPipelines</name></param>
>           </command>
> -        <command>
> +        <command successcodes="VK_SUCCESS">
>               <proto><type>VkResult</type> <name>vkGetImageDrmFormatModifierPropertiesEXT</name></proto>
>               <param><type>VkDevice</type> <name>device</name></param>
>               <param><type>VkImage</type> <name>image</name></param>
> @@ -9367,7 +9367,7 @@ server.
>                   <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT"/>
>                   <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT"/>
>                   <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_LIST_CREATE_INFO_EXT"/>
> -                <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_EXCPLICIT_DRM_FORMAT_MODIFIER_CREATE_INFO_EXT"/>
> +                <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT"/>
>                   <enum offset="5" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT"/>
>   
>                   <enum offset="0" extends="VkImageTiling" name="VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT"/>
> @@ -10076,5 +10076,29 @@ server.
>                   <enum value=""VK_KHR_extension_240""               name="VK_KHR_EXTENSION_240_EXTENSION_NAME"/>
>               </require>
>           </extension>
> +        <extension name="VK_NV_extension_241" number="241" author="NVIDIA" contact="Nuno Subtil @nsubtil" supported="disabled">
> +            <require>
> +                <enum value="0"                                              name="VK_NV_EXTENSION_241_SPEC_VERSION"/>
> +                <enum value=""VK_NV_extension_241""                name="VK_NV_EXTENSION_241_EXTENSION_NAME"/>
> +            </require>
> +        </extension>
> +        <extension name="VK_NV_extension_242" number="242" author="NVIDIA" contact="Nuno Subtil @nsubtil" supported="disabled">
> +            <require>
> +                <enum value="0"                                              name="VK_NV_EXTENSION_242_SPEC_VERSION"/>
> +                <enum value=""VK_NV_extension_242""                name="VK_NV_EXTENSION_242_EXTENSION_NAME"/>
> +            </require>
> +        </extension>
> +        <extension name="VK_INTEL_extension_243" number="243" author="INTEL" contact="Slawek Grajewski @sgrajewski" supported="disabled">
> +            <require>
> +                <enum value="0"                                              name="VK_INTEL_EXTENSION_243_SPEC_VERSION"/>
> +                <enum value=""VK_INTEL_extension_243""             name="VK_INTEL_EXTENSION_243_EXTENSION_NAME"/>
> +            </require>
> +        </extension>
> +        <extension name="VK_MESA_extension_244" number="244" author="MESA" contact="Andres Rodriguez @lostgoat" supported="disabled">
> +            <require>
> +                <enum value="0"                                              name="VK_MESA_EXTENSION_244_SPEC_VERSION"/>
> +                <enum value=""VK_MESA_extension_244""              name="VK_MESA_EXTENSION_244_EXTENSION_NAME"/>
> +            </require>
> +        </extension>
>       </extensions>
>   </registry>
> 


More information about the mesa-dev mailing list