Merge "vulkan: update Vulkan headers to 1.0.49" (fa3c1590) · Commits · e / os / android_frameworks_native-old

vulkan/api/vulkan.api

+125 −4

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 0
		define VERSION_PATCH 46
		define VERSION_PATCH 49

		// API limits
		define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256
		@@ -316,6 +316,14 @@ define NULL_HANDLE 0
		@extension("VK_EXT_hdr_metadata") define VK_EXT_HDR_METADATA_SPEC_VERSION 1
		@extension("VK_EXT_hdr_metadata") define VK_EXT_HDR_METADATA_EXTENSION_NAME "VK_EXT_hdr_metadata"

		// 112
		@extension("VK_KHR_shared_presentable_image") define VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION 1
		@extension("VK_KHR_shared_presentable_image") define VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME "VK_KHR_shared_presentable_image"

		// 120
		@extension("VK_KHR_get_surface_capabilities2") define VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION 1
		@extension("VK_KHR_get_surface_capabilities2") define VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME "VK_KHR_get_surface_capabilities2"

		// 123
		@extension("VK_MVK_ios_surface") define VK_MVK_IOS_SURFACE_SPEC_VERSION 1
		@extension("VK_MVK_ios_surface") define VK_MVK_IOS_SURFACE_EXTENSION_NAME "VK_MVK_ios_surface"
		@@ -400,6 +408,9 @@ enum VkImageLayout {

		//@extension("VK_KHR_swapchain") // 2
		VK_IMAGE_LAYOUT_PRESENT_SRC_KHR = 1000001002,

		//@extension("VK_KHR_shared_presentable_image") // 112
		VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR = 1000111000,
		}

		enum VkAttachmentLoadOp {
		@@ -992,9 +1003,6 @@ enum VkStructureType {
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHX = 1000071002,
		VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHX = 1000071003,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHX = 1000071004,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHX = 1000071005,
		VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHX = 1000071006,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHX = 1000071007,

		//@extension("VK_KHX_external_memory") // 73
		VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHX = 1000072000,
		@@ -1073,6 +1081,14 @@ enum VkStructureType {
		//@extension("VK_EXT_hdr_metadata") // 106
		VK_STRUCTURE_TYPE_HDR_METADATA_EXT = 1000105000,

		//@extension("VK_KHR_shared_presentable_image") // 112
		VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR = 1000111000,

		//@extension("VK_KHR_get_surface_capabilities2") // 120
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR = 1000119000,
		VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR = 1000119001,
		VK_STRUCTURE_TYPE_SURFACE_FORMAT_2_KHR = 1000119002,

		//@extension("VK_MVK_ios_surface") // 123
		VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK = 1000122000,

		@@ -1158,12 +1174,65 @@ enum VkDynamicState {
		VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT = 1000099000,
		}

		enum VkObjectType {
		VK_OBJECT_TYPE_UNKNOWN = 0,
		VK_OBJECT_TYPE_INSTANCE = 1,
		VK_OBJECT_TYPE_PHYSICAL_DEVICE = 2,
		VK_OBJECT_TYPE_DEVICE = 3,
		VK_OBJECT_TYPE_QUEUE = 4,
		VK_OBJECT_TYPE_SEMAPHORE = 5,
		VK_OBJECT_TYPE_COMMAND_BUFFER = 6,
		VK_OBJECT_TYPE_FENCE = 7,
		VK_OBJECT_TYPE_DEVICE_MEMORY = 8,
		VK_OBJECT_TYPE_BUFFER = 9,
		VK_OBJECT_TYPE_IMAGE = 10,
		VK_OBJECT_TYPE_EVENT = 11,
		VK_OBJECT_TYPE_QUERY_POOL = 12,
		VK_OBJECT_TYPE_BUFFER_VIEW = 13,
		VK_OBJECT_TYPE_IMAGE_VIEW = 14,
		VK_OBJECT_TYPE_SHADER_MODULE = 15,
		VK_OBJECT_TYPE_PIPELINE_CACHE = 16,
		VK_OBJECT_TYPE_PIPELINE_LAYOUT = 17,
		VK_OBJECT_TYPE_RENDER_PASS = 18,
		VK_OBJECT_TYPE_PIPELINE = 19,
		VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT = 20,
		VK_OBJECT_TYPE_SAMPLER = 21,
		VK_OBJECT_TYPE_DESCRIPTOR_POOL = 22,
		VK_OBJECT_TYPE_DESCRIPTOR_SET = 23,
		VK_OBJECT_TYPE_FRAMEBUFFER = 24,
		VK_OBJECT_TYPE_COMMAND_POOL = 25,

		//@extension("VK_KHR_surface") // 1
		VK_OBJECT_TYPE_SURFACE_KHR = 1000000000,

		//@extension("VK_KHR_swapchain") // 2
		VK_OBJECT_TYPE_SWAPCHAIN_KHR = 1000001000,

		//@extension("VK_KHR_display") // 3
		VK_OBJECT_TYPE_DISPLAY_KHR = 1000002000,
		VK_OBJECT_TYPE_DISPLAY_MODE_KHR = 1000002001,

		//@extension("VK_KHR_debug_report") // 12
		VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT = 1000011000,

		//@extension("VK_KHR_descriptor_update_template") // 86
		VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR = 1000085000,

		//@extension("VK_NVX_device_generated_commands") // 87
		VK_OBJECT_TYPE_OBJECT_TABLE_NVX = 1000086000,
		VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX = 1000086001,
		}

		@extension("VK_KHR_surface") // 1
		enum VkPresentModeKHR {
		VK_PRESENT_MODE_IMMEDIATE_KHR = 0x00000000,
		VK_PRESENT_MODE_MAILBOX_KHR = 0x00000001,
		VK_PRESENT_MODE_FIFO_KHR = 0x00000002,
		VK_PRESENT_MODE_FIFO_RELAXED_KHR = 0x00000003,

		//@extension("VK_KHR_shared_presentable_image") // 112
		VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR = 1000111000,
		VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR = 1000111001,
		}

		@extension("VK_KHR_surface") // 1
		@@ -4208,6 +4277,34 @@ class VkHdrMetadataEXT {
		f32 maxFrameAverageLightLevel
		}

		@extension("VK_KHR_shared_presentable_image") // 112
		class VkSharedPresentSurfaceCapabilitiesKHR {
		VkStructureType sType
		void* pNext
		VkImageUsageFlags sharedPresentSupportedUsageFlags
		}

		@extension("VK_KHR_get_surface_capabilities2") // 120
		class VkPhysicalDeviceSurfaceInfo2KHR {
		VkStructureType sType
		const void* pNext
		VkSurfaceKHR surface
		}

		@extension("VK_KHR_get_surface_capabilities2") // 120
		class VkSurfaceCapabilities2KHR {
		VkStructureType sType
		void* pNext
		VkSurfaceCapabilitiesKHR surfaceCapabilities
		}

		@extension("VK_KHR_get_surface_capabilities2") // 120
		class VkSurfaceFormat2KHR {
		VkStructureType sType
		void* pNext
		VkSurfaceFormatKHR surfaceFormat
		}

		@extension("VK_MVK_ios_surface") // 123
		class VkIOSSurfaceCreateInfoMVK {
		VkStructureType sType
		@@ -7355,6 +7452,30 @@ cmd void vkSetHdrMetadataEXT(
		const VkHdrMetadataEXT* pMetadata) {
		}

		@extension("VK_KHR_shared_presentable_image") // 112
		cmd VkResult vkGetSwapchainStatusKHR(
		VkDevice device,
		VkSwapchainKHR swapchain) {
		return ?
		}

		//@extension("VK_KHR_get_surface_capabilities2") // 120
		//cmd VkResult vkGetPhysicalDeviceSurfaceCapabilities2KHR(
		// VkPhysicalDevice physicalDevice,
		// const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
		// VkSurfaceCapabilities2KHR* pSurfaceCapabilities) {
		// return ?
		//}

		//@extension("VK_KHR_get_surface_capabilities2") // 120
		//cmd VkResult vkGetPhysicalDeviceSurfaceFormats2KHR(
		// VkPhysicalDevice physicalDevice,
		// const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
		// u32* pSurfaceFormatCount,
		// VkSurfaceFormat2KHR* pSurfaceFormats) {
		// return ?
		//}

		@extension("VK_MVK_ios_surface") // 123
		cmd VkResult vkCreateIOSSurfaceMVK(
		VkInstance instance,

vulkan/include/vulkan/vulkan.h

+107 −4

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 46
		#define VK_HEADER_VERSION 49


		#define VK_NULL_HANDLE 0
		@@ -261,9 +261,6 @@ typedef enum VkStructureType {
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHX = 1000071002,
		VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHX = 1000071003,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHX = 1000071004,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHX = 1000071005,
		VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHX = 1000071006,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHX = 1000071007,
		VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHX = 1000072000,
		VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHX = 1000072001,
		VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHX = 1000072002,
		@@ -301,6 +298,10 @@ typedef enum VkStructureType {
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT = 1000099000,
		VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT = 1000099001,
		VK_STRUCTURE_TYPE_HDR_METADATA_EXT = 1000105000,
		VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR = 1000111000,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR = 1000119000,
		VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR = 1000119001,
		VK_STRUCTURE_TYPE_SURFACE_FORMAT_2_KHR = 1000119002,
		VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK = 1000122000,
		VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK = 1000123000,
		VK_STRUCTURE_TYPE_BEGIN_RANGE = VK_STRUCTURE_TYPE_APPLICATION_INFO,
		@@ -590,6 +591,7 @@ typedef enum VkImageLayout {
		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL = 7,
		VK_IMAGE_LAYOUT_PREINITIALIZED = 8,
		VK_IMAGE_LAYOUT_PRESENT_SRC_KHR = 1000001002,
		VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR = 1000111000,
		VK_IMAGE_LAYOUT_BEGIN_RANGE = VK_IMAGE_LAYOUT_UNDEFINED,
		VK_IMAGE_LAYOUT_END_RANGE = VK_IMAGE_LAYOUT_PREINITIALIZED,
		VK_IMAGE_LAYOUT_RANGE_SIZE = (VK_IMAGE_LAYOUT_PREINITIALIZED - VK_IMAGE_LAYOUT_UNDEFINED + 1),
		@@ -896,6 +898,47 @@ typedef enum VkSubpassContents {
		VK_SUBPASS_CONTENTS_MAX_ENUM = 0x7FFFFFFF
		} VkSubpassContents;

		typedef enum VkObjectType {
		VK_OBJECT_TYPE_UNKNOWN = 0,
		VK_OBJECT_TYPE_INSTANCE = 1,
		VK_OBJECT_TYPE_PHYSICAL_DEVICE = 2,
		VK_OBJECT_TYPE_DEVICE = 3,
		VK_OBJECT_TYPE_QUEUE = 4,
		VK_OBJECT_TYPE_SEMAPHORE = 5,
		VK_OBJECT_TYPE_COMMAND_BUFFER = 6,
		VK_OBJECT_TYPE_FENCE = 7,
		VK_OBJECT_TYPE_DEVICE_MEMORY = 8,
		VK_OBJECT_TYPE_BUFFER = 9,
		VK_OBJECT_TYPE_IMAGE = 10,
		VK_OBJECT_TYPE_EVENT = 11,
		VK_OBJECT_TYPE_QUERY_POOL = 12,
		VK_OBJECT_TYPE_BUFFER_VIEW = 13,
		VK_OBJECT_TYPE_IMAGE_VIEW = 14,
		VK_OBJECT_TYPE_SHADER_MODULE = 15,
		VK_OBJECT_TYPE_PIPELINE_CACHE = 16,
		VK_OBJECT_TYPE_PIPELINE_LAYOUT = 17,
		VK_OBJECT_TYPE_RENDER_PASS = 18,
		VK_OBJECT_TYPE_PIPELINE = 19,
		VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT = 20,
		VK_OBJECT_TYPE_SAMPLER = 21,
		VK_OBJECT_TYPE_DESCRIPTOR_POOL = 22,
		VK_OBJECT_TYPE_DESCRIPTOR_SET = 23,
		VK_OBJECT_TYPE_FRAMEBUFFER = 24,
		VK_OBJECT_TYPE_COMMAND_POOL = 25,
		VK_OBJECT_TYPE_SURFACE_KHR = 1000000000,
		VK_OBJECT_TYPE_SWAPCHAIN_KHR = 1000001000,
		VK_OBJECT_TYPE_DISPLAY_KHR = 1000002000,
		VK_OBJECT_TYPE_DISPLAY_MODE_KHR = 1000002001,
		VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT = 1000011000,
		VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR = 1000085000,
		VK_OBJECT_TYPE_OBJECT_TABLE_NVX = 1000086000,
		VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX = 1000086001,
		VK_OBJECT_TYPE_BEGIN_RANGE = VK_OBJECT_TYPE_UNKNOWN,
		VK_OBJECT_TYPE_END_RANGE = VK_OBJECT_TYPE_COMMAND_POOL,
		VK_OBJECT_TYPE_RANGE_SIZE = (VK_OBJECT_TYPE_COMMAND_POOL - VK_OBJECT_TYPE_UNKNOWN + 1),
		VK_OBJECT_TYPE_MAX_ENUM = 0x7FFFFFFF
		} VkObjectType;

		typedef VkFlags VkInstanceCreateFlags;

		typedef enum VkFormatFeatureFlagBits {
		@@ -3323,6 +3366,8 @@ typedef enum VkPresentModeKHR {
		VK_PRESENT_MODE_MAILBOX_KHR = 1,
		VK_PRESENT_MODE_FIFO_KHR = 2,
		VK_PRESENT_MODE_FIFO_RELAXED_KHR = 3,
		VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR = 1000111000,
		VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR = 1000111001,
		VK_PRESENT_MODE_BEGIN_RANGE_KHR = VK_PRESENT_MODE_IMMEDIATE_KHR,
		VK_PRESENT_MODE_END_RANGE_KHR = VK_PRESENT_MODE_FIFO_RELAXED_KHR,
		VK_PRESENT_MODE_RANGE_SIZE_KHR = (VK_PRESENT_MODE_FIFO_RELAXED_KHR - VK_PRESENT_MODE_IMMEDIATE_KHR + 1),
		@@ -4101,6 +4146,64 @@ VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetWithTemplateKHR(
		const void* pData);
		#endif

		#define VK_KHR_shared_presentable_image 1
		#define VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION 1
		#define VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME "VK_KHR_shared_presentable_image"

		typedef struct VkSharedPresentSurfaceCapabilitiesKHR {
		VkStructureType sType;
		void* pNext;
		VkImageUsageFlags sharedPresentSupportedUsageFlags;
		} VkSharedPresentSurfaceCapabilitiesKHR;


		typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainStatusKHR)(VkDevice device, VkSwapchainKHR swapchain);

		#ifndef VK_NO_PROTOTYPES
		VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainStatusKHR(
		VkDevice device,
		VkSwapchainKHR swapchain);
		#endif

		#define VK_KHR_get_surface_capabilities2 1
		#define VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION 1
		#define VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME "VK_KHR_get_surface_capabilities2"

		typedef struct VkPhysicalDeviceSurfaceInfo2KHR {
		VkStructureType sType;
		const void* pNext;
		VkSurfaceKHR surface;
		} VkPhysicalDeviceSurfaceInfo2KHR;

		typedef struct VkSurfaceCapabilities2KHR {
		VkStructureType sType;
		void* pNext;
		VkSurfaceCapabilitiesKHR surfaceCapabilities;
		} VkSurfaceCapabilities2KHR;

		typedef struct VkSurfaceFormat2KHR {
		VkStructureType sType;
		void* pNext;
		VkSurfaceFormatKHR surfaceFormat;
		} VkSurfaceFormat2KHR;


		typedef VkResult (VKAPI_PTR PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo, VkSurfaceCapabilities2KHR* pSurfaceCapabilities);
		typedef VkResult (VKAPI_PTR PFN_vkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo, uint32_t* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats);

		#ifndef VK_NO_PROTOTYPES
		VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilities2KHR(
		VkPhysicalDevice physicalDevice,
		const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
		VkSurfaceCapabilities2KHR* pSurfaceCapabilities);

		VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormats2KHR(
		VkPhysicalDevice physicalDevice,
		const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
		uint32_t* pSurfaceFormatCount,
		VkSurfaceFormat2KHR* pSurfaceFormats);
		#endif

		#define VK_EXT_debug_report 1
		VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT)