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

Samuel Iglesias Gonsálvez siglesias at igalia.com
Mon Dec 17 15:43:34 UTC 2018


Patch series is,

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>

Sam

On 17/12/2018 16:39, Jason Ekstrand wrote:
> ---
>  include/vulkan/vulkan_core.h | 16 ++++++++--------
>  src/vulkan/registry/vk.xml   | 22 +++++++++++-----------
>  2 files changed, 19 insertions(+), 19 deletions(-)
> 
> diff --git a/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h
> index 50064109ef3..72542c72ec8 100644
> --- a/include/vulkan/vulkan_core.h
> +++ b/include/vulkan/vulkan_core.h
> @@ -43,7 +43,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 95
> +#define VK_HEADER_VERSION 96
>  
>  
>  #define VK_NULL_HANDLE 0
> @@ -8862,16 +8862,16 @@ VKAPI_ATTR void VKAPI_CALL vkGetQueueCheckpointDataNV(
>  #endif
>  
>  #define VK_EXT_pci_bus_info 1
> -#define VK_EXT_PCI_BUS_INFO_SPEC_VERSION  1
> +#define VK_EXT_PCI_BUS_INFO_SPEC_VERSION  2
>  #define VK_EXT_PCI_BUS_INFO_EXTENSION_NAME "VK_EXT_pci_bus_info"
>  
>  typedef struct VkPhysicalDevicePCIBusInfoPropertiesEXT {
>      VkStructureType    sType;
>      void*              pNext;
> -    uint16_t           pciDomain;
> -    uint8_t            pciBus;
> -    uint8_t            pciDevice;
> -    uint8_t            pciFunction;
> +    uint32_t           pciDomain;
> +    uint32_t           pciBus;
> +    uint32_t           pciDevice;
> +    uint32_t           pciFunction;
>  } VkPhysicalDevicePCIBusInfoPropertiesEXT;
>  
>  
> @@ -8917,12 +8917,12 @@ typedef struct VkPhysicalDeviceScalarBlockLayoutFeaturesEXT {
>  
>  
>  #define VK_GOOGLE_hlsl_functionality1 1
> -#define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION 0
> +#define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION 1
>  #define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME "VK_GOOGLE_hlsl_functionality1"
>  
>  
>  #define VK_GOOGLE_decorate_string 1
> -#define VK_GOOGLE_DECORATE_STRING_SPEC_VERSION 0
> +#define VK_GOOGLE_DECORATE_STRING_SPEC_VERSION 1
>  #define VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME "VK_GOOGLE_decorate_string"
>  
>  
> diff --git a/src/vulkan/registry/vk.xml b/src/vulkan/registry/vk.xml
> index 2c9b79976bc..d60f41187fe 100644
> --- a/src/vulkan/registry/vk.xml
> +++ b/src/vulkan/registry/vk.xml
> @@ -146,7 +146,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> 95</type>
> +#define <name>VK_HEADER_VERSION</name> 96</type>
>  
>          <type category="define">
>  #define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T* object;</type>
> @@ -2513,7 +2513,7 @@ server.
>              <member>const <type>void</type>*                      <name>pNext</name></member>
>              <member><type>VkBool32</type>               <name>viewportWScalingEnable</name></member>
>              <member><type>uint32_t</type>               <name>viewportCount</name></member>
> -            <member noautovalidity="true" len="viewportCount">const <type>VkViewportWScalingNV</type>*      <name>pViewportWScalings</name></member>
> +            <member len="viewportCount">const <type>VkViewportWScalingNV</type>*      <name>pViewportWScalings</name></member>
>          </type>
>          <type category="struct" name="VkViewportSwizzleNV">
>              <member><type>VkViewportCoordinateSwizzleNV</type>          <name>x</name></member>
> @@ -2526,7 +2526,7 @@ server.
>              <member>const <type>void</type>*            <name>pNext</name></member>
>              <member optional="true"><type>VkPipelineViewportSwizzleStateCreateFlagsNV</type>    <name>flags</name></member>
>              <member><type>uint32_t</type>               <name>viewportCount</name></member>
> -            <member noautovalidity="true" optional="true" len="viewportCount">const <type>VkViewportSwizzleNV</type>*      <name>pViewportSwizzles</name></member>
> +            <member len="viewportCount">const <type>VkViewportSwizzleNV</type>*      <name>pViewportSwizzles</name></member>
>          </type>
>          <type category="struct" name="VkPhysicalDeviceDiscardRectanglePropertiesEXT" structextends="VkPhysicalDeviceProperties2">
>              <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member>
> @@ -3235,10 +3235,10 @@ server.
>          <type category="struct" name="VkPhysicalDevicePCIBusInfoPropertiesEXT" structextends="VkPhysicalDeviceProperties2" returnedonly="true">
>              <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member>
>              <member><type>void</type>*                  <name>pNext</name></member>
> -            <member><type>uint16_t</type>               <name>pciDomain</name></member>
> -            <member><type>uint8_t</type>                <name>pciBus</name></member>
> -            <member><type>uint8_t</type>                <name>pciDevice</name></member>
> -            <member><type>uint8_t</type>                <name>pciFunction</name></member>
> +            <member><type>uint32_t</type>               <name>pciDomain</name></member>
> +            <member><type>uint32_t</type>               <name>pciBus</name></member>
> +            <member><type>uint32_t</type>               <name>pciDevice</name></member>
> +            <member><type>uint32_t</type>               <name>pciFunction</name></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>
> @@ -3420,7 +3420,7 @@ server.
>              <member><type>VkBool32</type>                            <name>shadingRateImage</name></member>
>              <member><type>VkBool32</type>                            <name>shadingRateCoarseSampleOrder</name></member>
>          </type>
> -        <type category="struct" name="VkPhysicalDeviceShadingRateImagePropertiesNV" structextends="VkPhysicalDeviceProperties" returnedonly="true">
> +        <type category="struct" name="VkPhysicalDeviceShadingRateImagePropertiesNV" structextends="VkPhysicalDeviceProperties2" returnedonly="true">
>              <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_PROPERTIES_NV"><type>VkStructureType</type> <name>sType</name></member>
>              <member><type>void</type>*                               <name>pNext</name></member>
>              <member><type>VkExtent2D</type>                          <name>shadingRateTexelSize</name></member>
> @@ -10001,7 +10001,7 @@ server.
>          </extension>
>          <extension name="VK_EXT_pci_bus_info" number="213" type="device" author="EXT" requires="VK_KHR_get_physical_device_properties2" contact="Matthaeus G. Chajdas @anteru" supported="vulkan">
>              <require>
> -                <enum value="1"                                         name="VK_EXT_PCI_BUS_INFO_SPEC_VERSION"/>
> +                <enum value="2"                                         name="VK_EXT_PCI_BUS_INFO_SPEC_VERSION"/>
>                  <enum value=""VK_EXT_pci_bus_info""           name="VK_EXT_PCI_BUS_INFO_EXTENSION_NAME"/>
>                  <enum offset="0" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT"/>
>                  <type name="VkPhysicalDevicePCIBusInfoPropertiesEXT"/>
> @@ -10091,13 +10091,13 @@ server.
>          </extension>
>          <extension name="VK_GOOGLE_hlsl_functionality1" number="224" type="device" author="GOOGLE" contact="Hai Nguyen @chaoticbob" supported="vulkan">
>              <require>
> -                <enum value="0"                                             name="VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION"/>
> +                <enum value="1"                                             name="VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION"/>
>                  <enum value=""VK_GOOGLE_hlsl_functionality1""     name="VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME"/>
>              </require>
>          </extension>
>          <extension name="VK_GOOGLE_decorate_string" number="225" type="device" author="GOOGLE" contact="Hai Nguyen @chaoticbob" supported="vulkan">
>              <require>
> -                <enum value="0"                                             name="VK_GOOGLE_DECORATE_STRING_SPEC_VERSION"/>
> +                <enum value="1"                                             name="VK_GOOGLE_DECORATE_STRING_SPEC_VERSION"/>
>                  <enum value=""VK_GOOGLE_decorate_string""         name="VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME"/>
>              </require>
>          </extension>
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20181217/e2ce8d69/attachment-0001.sig>


More information about the mesa-dev mailing list