Merge "vulkan: Update headers to 1.1.82" (996b241d) · Commits · e / os / android_frameworks_native-old

vulkan/api/vulkan.api

+39 −2

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

	// API limits		// API limits
	define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256		define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256
	@@ -533,6 +533,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_SPEC_VERSION 1
	@extension("VK_NV_shader_subgroup_partitioned") define VK_NV_SHADER_SUBGROUP_PARTITIONED_EXTENSION_NAME "VK_NV_shader_subgroup_partitioned"		@extension("VK_NV_shader_subgroup_partitioned") define VK_NV_SHADER_SUBGROUP_PARTITIONED_EXTENSION_NAME "VK_NV_shader_subgroup_partitioned"

			// 207
			@extension("VK_NV_device_diagnostic_checkpoints") define VK_NV_DEVICE_DIAGNOSTIC_CHECKPOINTS_SPEC_VERSION 2
			@extension("VK_NV_device_diagnostic_checkpoints") define VK_NV_DEVICE_DIAGNOSTIC_CHECKPOINTS_EXTENSION_NAME "VK_NV_device_diagnostic_checkpoints"

	/////////////		/////////////
	// Types //		// Types //
	/////////////		/////////////
	@@ -1663,6 +1667,10 @@ enum VkStructureType {
	//@extension("VK_EXT_vertex_attribute_divisor") // 191		//@extension("VK_EXT_vertex_attribute_divisor") // 191
	VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000,		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000,
	VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001,		VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001,

			//@extension("VK_NV_device_diagnostic_checkpoints") // 207
			VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV = 1000206000,
			VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV = 1000206001,
	}		}

	enum VkSubpassContents {		enum VkSubpassContents {
	@@ -5335,7 +5343,7 @@ class VkValidationFlagsEXT {
	VkStructureType sType		VkStructureType sType
	const void* pNext		const void* pNext
	u32 disabledValidationCheckCount		u32 disabledValidationCheckCount
	VkValidationCheckEXT* pDisabledValidationChecks		const VkValidationCheckEXT* pDisabledValidationChecks
	}		}

	@extension("VK_NN_vi_surface") // 63		@extension("VK_NN_vi_surface") // 63
	@@ -6788,6 +6796,21 @@ class VkPipelineVertexInputDivisorStateCreateInfoEXT {
	const VkVertexInputBindingDivisorDescriptionEXT* pVertexBindingDivisors		const VkVertexInputBindingDivisorDescriptionEXT* pVertexBindingDivisors
	}		}

			@extension("VK_NV_device_diagnostic_checkpoints") // 207
			class VkQueueFamilyCheckpointPropertiesNV {
			VkStructureType sType
			void* pNext
			VkPipelineStageFlags checkpointExecutionStageMask
			}

			@extension("VK_NV_device_diagnostic_checkpoints") // 207
			class VkCheckpointDataNV {
			VkStructureType sType
			void* pNext
			VkPipelineStageFlagBits stage
			void* pCheckpointMarker
			}


	////////////////		////////////////
	// Commands //		// Commands //
	@@ -10584,6 +10607,20 @@ cmd void vkCmdWriteBufferMarkerAMD(
	u32 marker) {		u32 marker) {
	}		}

			@extension("VK_NV_device_diagnostic_checkpoints") // 207
			cmd void vkCmdSetCheckpointNV(
			VkCommandBuffer commandBuffer,
			const void* pCheckpointMarker) {
			}

			@extension("VK_NV_device_diagnostic_checkpoints") // 207
			cmd void vkGetQueueCheckpointDataNV(
			VkQueue queue,
			u32* pCheckpointDataCount,
			VkCheckpointDataNV* pCheckpointData) {
			}


	////////////////		////////////////
	// Validation //		// Validation //
	////////////////		////////////////

vulkan/include/vulkan/vulkan_core.h

+40 −6

Original line number	Original line	Diff line number	Diff line
	@@ -43,7 +43,7 @@ extern "C" {
	#define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff)		#define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff)
	#define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff)		#define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff)
	// Version of this file		// Version of this file
	#define VK_HEADER_VERSION 80		#define VK_HEADER_VERSION 82


	#define VK_NULL_HANDLE 0		#define VK_NULL_HANDLE 0
	@@ -406,6 +406,8 @@ typedef enum VkStructureType {
	VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000,		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000,
	VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000,		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000,
	VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001,		VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001,
			VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV = 1000206000,
			VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV = 1000206001,
	VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO,		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,		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES,
	VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES,		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES,
	@@ -6414,7 +6416,7 @@ typedef struct VkValidationFlagsEXT {
	VkStructureType sType;		VkStructureType sType;
	const void* pNext;		const void* pNext;
	uint32_t disabledValidationCheckCount;		uint32_t disabledValidationCheckCount;
	VkValidationCheckEXT* pDisabledValidationChecks;		const VkValidationCheckEXT* pDisabledValidationChecks;
	} VkValidationFlagsEXT;		} VkValidationFlagsEXT;


	@@ -7732,7 +7734,7 @@ typedef struct VkPhysicalDeviceShaderCorePropertiesAMD {


	#define VK_EXT_vertex_attribute_divisor 1		#define VK_EXT_vertex_attribute_divisor 1
	#define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 1		#define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 2
	#define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME "VK_EXT_vertex_attribute_divisor"		#define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME "VK_EXT_vertex_attribute_divisor"

	typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT {		typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT {
	@@ -7760,6 +7762,38 @@ typedef struct VkPipelineVertexInputDivisorStateCreateInfoEXT {
	#define VK_NV_SHADER_SUBGROUP_PARTITIONED_EXTENSION_NAME "VK_NV_shader_subgroup_partitioned"		#define VK_NV_SHADER_SUBGROUP_PARTITIONED_EXTENSION_NAME "VK_NV_shader_subgroup_partitioned"


			#define VK_NV_device_diagnostic_checkpoints 1
			#define VK_NV_DEVICE_DIAGNOSTIC_CHECKPOINTS_SPEC_VERSION 2
			#define VK_NV_DEVICE_DIAGNOSTIC_CHECKPOINTS_EXTENSION_NAME "VK_NV_device_diagnostic_checkpoints"

			typedef struct VkQueueFamilyCheckpointPropertiesNV {
			VkStructureType sType;
			void* pNext;
			VkPipelineStageFlags checkpointExecutionStageMask;
			} VkQueueFamilyCheckpointPropertiesNV;

			typedef struct VkCheckpointDataNV {
			VkStructureType sType;
			void* pNext;
			VkPipelineStageFlagBits stage;
			void* pCheckpointMarker;
			} VkCheckpointDataNV;


			typedef void (VKAPI_PTR PFN_vkCmdSetCheckpointNV)(VkCommandBuffer commandBuffer, const void pCheckpointMarker);
			typedef void (VKAPI_PTR PFN_vkGetQueueCheckpointDataNV)(VkQueue queue, uint32_t pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData);

			#ifndef VK_NO_PROTOTYPES
			VKAPI_ATTR void VKAPI_CALL vkCmdSetCheckpointNV(
			VkCommandBuffer commandBuffer,
			const void* pCheckpointMarker);

			VKAPI_ATTR void VKAPI_CALL vkGetQueueCheckpointDataNV(
			VkQueue queue,
			uint32_t* pCheckpointDataCount,
			VkCheckpointDataNV* pCheckpointData);
			#endif

	#ifdef __cplusplus		#ifdef __cplusplus
	}		}
	#endif		#endif