Patch series is, Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com>
Sam
On 19/11/2018 16:39, Jason Ekstrand wrote:
> ---
> include/vulkan/vulkan_core.h | 35 ++++++++++++---
> src/vulkan/registry/vk.xml | 84 +++++++++++++++++++++++++++++-------
> 2 files changed, 98 insertions(+), 21 deletions(-)
>
> diff --git a/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h
> index 4cd8ed51dcd..35c06649aa5 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 91
> +#define VK_HEADER_VERSION 93
>
>
> #define VK_NULL_HANDLE 0
> @@ -454,6 +454,8 @@ typedef enum VkStructureType {
> VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR =
> 1000211000,
> VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT =
> 1000212000,
> VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA = 1000214000,
> + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT =
> 1000221000,
> + VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT = 1000246000,
> VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT =
> VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT,
> VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR =
> VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO,
> VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR =
> VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES,
> @@ -6101,9 +6103,10 @@ typedef enum VkDriverIdKHR {
> VK_DRIVER_ID_IMAGINATION_PROPRIETARY_KHR = 7,
> VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR = 8,
> VK_DRIVER_ID_ARM_PROPRIETARY_KHR = 9,
> + VK_DRIVER_ID_GOOGLE_PASTEL_KHR = 10,
> VK_DRIVER_ID_BEGIN_RANGE_KHR = VK_DRIVER_ID_AMD_PROPRIETARY_KHR,
> - VK_DRIVER_ID_END_RANGE_KHR = VK_DRIVER_ID_ARM_PROPRIETARY_KHR,
> - VK_DRIVER_ID_RANGE_SIZE_KHR = (VK_DRIVER_ID_ARM_PROPRIETARY_KHR -
> VK_DRIVER_ID_AMD_PROPRIETARY_KHR + 1),
> + VK_DRIVER_ID_END_RANGE_KHR = VK_DRIVER_ID_GOOGLE_PASTEL_KHR,
> + VK_DRIVER_ID_RANGE_SIZE_KHR = (VK_DRIVER_ID_GOOGLE_PASTEL_KHR -
> VK_DRIVER_ID_AMD_PROPRIETARY_KHR + 1),
> VK_DRIVER_ID_MAX_ENUM_KHR = 0x7FFFFFFF
> } VkDriverIdKHR;
>
> @@ -7791,8 +7794,6 @@ typedef struct
> VkPipelineCoverageModulationStateCreateInfoNV {
>
>
> #define VK_EXT_image_drm_format_modifier 1
> -#define VK_EXT_EXTENSION_159_SPEC_VERSION 0
> -#define VK_EXT_EXTENSION_159_EXTENSION_NAME "VK_EXT_extension_159"
> #define VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_SPEC_VERSION 1
> #define VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME
> "VK_EXT_image_drm_format_modifier"
>
> @@ -8806,6 +8807,18 @@ typedef struct VkPhysicalDevicePCIBusInfoPropertiesEXT
> {
>
>
>
> +#define VK_EXT_scalar_block_layout 1
> +#define VK_EXT_SCALAR_BLOCK_LAYOUT_SPEC_VERSION 1
> +#define VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME
> "VK_EXT_scalar_block_layout"
> +
> +typedef struct VkPhysicalDeviceScalarBlockLayoutFeaturesEXT {
> + VkStructureType sType;
> + void* pNext;
> + VkBool32 scalarBlockLayout;
> +} VkPhysicalDeviceScalarBlockLayoutFeaturesEXT;
> +
> +
> +
> #define VK_GOOGLE_hlsl_functionality1 1
> #define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION 0
> #define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME
> "VK_GOOGLE_hlsl_functionality1"
> @@ -8816,6 +8829,18 @@ typedef struct VkPhysicalDevicePCIBusInfoPropertiesEXT
> {
> #define VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME "VK_GOOGLE_decorate_string"
>
>
> +#define VK_EXT_separate_stencil_usage 1
> +#define VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION 1
> +#define VK_EXT_SEPARATE_STENCIL_USAGE_EXTENSION_NAME
> "VK_EXT_separate_stencil_usage"
> +
> +typedef struct VkImageStencilUsageCreateInfoEXT {
> + VkStructureType sType;
> + const void* pNext;
> + VkImageUsageFlags stencilUsage;
> +} VkImageStencilUsageCreateInfoEXT;
> +
> +
> +
> #ifdef __cplusplus
> }
> #endif
> diff --git a/src/vulkan/registry/vk.xml b/src/vulkan/registry/vk.xml
> index 24cc3ce7872..6cfa256d3b3 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> 91</type>
> +#define <name>VK_HEADER_VERSION</name> 93</type>
>
> <type category="define">
> #define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T*
> object;</type>
> @@ -1253,7 +1253,7 @@ server.
> <member><type>VkFramebuffer</type>
> <name>framebuffer</name></member>
> <member><type>VkRect2D</type>
> <name>renderArea</name></member>
> <member optional="true"><type>uint32_t</type>
> <name>clearValueCount</name></member>
> - <member len="clearValueCount" noautovalidity="true">const
> <type>VkClearValue</type>* <name>pClearValues</name></member>
> + <member len="clearValueCount">const <type>VkClearValue</type>*
> <name>pClearValues</name></member>
> </type>
> <type category="union" name="VkClearColorValue" comment="// Union
> allowing specification of floating point, integer, or unsigned integer color
> data. Actual value selected is based on image/attachment being cleared.">
> <member><type>float</type>
> <name>float32</name>[4]</member>
> @@ -1312,7 +1312,7 @@ server.
> <type category="struct" name="VkRenderPassCreateInfo">
> <member
> values="VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO"><type>VkStructureType</type>
> <name>sType</name></member>
> <member>const <type>void</type>*
> <name>pNext</name></member>
> - <member optional="true"><type>VkRenderPassCreateFlags</type>
> <name>flags</name></member>
> + <member optional="true"
> noautovalidity="true"><type>VkRenderPassCreateFlags</type>
> <name>flags</name></member>
> <member optional="true"><type>uint32_t</type>
> <name>attachmentCount</name></member>
> <member len="attachmentCount">const
> <type>VkAttachmentDescription</type>* <name>pAttachments</name></member>
> <member><type>uint32_t</type>
> <name>subpassCount</name></member>
> @@ -3170,7 +3170,7 @@ server.
> <type category="struct" name="VkRenderPassCreateInfo2KHR">
> <member
> values="VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2_KHR"><type>VkStructureType</type>
> <name>sType</name></member>
> <member>const <type>void</type>*
> <name>pNext</name></member>
> - <member optional="true"><type>VkRenderPassCreateFlags</type>
> <name>flags</name></member>
> + <member optional="true"
> noautovalidity="true"><type>VkRenderPassCreateFlags</type>
> <name>flags</name></member>
> <member optional="true"><type>uint32_t</type>
> <name>attachmentCount</name></member>
> <member len="attachmentCount">const
> <type>VkAttachmentDescription2KHR</type>* <name>pAttachments</name></member>
> <member><type>uint32_t</type>
> <name>subpassCount</name></member>
> @@ -3585,11 +3585,21 @@ server.
> <member><type>void</type>* <name>pNext</name></member>
> <member><type>uint64_t</type>
> <name>drmFormatModifier</name></member>
> </type>
> + <type category="struct" name="VkImageStencilUsageCreateInfoEXT"
> structextends="VkImageCreateInfo,VkPhysicalDeviceImageFormatInfo2">
> + <member
> values="VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT"><type>VkStructureType</type>
> <name>sType</name></member>
> + <member>const <type>void</type>* <name>pNext</name></member>
> + <member><type>VkImageUsageFlags</type>
> <name>stencilUsage</name></member>
> + </type>
> <type category="struct"
> name="VkDeviceMemoryOverallocationCreateInfoAMD"
> structextends="VkDeviceCreateInfo">
> <member
> values="VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD"><type>VkStructureType</type>
> <name>sType</name></member>
> <member>const <type>void</type>*
> <name>pNext</name></member>
> <member><type>VkMemoryOverallocationBehaviorAMD</type>
> <name>overallocationBehavior</name></member>
> </type>
> + <type category="struct"
> name="VkPhysicalDeviceScalarBlockLayoutFeaturesEXT"
> structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
> + <member
> values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT"><type>VkStructureType</type>
> <name>sType</name></member>
> + <member><type>void</type>*
> <name>pNext</name></member>
> + <member><type>VkBool32</type>
> <name>scalarBlockLayout</name></member>
> + </type>
> </types>
>
> <comment>Vulkan enumerant (token) definitions</comment>
> @@ -4698,6 +4708,7 @@ server.
> <enum value="7"
> name="VK_DRIVER_ID_IMAGINATION_PROPRIETARY_KHR" comment="Imagination
> Technologies"/>
> <enum value="8" name="VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR"
> comment="Qualcomm Technologies, Inc."/>
> <enum value="9" name="VK_DRIVER_ID_ARM_PROPRIETARY_KHR"
> comment="Arm Limited"/>
> + <enum value="10" name="VK_DRIVER_ID_GOOGLE_PASTEL_KHR"
> comment="Google LLC"/>
> </enums>
> <enums name="VkConditionalRenderingFlagBitsEXT" type="bitmask">
> <enum bitpos="0"
> name="VK_CONDITIONAL_RENDERING_INVERTED_BIT_EXT"/>
> @@ -7779,14 +7790,36 @@ server.
> </extension>
> <extension name="VK_AMD_extension_24" number="24" author="AMD"
> contact="Daniel Rakos @drakos-amd" supported="disabled">
> <require>
> - <enum value="0"
> name="VK_AMD_EXTENSION_24_SPEC_VERSION"/>
> - <enum value=""VK_AMD_extension_24""
> name="VK_AMD_EXTENSION_24_EXTENSION_NAME"/>
> + <enum value="0"
> name="VK_AMD_EXTENSION_24_SPEC_VERSION"/>
> + <enum value=""VK_AMD_extension_24""
> name="VK_AMD_EXTENSION_24_EXTENSION_NAME"/>
> + <enum bitpos="6" extends="VkQueueFlagBits"
> name="VK_QUEUE_RESERVED_6_BIT_KHR"/>
> + <enum bitpos="27" extends="VkPipelineStageFlagBits"
> name="VK_PIPELINE_STAGE_RESERVED_27_BIT_KHR"/>
> + <enum bitpos="30" extends="VkAccessFlagBits"
> name="VK_ACCESS_RESERVED_30_BIT_KHR"/>
> + <enum bitpos="31" extends="VkAccessFlagBits"
> name="VK_ACCESS_RESERVED_31_BIT_KHR"/>
> + <enum bitpos="14" extends="VkBufferUsageFlagBits"
> name="VK_BUFFER_USAGE_RESERVED_14_BIT_KHR"/>
> + <enum bitpos="13" extends="VkImageUsageFlagBits"
> name="VK_IMAGE_USAGE_RESERVED_13_BIT_KHR"/>
> + <enum bitpos="14" extends="VkImageUsageFlagBits"
> name="VK_IMAGE_USAGE_RESERVED_14_BIT_KHR"/>
> + <enum bitpos="15" extends="VkImageUsageFlagBits"
> name="VK_IMAGE_USAGE_RESERVED_15_BIT_KHR"/>
> + <enum bitpos="27" extends="VkFormatFeatureFlagBits"
> name="VK_FORMAT_FEATURE_RESERVED_27_BIT_KHR"/>
> + <enum bitpos="28" extends="VkFormatFeatureFlagBits"
> name="VK_FORMAT_FEATURE_RESERVED_28_BIT_KHR"/>
> + <enum offset="8" extends="VkQueryType"
> name="VK_QUERY_TYPE_RESERVED_8"/>
> </require>
> </extension>
> <extension name="VK_AMD_extension_25" number="25" author="AMD"
> contact="Daniel Rakos @drakos-amd" supported="disabled">
> <require>
> - <enum value="0"
> name="VK_AMD_EXTENSION_25_SPEC_VERSION"/>
> - <enum value=""VK_AMD_extension_25""
> name="VK_AMD_EXTENSION_25_EXTENSION_NAME"/>
> + <enum value="0"
> name="VK_AMD_EXTENSION_25_SPEC_VERSION"/>
> + <enum value=""VK_AMD_extension_25""
> name="VK_AMD_EXTENSION_25_EXTENSION_NAME"/>
> + <enum bitpos="5" extends="VkQueueFlagBits"
> name="VK_QUEUE_RESERVED_5_BIT_KHR"/>
> + <enum bitpos="26" extends="VkPipelineStageFlagBits"
> name="VK_PIPELINE_STAGE_RESERVED_26_BIT_KHR"/>
> + <enum bitpos="28" extends="VkAccessFlagBits"
> name="VK_ACCESS_RESERVED_28_BIT_KHR"/>
> + <enum bitpos="29" extends="VkAccessFlagBits"
> name="VK_ACCESS_RESERVED_29_BIT_KHR"/>
> + <enum bitpos="13" extends="VkBufferUsageFlagBits"
> name="VK_BUFFER_USAGE_RESERVED_13_BIT_KHR"/>
> + <enum bitpos="10" extends="VkImageUsageFlagBits"
> name="VK_IMAGE_USAGE_RESERVED_10_BIT_KHR"/>
> + <enum bitpos="11" extends="VkImageUsageFlagBits"
> name="VK_IMAGE_USAGE_RESERVED_11_BIT_KHR"/>
> + <enum bitpos="12" extends="VkImageUsageFlagBits"
> name="VK_IMAGE_USAGE_RESERVED_12_BIT_KHR"/>
> + <enum bitpos="25" extends="VkFormatFeatureFlagBits"
> name="VK_FORMAT_FEATURE_RESERVED_25_BIT_KHR"/>
> + <enum bitpos="26" extends="VkFormatFeatureFlagBits"
> name="VK_FORMAT_FEATURE_RESERVED_26_BIT_KHR"/>
> + <enum offset="4" extends="VkQueryType"
> name="VK_QUERY_TYPE_RESERVED_4"/>
> </require>
> </extension>
> <extension name="VK_AMD_gcn_shader" number="26" type="device"
> author="AMD" contact="Dominik Witczak @dominikwitczakamd" supported="vulkan">
> @@ -9363,11 +9396,8 @@ server.
> </extension>
> <extension name="VK_EXT_image_drm_format_modifier" number="159"
> type="device"
> requires="VK_KHR_bind_memory2,VK_KHR_get_physical_device_properties2,VK_KHR_image_format_list,VK_KHR_sampler_ycbcr_conversion"
> author="EXT" contact="Chad Versace @chadversary" supported="vulkan">
> <require>
> - <enum value="0"
> name="VK_EXT_EXTENSION_159_SPEC_VERSION"/>
> - <enum value=""VK_EXT_extension_159""
> name="VK_EXT_EXTENSION_159_EXTENSION_NAME"/>
> -
> - <enum value="1"
> name="VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_SPEC_VERSION"/>
> - <enum value=""VK_EXT_image_drm_format_modifier""
> name="VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME"/>
> + <enum value="1"
> name="VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_SPEC_VERSION"/>
> + <enum value=""VK_EXT_image_drm_format_modifier""
> name="VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME"/>
>
> <enum offset="0" dir="-" extends="VkResult"
> name="VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT"/>
>
> @@ -9979,10 +10009,12 @@ server.
> <enum bitpos="0" extends="VkRenderPassCreateFlagBits"
> name="VK_RENDER_PASS_CREATE_RESERVED_0_BIT_KHR"/>
> </require>
> </extension>
> - <extension name="VK_EXT_extension_222" number="222" author="EXT"
> contact="Tobias Hector @tobski" supported="disabled">
> + <extension name="VK_EXT_scalar_block_layout" number="222"
> requires="VK_KHR_get_physical_device_properties2" type="device" author="EXT"
> contact="Tobias Hector @tobski" supported="vulkan">
> <require>
> - <enum value="0"
> name="VK_EXT_EXTENSION_222_SPEC_VERSION"/>
> - <enum value=""VK_EXT_extension_222""
> name="VK_EXT_EXTENSION_222_EXTENSION_NAME"/>
> + <enum value="1"
> name="VK_EXT_SCALAR_BLOCK_LAYOUT_SPEC_VERSION"/>
> + <enum value=""VK_EXT_scalar_block_layout""
> name="VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME"/>
> + <type
> name="VkPhysicalDeviceScalarBlockLayoutFeaturesEXT"/>
> + <enum offset="0" extends="VkStructureType"
> name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT"/>
> </require>
> </extension>
> <extension name="VK_EXT_extension_223" number="223" author="EXT"
> contact="Tobias Hector @tobski" supported="disabled">
> @@ -10123,5 +10155,25 @@ server.
> <enum value=""VK_NV_extension_245""
> name="VK_NV_EXTENSION_245_EXTENSION_NAME"/>
> </require>
> </extension>
> + <extension name="VK_EXT_extension_246" number="246" author="EXT"
> contact="Tobias Hector @tobski" supported="disabled">
> + <require>
> + <enum value="0"
> name="VK_EXT_EXTENSION_246_SPEC_VERSION"/>
> + <enum value=""VK_EXT_extension_246""
> name="VK_EXT_EXTENSION_246_EXTENSION_NAME"/>
> + </require>
> + </extension>
> + <extension name="VK_EXT_separate_stencil_usage" number="247"
> type="device" author="EXT" contact="Daniel Rakos @drakos-amd"
> supported="vulkan">
> + <require>
> + <enum value="1"
> name="VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION"/>
> + <enum value=""VK_EXT_separate_stencil_usage""
> name="VK_EXT_SEPARATE_STENCIL_USAGE_EXTENSION_NAME"/>
> + <enum offset="0" extends="VkStructureType"
> name="VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT"/>
> + <type name="VkImageStencilUsageCreateInfoEXT"/>
> + </require>
> + </extension>
> + <extension name="VK_EXT_extension_248" number="248" author="EXT"
> contact="Karl Schultz @karlschultz" supported="disabled">
> + <require>
> + <enum value="0"
> name="VK_EXT_EXTENSION_248_SPEC_VERSION"/>
> + <enum value=""VK_EXT_extension_248""
> name="VK_EXT_EXTENSION_248_EXTENSION_NAME"/>
> + </require>
> + </extension>
> </extensions>
> </registry>
>
signature.asc
Description: OpenPGP digital signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
