Merge "vulkan: Update Vulkan headers to 1.1.94" (132e0e82) · Commits · e / os / platform_frameworks_native

vulkan/api/vulkan.api

+72 −12

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import platform "platform.api"
		// API version (major.minor.patch)
		define VERSION_MAJOR 1
		define VERSION_MINOR 1
		define VERSION_PATCH 93
		define VERSION_PATCH 94

		// API limits
		define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256
		@@ -579,6 +579,10 @@ define NULL_HANDLE 0
		@extension("VK_NV_shader_subgroup_partitioned") define VK_NV_SHADER_SUBGROUP_PARTITIONED_SPEC_VERSION 1
		@extension("VK_NV_shader_subgroup_partitioned") define VK_NV_SHADER_SUBGROUP_PARTITIONED_EXTENSION_NAME "VK_NV_shader_subgroup_partitioned"

		// 201
		@extension("VK_KHR_swapchain_mutable_format") define VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_SPEC_VERSION 1
		@extension("VK_KHR_swapchain_mutable_format") define VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME "VK_KHR_swapchain_mutable_format"

		// 202
		@extension("VK_NV_compute_shader_derivatives") define VK_NV_COMPUTE_SHADER_DERIVATIVES_SPEC_VERSION 1
		@extension("VK_NV_compute_shader_derivatives") define VK_NV_COMPUTE_SHADER_DERIVATIVES_EXTENSION_NAME "VK_NV_compute_shader_derivatives"
		@@ -615,6 +619,10 @@ define NULL_HANDLE 0
		@extension("VK_FUCHSIA_imagepipe_surface") define VK_FUCHSIA_IMAGEPIPE_SURFACE_SPEC_VERSION 1
		@extension("VK_FUCHSIA_imagepipe_surface") define VK_FUCHSIA_IMAGEPIPE_SURFACE_EXTENSION_NAME "VK_FUCHSIA_imagepipe_surface"

		// 219
		@extension("VK_EXT_fragment_density_map") define VK_EXT_FRAGMENT_DENSITY_MAP_SPEC_VERSION 1
		@extension("VK_EXT_fragment_density_map") define VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME "VK_EXT_fragment_density_map"

		// 222
		@extension("VK_EXT_scalar_block_layout") define VK_EXT_SCALAR_BLOCK_LAYOUT_SPEC_VERSION 1
		@extension("VK_EXT_scalar_block_layout") define VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME "VK_EXT_scalar_block_layout"
		@@ -736,6 +744,9 @@ enum VkImageLayout {

		//@extension("VK_NV_shading_rate_image") // 165
		VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV = 1000164003,

		//@extension("VK_EXT_fragment_density_map") // 219
		VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT = 1000218000,
		}

		enum VkAttachmentLoadOp {
		@@ -1861,6 +1872,11 @@ enum VkStructureType {
		//@extension("VK_FUCHSIA_imagepipe_surface") // 215
		VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA = 1000214000,

		//@extension("VK_EXT_fragment_density_map") // 219
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT = 1000218000,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT = 1000218001,
		VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT = 1000218002,

		//@extension("VK_EXT_scalar_block_layout")
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT = 1000221000,

		@@ -2478,6 +2494,9 @@ bitfield VkAccessFlagBits {
		VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_NV = 0x00200000,
		VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_NV = 0x00400000,

		//@extension("VK_EXT_fragment_density_map") // 219
		VK_ACCESS_FRAGMENT_DENSITY_MAP_READ_BIT_EXT = 0x01000000,

		//@extension("VK_EXT_transform_feedback") // 29
		VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT = 0x02000000,
		VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT = 0x04000000,
		@@ -2573,6 +2592,9 @@ bitfield VkImageUsageFlagBits {

		//@extension("VK_NV_shading_rate_image") // 165
		VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV = 0x00000100,

		//@extension("VK_EXT_fragment_density_map") // 219
		VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT = 0x00000200,
		}

		/// Image creation flags
		@@ -2614,12 +2636,17 @@ bitfield VkImageCreateFlagBits {

		//@extension("VK_NV_corner_sampled_image") // 51
		VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV = 0x00002000,

		//@extension("VK_EXT_fragment_density_map") // 219
		VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT = 0x00004000,
		}

		/// Image view creation flags
		type VkFlags VkImageViewCreateFlags
		//bitfield VkImageViewCreateFlagBits {
		//}
		bitfield VkImageViewCreateFlagBits {
		//@extension("VK_EXT_fragment_density_map") // 219
		VK_IMAGE_VIEW_CREATE_FRAGMENT_DENSITY_MAP_DYNAMIC_BIT_EXT = 0x00000001,
		}

		/// Pipeline creation flags
		type VkFlags VkPipelineCreateFlags
		@@ -2829,16 +2856,18 @@ bitfield VkPipelineStageFlagBits {
		//@extension("VK_EXT_conditional_rendering") // 82
		VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT = 0x00040000,

		//@extension("VK_NV_shading_rate_image") // 165
		VK_PIPELINE_STAGE_SHADING_RATE_IMAGE_BIT_NV = 0x00400000,
		//@extension("VK_NV_mesh_shader") // 203
		VK_PIPELINE_STAGE_TASK_SHADER_BIT_NV = 0x00080000,
		VK_PIPELINE_STAGE_MESH_SHADER_BIT_NV = 0x00100000,

		//@extension("VK_NV_ray_tracing") // 166
		VK_PIPELINE_STAGE_RAY_TRACING_BIT_NV = 0x00200000,
		VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_NV = 0x02000000,

		//@extension("VK_NV_mesh_shader") // 203
		VK_PIPELINE_STAGE_TASK_SHADER_BIT_NV = 0x00080000,
		VK_PIPELINE_STAGE_MESH_SHADER_BIT_NV = 0x00100000,
		//@extension("VK_NV_shading_rate_image") // 165
		VK_PIPELINE_STAGE_SHADING_RATE_IMAGE_BIT_NV = 0x00400000,

		//@extension("VK_EXT_fragment_density_map") // 219
		VK_PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT_EXT = 0x00800000,

		//@extension("VK_EXT_transform_feedback") // 29
		VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT = 0x01000000,
		@@ -2999,8 +3028,11 @@ type VkFlags VkPipelineLayoutCreateFlags

		/// Sampler creation flags
		type VkFlags VkSamplerCreateFlags
		//bitfield VkSamplerCreateFlagBits {
		//}
		bitfield VkSamplerCreateFlagBits {
		//@extension("VK_EXT_fragment_density_map") // 219
		VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT = 0x00000001,
		VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT = 0x00000002,
		}

		/// Render pass creation flags
		type VkFlags VkRenderPassCreateFlags
		@@ -3185,6 +3217,9 @@ bitfield VkSwapchainCreateFlagBitsKHR {
		//@vulkan1_1
		VK_SWAPCHAIN_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR = 0x00000001,
		VK_SWAPCHAIN_CREATE_PROTECTED_BIT_KHR = 0x00000002,

		//@extension("VK_KHR_swapchain_mutable_format") // 201
		VK_SWAPCHAIN_CREATE_MUTABLE_FORMAT_BIT_KHR = 0x00000004,
		}

		@vulkan1_1
		@@ -5028,7 +5063,7 @@ class VkDescriptorUpdateTemplateEntry {

		class VkDescriptorUpdateTemplateCreateInfo {
		VkStructureType sType
		void* pNext
		const void* pNext
		VkDescriptorUpdateTemplateCreateFlags flags
		u32 descriptorUpdateEntryCount
		const VkDescriptorUpdateTemplateEntry* pDescriptorUpdateEntries
		@@ -7674,6 +7709,31 @@ class VkImagePipeSurfaceCreateInfoFUCHSIA {
		platform.zx_handle_t imagePipeHandle
		}

		@extension("VK_EXT_fragment_density_map") // 219
		class VkPhysicalDeviceFragmentDensityMapFeaturesEXT {
		VkStructureType sType
		void* pNext
		VkBool32 fragmentDensityMap
		VkBool32 fragmentDensityMapDynamic
		VkBool32 fragmentDensityMapNonSubsampledImages
		}

		@extension("VK_EXT_fragment_density_map") // 219
		class VkPhysicalDeviceFragmentDensityMapPropertiesEXT {
		VkStructureType sType
		void* pNext
		VkExtent2D minFragmentDensityTexelSize
		VkExtent2D maxFragmentDensityTexelSize
		VkBool32 fragmentDensityInvocations
		}

		@extension("VK_EXT_fragment_density_map") // 219
		class VkRenderPassFragmentDensityMapCreateInfoEXT {
		VkStructureType sType
		const void* pNext
		VkAttachmentReference fragmentDensityMapAttachment
		}

		@extension("VK_EXT_scalar_block_layout") // 222
		class VkPhysicalDeviceScalarBlockLayoutFeaturesEXT {
		VkStructureType sType

vulkan/include/vulkan/vulkan_core.h

+57 −3

Original line number	Diff line number	Diff line
		@@ -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 93
		#define VK_HEADER_VERSION 94


		#define VK_NULL_HANDLE 0
		@@ -454,6 +454,9 @@ 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_FRAGMENT_DENSITY_MAP_FEATURES_EXT = 1000218000,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT = 1000218001,
		VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT = 1000218002,
		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,
		@@ -879,6 +882,7 @@ typedef enum VkImageLayout {
		VK_IMAGE_LAYOUT_PRESENT_SRC_KHR = 1000001002,
		VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR = 1000111000,
		VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV = 1000164003,
		VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT = 1000218000,
		VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL,
		VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL,
		VK_IMAGE_LAYOUT_BEGIN_RANGE = VK_IMAGE_LAYOUT_UNDEFINED,
		@@ -1326,6 +1330,7 @@ typedef enum VkFormatFeatureFlagBits {
		VK_FORMAT_FEATURE_COSITED_CHROMA_SAMPLES_BIT = 0x00800000,
		VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG = 0x00002000,
		VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT_EXT = 0x00010000,
		VK_FORMAT_FEATURE_FRAGMENT_DENSITY_MAP_BIT_EXT = 0x01000000,
		VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR = VK_FORMAT_FEATURE_TRANSFER_SRC_BIT,
		VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR = VK_FORMAT_FEATURE_TRANSFER_DST_BIT,
		VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT_KHR = VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT,
		@@ -1349,6 +1354,7 @@ typedef enum VkImageUsageFlagBits {
		VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT = 0x00000040,
		VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT = 0x00000080,
		VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV = 0x00000100,
		VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT = 0x00000200,
		VK_IMAGE_USAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
		} VkImageUsageFlagBits;
		typedef VkFlags VkImageUsageFlags;
		@@ -1368,6 +1374,7 @@ typedef enum VkImageCreateFlagBits {
		VK_IMAGE_CREATE_DISJOINT_BIT = 0x00000200,
		VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV = 0x00002000,
		VK_IMAGE_CREATE_SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_BIT_EXT = 0x00001000,
		VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT = 0x00004000,
		VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR = VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT,
		VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT,
		VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT,
		@@ -1452,6 +1459,7 @@ typedef enum VkPipelineStageFlagBits {
		VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_NV = 0x02000000,
		VK_PIPELINE_STAGE_TASK_SHADER_BIT_NV = 0x00080000,
		VK_PIPELINE_STAGE_MESH_SHADER_BIT_NV = 0x00100000,
		VK_PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT_EXT = 0x00800000,
		VK_PIPELINE_STAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
		} VkPipelineStageFlagBits;
		typedef VkFlags VkPipelineStageFlags;
		@@ -1551,6 +1559,11 @@ typedef enum VkBufferUsageFlagBits {
		} VkBufferUsageFlagBits;
		typedef VkFlags VkBufferUsageFlags;
		typedef VkFlags VkBufferViewCreateFlags;

		typedef enum VkImageViewCreateFlagBits {
		VK_IMAGE_VIEW_CREATE_FRAGMENT_DENSITY_MAP_DYNAMIC_BIT_EXT = 0x00000001,
		VK_IMAGE_VIEW_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
		} VkImageViewCreateFlagBits;
		typedef VkFlags VkImageViewCreateFlags;
		typedef VkFlags VkShaderModuleCreateFlags;
		typedef VkFlags VkPipelineCacheCreateFlags;
		@@ -1617,6 +1630,12 @@ typedef VkFlags VkColorComponentFlags;
		typedef VkFlags VkPipelineDynamicStateCreateFlags;
		typedef VkFlags VkPipelineLayoutCreateFlags;
		typedef VkFlags VkShaderStageFlags;

		typedef enum VkSamplerCreateFlagBits {
		VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT = 0x00000001,
		VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT = 0x00000002,
		VK_SAMPLER_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
		} VkSamplerCreateFlagBits;
		typedef VkFlags VkSamplerCreateFlags;

		typedef enum VkDescriptorSetLayoutCreateFlagBits {
		@@ -1677,6 +1696,7 @@ typedef enum VkAccessFlagBits {
		VK_ACCESS_SHADING_RATE_IMAGE_READ_BIT_NV = 0x00800000,
		VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_NV = 0x00200000,
		VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_NV = 0x00400000,
		VK_ACCESS_FRAGMENT_DENSITY_MAP_READ_BIT_EXT = 0x01000000,
		VK_ACCESS_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
		} VkAccessFlagBits;
		typedef VkFlags VkAccessFlags;
		@@ -4357,7 +4377,7 @@ typedef struct VkDescriptorUpdateTemplateEntry {

		typedef struct VkDescriptorUpdateTemplateCreateInfo {
		VkStructureType sType;
		void* pNext;
		const void* pNext;
		VkDescriptorUpdateTemplateCreateFlags flags;
		uint32_t descriptorUpdateEntryCount;
		const VkDescriptorUpdateTemplateEntry* pDescriptorUpdateEntries;
		@@ -4796,6 +4816,7 @@ VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSwapchainKHR)
		typedef enum VkSwapchainCreateFlagBitsKHR {
		VK_SWAPCHAIN_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR = 0x00000001,
		VK_SWAPCHAIN_CREATE_PROTECTED_BIT_KHR = 0x00000002,
		VK_SWAPCHAIN_CREATE_MUTABLE_FORMAT_BIT_KHR = 0x00000004,
		VK_SWAPCHAIN_CREATE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
		} VkSwapchainCreateFlagBitsKHR;
		typedef VkFlags VkSwapchainCreateFlagsKHR;
		@@ -6128,6 +6149,11 @@ typedef struct VkPhysicalDeviceDriverPropertiesKHR {



		#define VK_KHR_swapchain_mutable_format 1
		#define VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_SPEC_VERSION 1
		#define VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME "VK_KHR_swapchain_mutable_format"


		#define VK_KHR_vulkan_memory_model 1
		#define VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION 2
		#define VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME "VK_KHR_vulkan_memory_model"
		@@ -8117,7 +8143,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetCoarseSampleOrderNV(
		#define VK_NV_ray_tracing 1
		VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkAccelerationStructureNV)

		#define VK_NV_RAY_TRACING_SPEC_VERSION 2
		#define VK_NV_RAY_TRACING_SPEC_VERSION 3
		#define VK_NV_RAY_TRACING_EXTENSION_NAME "VK_NV_ray_tracing"
		#define VK_SHADER_UNUSED_NV (~0U)

		@@ -8807,6 +8833,34 @@ typedef struct VkPhysicalDevicePCIBusInfoPropertiesEXT {



		#define VK_EXT_fragment_density_map 1
		#define VK_EXT_FRAGMENT_DENSITY_MAP_SPEC_VERSION 1
		#define VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME "VK_EXT_fragment_density_map"

		typedef struct VkPhysicalDeviceFragmentDensityMapFeaturesEXT {
		VkStructureType sType;
		void* pNext;
		VkBool32 fragmentDensityMap;
		VkBool32 fragmentDensityMapDynamic;
		VkBool32 fragmentDensityMapNonSubsampledImages;
		} VkPhysicalDeviceFragmentDensityMapFeaturesEXT;

		typedef struct VkPhysicalDeviceFragmentDensityMapPropertiesEXT {
		VkStructureType sType;
		void* pNext;
		VkExtent2D minFragmentDensityTexelSize;
		VkExtent2D maxFragmentDensityTexelSize;
		VkBool32 fragmentDensityInvocations;
		} VkPhysicalDeviceFragmentDensityMapPropertiesEXT;

		typedef struct VkRenderPassFragmentDensityMapCreateInfoEXT {
		VkStructureType sType;
		const void* pNext;
		VkAttachmentReference fragmentDensityMapAttachment;
		} VkRenderPassFragmentDensityMapCreateInfoEXT;



		#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"