Merge "vulkan: update Vulkan headers to 1.0.46" (4cc7755c) · Commits · e / os / android_frameworks_native

vulkan/api/vulkan.api

+54 −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 43
		define VERSION_PATCH 46

		// API limits
		define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256
		@@ -93,7 +93,7 @@ define NULL_HANDLE 0
		@extension("VK_ANDROID_native_buffer") define VK_ANDROID_NATIVE_BUFFER_NAME "VK_ANDROID_native_buffer"

		// 12
		@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_SPEC_VERSION 5
		@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_SPEC_VERSION 6
		@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_NAME "VK_EXT_debug_report"

		// 13
		@@ -248,6 +248,10 @@ define NULL_HANDLE 0
		@extension("VK_KHR_push_descriptor") define VK_KHR_PUSH_DESCRIPTOR_SPEC_VERSION 1
		@extension("VK_KHR_push_descriptor") define VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME "VK_KHR_push_descriptor"

		// 85
		@extension("VK_KHR_incremental_present") define VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION 1
		@extension("VK_KHR_incremental_present") define VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME "VK_KHR_incremental_present"

		// 86
		@extension("VK_KHR_descriptor_update_template") define VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_SPEC_VERSION 1
		@extension("VK_KHR_descriptor_update_template") define VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME "VK_KHR_descriptor_update_template"
		@@ -304,6 +308,10 @@ define NULL_HANDLE 0
		@extension("VK_EXT_discard_rectangles") define VK_EXT_DISCARD_RECTANGLES_SPEC_VERSION 1
		@extension("VK_EXT_discard_rectangles") define VK_EXT_DISCARD_RECTANGLES_EXTENSION_NAME "VK_EXT_discard_rectangles"

		// 105
		@extension("VK_EXT_swapchain_colorspace") define VK_EXT_SWAPCHAIN_COLORSPACE_SPEC_VERSION 2
		@extension("VK_EXT_swapchain_colorspace") define VK_EXT_SWAPCHAIN_COLORSPACE_EXTENSION_NAME "VK_EXT_swapchain_colorspace"

		// 106
		@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"
		@@ -1023,6 +1031,9 @@ enum VkStructureType {
		//@extension("VK_KHR_push_descriptor") // 81
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR = 1000080000,

		//@extension("VK_KHR_incremental_present") // 85
		VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR = 1000084000,

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

		@@ -1158,6 +1169,21 @@ enum VkPresentModeKHR {
		@extension("VK_KHR_surface") // 1
		enum VkColorSpaceKHR {
		VK_COLORSPACE_SRGB_NONLINEAR_KHR = 0x00000000,

		//@extension("VK_EXT_swapchain_colorspace") // 105
		VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT = 1000104001,
		VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT = 1000104002,
		VK_COLOR_SPACE_DCI_P3_LINEAR_EXT = 1000104003,
		VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT = 1000104004,
		VK_COLOR_SPACE_BT709_LINEAR_EXT = 1000104005,
		VK_COLOR_SPACE_BT709_NONLINEAR_EXT = 1000104006,
		VK_COLOR_SPACE_BT2020_LINEAR_EXT = 1000104007,
		VK_COLOR_SPACE_HDR10_ST2084_EXT = 1000104008,
		VK_COLOR_SPACE_DOLBYVISION_EXT = 1000104009,
		VK_COLOR_SPACE_HDR10_HLG_EXT = 1000104010,
		VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT = 1000104011,
		VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT = 1000104012,
		VK_COLOR_SPACE_PASS_THROUGH_EXT = 1000104013,
		}

		@extension("VK_EXT_debug_report") // 12
		@@ -1195,6 +1221,9 @@ enum VkDebugReportObjectTypeEXT {
		VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_MODE_KHR_EXT = 30,
		VK_DEBUG_REPORT_OBJECT_TYPE_OBJECT_TABLE_NVX_EXT = 31,
		VK_DEBUG_REPORT_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX_EXT = 32,

		//extension("VK_KHR_descriptor_update_template") // 86
		VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR_EXT = 1000085000,
		}

		@extension("VK_EXT_debug_report") // 12
		@@ -3657,7 +3686,7 @@ class VkViSurfaceCreateInfoNN {
		@extension("VK_KHX_device_group_creation") // 71
		class VkPhysicalDeviceGroupPropertiesKHX {
		VkStructureType sType
		const void* pNext
		void* pNext
		u32 physicalDeviceCount
		VkPhysicalDevice[VK_MAX_DEVICE_GROUP_SIZE_KHX] physicalDevices
		VkBool32 subsetAllocation
		@@ -3858,6 +3887,27 @@ class VkPhysicalDevicePushDescriptorPropertiesKHR {
		u32 maxPushDescriptors
		}

		@extension("VK_KHR_incremental_present") // 85
		class VkRectLayerKHR {
		VkOffset2D offset
		VkExtent2D extent
		u32 layer
		}

		@extension("VK_KHR_incremental_present") // 85
		class VkPresentRegionKHR {
		u32 rectangleCount
		const VkRectLayerKHR* pRectangles
		}

		@extension("VK_KHR_incremental_present") // 85
		class VkPresentRegionsKHR {
		VkStructureType sType
		const void* pNext
		u32 swapchainCount
		const VkPresentRegionKHR* pRegions
		}

		@extension("VK_KHR_descriptor_update_template") // 86
		class VkDescriptorUpdateTemplateEntryKHR {
		u32 dstBinding
		@@ -4124,7 +4174,7 @@ class VkPipelineViewportSwizzleStateCreateInfoNV {
		@extension("VK_EXT_discard_rectangles") // 100
		class VkPhysicalDeviceDiscardRectanglePropertiesEXT {
		VkStructureType sType
		const void* pNext
		void* pNext
		u32 maxDiscardRectangles
		}

vulkan/include/vulkan/vulkan.h

+50 −6

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


		#define VK_NULL_HANDLE 0
		@@ -281,6 +281,7 @@ typedef enum VkStructureType {
		VK_STRUCTURE_TYPE_D3D12_FENCE_SUBMIT_INFO_KHX = 1000078002,
		VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHX = 1000079000,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR = 1000080000,
		VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR = 1000084000,
		VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR = 1000085000,
		VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX = 1000086000,
		VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX = 1000086001,
		@@ -3298,6 +3299,19 @@ VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR)

		typedef enum VkColorSpaceKHR {
		VK_COLOR_SPACE_SRGB_NONLINEAR_KHR = 0,
		VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT = 1000104001,
		VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT = 1000104002,
		VK_COLOR_SPACE_DCI_P3_LINEAR_EXT = 1000104003,
		VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT = 1000104004,
		VK_COLOR_SPACE_BT709_LINEAR_EXT = 1000104005,
		VK_COLOR_SPACE_BT709_NONLINEAR_EXT = 1000104006,
		VK_COLOR_SPACE_BT2020_LINEAR_EXT = 1000104007,
		VK_COLOR_SPACE_HDR10_ST2084_EXT = 1000104008,
		VK_COLOR_SPACE_DOLBYVISION_EXT = 1000104009,
		VK_COLOR_SPACE_HDR10_HLG_EXT = 1000104010,
		VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT = 1000104011,
		VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT = 1000104012,
		VK_COLOR_SPACE_PASS_THROUGH_EXT = 1000104013,
		VK_COLOR_SPACE_BEGIN_RANGE_KHR = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR,
		VK_COLOR_SPACE_END_RANGE_KHR = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR,
		VK_COLOR_SPACE_RANGE_SIZE_KHR = (VK_COLOR_SPACE_SRGB_NONLINEAR_KHR - VK_COLOR_SPACE_SRGB_NONLINEAR_KHR + 1),
		@@ -3991,6 +4005,30 @@ VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetKHR(
		const VkWriteDescriptorSet* pDescriptorWrites);
		#endif

		#define VK_KHR_incremental_present 1
		#define VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION 1
		#define VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME "VK_KHR_incremental_present"

		typedef struct VkRectLayerKHR {
		VkOffset2D offset;
		VkExtent2D extent;
		uint32_t layer;
		} VkRectLayerKHR;

		typedef struct VkPresentRegionKHR {
		uint32_t rectangleCount;
		const VkRectLayerKHR* pRectangles;
		} VkPresentRegionKHR;

		typedef struct VkPresentRegionsKHR {
		VkStructureType sType;
		const void* pNext;
		uint32_t swapchainCount;
		const VkPresentRegionKHR* pRegions;
		} VkPresentRegionsKHR;



		#define VK_KHR_descriptor_update_template 1
		VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorUpdateTemplateKHR)

		@@ -4066,7 +4104,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetWithTemplateKHR(
		#define VK_EXT_debug_report 1
		VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT)

		#define VK_EXT_DEBUG_REPORT_SPEC_VERSION 5
		#define VK_EXT_DEBUG_REPORT_SPEC_VERSION 6
		#define VK_EXT_DEBUG_REPORT_EXTENSION_NAME "VK_EXT_debug_report"
		#define VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT

		@@ -4105,6 +4143,7 @@ typedef enum VkDebugReportObjectTypeEXT {
		VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_MODE_KHR_EXT = 30,
		VK_DEBUG_REPORT_OBJECT_TYPE_OBJECT_TABLE_NVX_EXT = 31,
		VK_DEBUG_REPORT_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX_EXT = 32,
		VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR_EXT = 1000085000,
		VK_DEBUG_REPORT_OBJECT_TYPE_BEGIN_RANGE_EXT = VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT,
		VK_DEBUG_REPORT_OBJECT_TYPE_END_RANGE_EXT = VK_DEBUG_REPORT_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX_EXT,
		VK_DEBUG_REPORT_OBJECT_TYPE_RANGE_SIZE_EXT = (VK_DEBUG_REPORT_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX_EXT - VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT + 1),
		@@ -4761,7 +4800,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateViSurfaceNN(

		typedef struct VkPhysicalDeviceGroupPropertiesKHX {
		VkStructureType sType;
		const void* pNext;
		void* pNext;
		uint32_t physicalDeviceCount;
		VkPhysicalDevice physicalDevices[VK_MAX_DEVICE_GROUP_SIZE_KHX];
		VkBool32 subsetAllocation;
		@@ -4886,7 +4925,7 @@ typedef struct VkExportMemoryAllocateInfoKHX {



		#ifdef VK_USE_PLATFORM_WIN32_KHR
		#ifdef VK_USE_PLATFORM_WIN32_KHX
		#define VK_KHX_external_memory_win32 1
		#define VK_KHX_EXTERNAL_MEMORY_WIN32_SPEC_VERSION 1
		#define VK_KHX_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME "VK_KHX_external_memory_win32"
		@@ -4929,7 +4968,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryWin32HandlePropertiesKHX(
		HANDLE handle,
		VkMemoryWin32HandlePropertiesKHX* pMemoryWin32HandleProperties);
		#endif
		#endif /* VK_USE_PLATFORM_WIN32_KHR */
		#endif /* VK_USE_PLATFORM_WIN32_KHX */

		#define VK_KHX_external_memory_fd 1
		#define VK_KHX_EXTERNAL_MEMORY_FD_SPEC_VERSION 1
		@@ -5663,7 +5702,7 @@ typedef VkFlags VkPipelineDiscardRectangleStateCreateFlagsEXT;

		typedef struct VkPhysicalDeviceDiscardRectanglePropertiesEXT {
		VkStructureType sType;
		const void* pNext;
		void* pNext;
		uint32_t maxDiscardRectangles;
		} VkPhysicalDeviceDiscardRectanglePropertiesEXT;

		@@ -5687,6 +5726,11 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetDiscardRectangleEXT(
		const VkRect2D* pDiscardRectangles);
		#endif

		#define VK_EXT_swapchain_colorspace 1
		#define VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION 2
		#define VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME "VK_EXT_swapchain_colorspace"


		#define VK_EXT_hdr_metadata 1
		#define VK_EXT_HDR_METADATA_SPEC_VERSION 1
		#define VK_EXT_HDR_METADATA_EXTENSION_NAME "VK_EXT_hdr_metadata"

vulkan/libvulkan/api_gen.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ VKAPI_ATTR VkResult disabledCreateAndroidSurfaceKHR(VkInstance instance, const V

		// clang-format on

		} // anonymous
		} // namespace

		bool InitDispatchTable(
		VkInstance instance,

vulkan/libvulkan/driver_gen.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -278,7 +278,7 @@ const ProcHook g_proc_hooks[] = {
		// clang-format on
		};

		} // anonymous
		} // namespace

		const ProcHook* GetProcHook(const char* name) {
		const auto& begin = g_proc_hooks;