Merge "vulkan: Update headers to 1.1.76" (381ee9c8) · Commits · e / os / android_frameworks_native

vulkan/api/vulkan.api

+117 −1

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 72
		define VERSION_PATCH 76

		// API limits
		define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256
		@@ -377,6 +377,10 @@ define NULL_HANDLE 0
		@extension("VK_KHR_variable_pointers") define VK_KHR_VARIABLE_POINTERS_SPEC_VERSION 1
		@extension("VK_KHR_variable_pointers") define VK_KHR_VARIABLE_POINTERS_EXTENSION_NAME "VK_KHR_variable_pointers"

		// 122
		@extension("VK_KHR_get_display_properties2") define VK_KHR_GET_DISPLAY_PROPERTIES_2_SPEC_VERSION 1
		@extension("VK_KHR_get_display_properties2") define VK_KHR_GET_DISPLAY_PROPERTIES_2_EXTENSION_NAME "VK_KHR_get_display_properties2"

		// 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"
		@@ -489,6 +493,10 @@ define NULL_HANDLE 0
		@extension("VK_KHR_maintenance3") define VK_KHR_MAINTENANCE3_SPEC_VERSION 1
		@extension("VK_KHR_maintenance3") define VK_KHR_MAINTENANCE3_EXTENSION_NAME "VK_KHR_maintenance3"

		// 170
		@extension("VK_KHR_draw_indirect_count") define VK_KHR_DRAW_INDIRECT_COUNT_SPEC_VERSION 1
		@extension("VK_KHR_draw_indirect_count") define VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME "VK_KHR_draw_indirect_count"

		// 175
		@extension("VK_EXT_global_priority") define VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION 1
		@extension("VK_EXT_global_priority") define VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME "VK_EXT_global_priority"
		@@ -1521,6 +1529,13 @@ enum VkStructureType {
		//@extension("VK_KHR_variable_pointers") // 121
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR = 1000120000,

		//@extension("VK_KHR_display_properties2") // 122
		VK_STRUCTURE_TYPE_DISPLAY_PROPERTIES_2_KHR = 1000121000,
		VK_STRUCTURE_TYPE_DISPLAY_PLANE_PROPERTIES_2_KHR = 1000121001,
		VK_STRUCTURE_TYPE_DISPLAY_MODE_PROPERTIES_2_KHR = 1000121002,
		VK_STRUCTURE_TYPE_DISPLAY_PLANE_INFO_2_KHR = 1000121003,
		VK_STRUCTURE_TYPE_DISPLAY_PLANE_CAPABILITIES_2_KHR = 1000121004,

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

		@@ -4194,6 +4209,16 @@ class VkDispatchIndirectCommand {
		u32 z
		}

		class VkBaseOutStructure {
		VkStructureType sType
		void* pNext
		}

		class VkBaseInStructure {
		VkStructureType sType
		const void* pNext
		}

		//@vulkan1_1 structures

		class VkPhysicalDeviceSubgroupProperties {
		@@ -6007,6 +6032,42 @@ class VkPhysicalDeviceVariablePointerFeaturesKHR {
		VkBool32 variablePointers
		}

		@extension("VK_KHR_display_properties2") // 122
		class VkDisplayProperties2KHR {
		VkStructureType sType
		void* pNext
		VkDisplayPropertiesKHR displayProperties
		}

		@extension("VK_KHR_display_properties2") // 122
		class VkDisplayPlaneProperties2KHR {
		VkStructureType sType
		void* pNext
		VkDisplayPlanePropertiesKHR displayPlaneProperties
		}

		@extension("VK_KHR_display_properties2") // 122
		class VkDisplayModeProperties2KHR {
		VkStructureType sType
		void* pNext
		VkDisplayModePropertiesKHR displayModeProperties
		}

		@extension("VK_KHR_display_properties2") // 122
		class VkDisplayPlaneInfo2KHR {
		VkStructureType sType
		const void* pNext
		VkDisplayModeKHR mode
		u32 planeIndex
		}

		@extension("VK_KHR_display_properties2") // 122
		class VkDisplayPlaneCapabilities2KHR {
		VkStructureType sType
		void* pNext
		VkDisplayPlaneCapabilitiesKHR capabilities
		}

		@extension("VK_MVK_ios_surface") // 123
		class VkIOSSurfaceCreateInfoMVK {
		VkStructureType sType
		@@ -10018,6 +10079,39 @@ cmd VkResult vkGetPhysicalDeviceSurfaceFormats2KHR(
		return ?
		}

		@extension("VK_KHR_display_properties2") // 122
		cmd VkResult vkGetPhysicalDeviceDisplayProperties2KHR(
		VkPhysicalDevice physicalDevice,
		u32* pPropertyCount,
		VkDisplayProperties2KHR* pProperties) {
		return ?
		}

		@extension("VK_KHR_display_properties2") // 122
		cmd VkResult vkGetPhysicalDeviceDisplayPlaneProperties2KHR(
		VkPhysicalDevice physicalDevice,
		u32* pPropertyCount,
		VkDisplayPlaneProperties2KHR* pProperties) {
		return ?
		}

		@extension("VK_KHR_display_properties2") // 122
		cmd VkResult vkGetDisplayModeProperties2KHR(
		VkPhysicalDevice physicalDevice,
		VkDisplayKHR display,
		u32* pPropertyCount,
		VkDisplayModeProperties2KHR* pProperties) {
		return ?
		}

		@extension("VK_KHR_display_properties2") // 122
		cmd VkResult vkGetDisplayPlaneCapabilities2KHR(
		VkPhysicalDevice physicalDevice,
		const VkDisplayPlaneInfo2KHR* pDisplayPlaneInfo,
		VkDisplayPlaneCapabilities2KHR* pCapabilities) {
		return ?
		}

		@extension("VK_MVK_ios_surface") // 123
		cmd VkResult vkCreateIOSSurfaceMVK(
		VkInstance instance,
		@@ -10243,6 +10337,28 @@ cmd void vkGetDescriptorSetLayoutSupportKHR(
		VkDescriptorSetLayoutSupportKHR* pSupport) {
		}

		@extension("VK_KHR_draw_indirect_count") // 170
		cmd void vkCmdDrawIndirectCountKHR(
		VkCommandBuffer commandBuffer,
		VkBuffer buffer,
		VkDeviceSize offset,
		VkBuffer countBuffer,
		VkDeviceSize countBufferOffset,
		u32 maxDrawCount,
		u32 stride) {
		}

		@extension("VK_KHR_draw_indirect_count") // 170
		cmd void vkCmdDrawIndexedIndirectCountKHR(
		VkCommandBuffer commandBuffer,
		VkBuffer buffer,
		VkDeviceSize offset,
		VkBuffer countBuffer,
		VkDeviceSize countBufferOffset,
		u32 maxDrawCount,
		u32 stride) {
		}

		@extension("VK_EXT_external_memory_host") // 179
		cmd VkResult vkGetMemoryHostPointerPropertiesEXT(
		VkDevice device,

vulkan/include/vulkan/vulkan_core.h

+107 −1

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 72
		#define VK_HEADER_VERSION 76


		#define VK_NULL_HANDLE 0
		@@ -350,6 +350,11 @@ typedef enum VkStructureType {
		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_DISPLAY_PROPERTIES_2_KHR = 1000121000,
		VK_STRUCTURE_TYPE_DISPLAY_PLANE_PROPERTIES_2_KHR = 1000121001,
		VK_STRUCTURE_TYPE_DISPLAY_MODE_PROPERTIES_2_KHR = 1000121002,
		VK_STRUCTURE_TYPE_DISPLAY_PLANE_INFO_2_KHR = 1000121003,
		VK_STRUCTURE_TYPE_DISPLAY_PLANE_CAPABILITIES_2_KHR = 1000121004,
		VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK = 1000122000,
		VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK = 1000123000,
		VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT = 1000128000,
		@@ -2715,6 +2720,16 @@ typedef struct VkDrawIndirectCommand {
		uint32_t firstInstance;
		} VkDrawIndirectCommand;

		typedef struct VkBaseOutStructure {
		VkStructureType sType;
		struct VkBaseOutStructure* pNext;
		} VkBaseOutStructure;

		typedef struct VkBaseInStructure {
		VkStructureType sType;
		const struct VkBaseInStructure* pNext;
		} VkBaseInStructure;


		typedef VkResult (VKAPI_PTR PFN_vkCreateInstance)(const VkInstanceCreateInfo pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance);
		typedef void (VKAPI_PTR PFN_vkDestroyInstance)(VkInstance instance, const VkAllocationCallbacks pAllocator);
		@@ -5572,6 +5587,70 @@ typedef VkPhysicalDeviceVariablePointerFeatures VkPhysicalDeviceVariablePointerF



		#define VK_KHR_get_display_properties2 1
		#define VK_KHR_GET_DISPLAY_PROPERTIES_2_SPEC_VERSION 1
		#define VK_KHR_GET_DISPLAY_PROPERTIES_2_EXTENSION_NAME "VK_KHR_get_display_properties2"

		typedef struct VkDisplayProperties2KHR {
		VkStructureType sType;
		void* pNext;
		VkDisplayPropertiesKHR displayProperties;
		} VkDisplayProperties2KHR;

		typedef struct VkDisplayPlaneProperties2KHR {
		VkStructureType sType;
		void* pNext;
		VkDisplayPlanePropertiesKHR displayPlaneProperties;
		} VkDisplayPlaneProperties2KHR;

		typedef struct VkDisplayModeProperties2KHR {
		VkStructureType sType;
		void* pNext;
		VkDisplayModePropertiesKHR displayModeProperties;
		} VkDisplayModeProperties2KHR;

		typedef struct VkDisplayPlaneInfo2KHR {
		VkStructureType sType;
		const void* pNext;
		VkDisplayModeKHR mode;
		uint32_t planeIndex;
		} VkDisplayPlaneInfo2KHR;

		typedef struct VkDisplayPlaneCapabilities2KHR {
		VkStructureType sType;
		void* pNext;
		VkDisplayPlaneCapabilitiesKHR capabilities;
		} VkDisplayPlaneCapabilities2KHR;


		typedef VkResult (VKAPI_PTR PFN_vkGetPhysicalDeviceDisplayProperties2KHR)(VkPhysicalDevice physicalDevice, uint32_t pPropertyCount, VkDisplayProperties2KHR* pProperties);
		typedef VkResult (VKAPI_PTR PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR)(VkPhysicalDevice physicalDevice, uint32_t pPropertyCount, VkDisplayPlaneProperties2KHR* pProperties);
		typedef VkResult (VKAPI_PTR PFN_vkGetDisplayModeProperties2KHR)(VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t pPropertyCount, VkDisplayModeProperties2KHR* pProperties);
		typedef VkResult (VKAPI_PTR PFN_vkGetDisplayPlaneCapabilities2KHR)(VkPhysicalDevice physicalDevice, const VkDisplayPlaneInfo2KHR pDisplayPlaneInfo, VkDisplayPlaneCapabilities2KHR* pCapabilities);

		#ifndef VK_NO_PROTOTYPES
		VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceDisplayProperties2KHR(
		VkPhysicalDevice physicalDevice,
		uint32_t* pPropertyCount,
		VkDisplayProperties2KHR* pProperties);

		VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceDisplayPlaneProperties2KHR(
		VkPhysicalDevice physicalDevice,
		uint32_t* pPropertyCount,
		VkDisplayPlaneProperties2KHR* pProperties);

		VKAPI_ATTR VkResult VKAPI_CALL vkGetDisplayModeProperties2KHR(
		VkPhysicalDevice physicalDevice,
		VkDisplayKHR display,
		uint32_t* pPropertyCount,
		VkDisplayModeProperties2KHR* pProperties);

		VKAPI_ATTR VkResult VKAPI_CALL vkGetDisplayPlaneCapabilities2KHR(
		VkPhysicalDevice physicalDevice,
		const VkDisplayPlaneInfo2KHR* pDisplayPlaneInfo,
		VkDisplayPlaneCapabilities2KHR* pCapabilities);
		#endif

		#define VK_KHR_dedicated_allocation 1
		#define VK_KHR_DEDICATED_ALLOCATION_SPEC_VERSION 3
		#define VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME "VK_KHR_dedicated_allocation"
		@@ -5727,6 +5806,33 @@ VKAPI_ATTR void VKAPI_CALL vkGetDescriptorSetLayoutSupportKHR(
		VkDescriptorSetLayoutSupport* pSupport);
		#endif

		#define VK_KHR_draw_indirect_count 1
		#define VK_KHR_DRAW_INDIRECT_COUNT_SPEC_VERSION 1
		#define VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME "VK_KHR_draw_indirect_count"

		typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirectCountKHR)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
		typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexedIndirectCountKHR)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);

		#ifndef VK_NO_PROTOTYPES
		VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndirectCountKHR(
		VkCommandBuffer commandBuffer,
		VkBuffer buffer,
		VkDeviceSize offset,
		VkBuffer countBuffer,
		VkDeviceSize countBufferOffset,
		uint32_t maxDrawCount,
		uint32_t stride);

		VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndexedIndirectCountKHR(
		VkCommandBuffer commandBuffer,
		VkBuffer buffer,
		VkDeviceSize offset,
		VkBuffer countBuffer,
		VkDeviceSize countBufferOffset,
		uint32_t maxDrawCount,
		uint32_t stride);
		#endif

		#define VK_EXT_debug_report 1
		VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT)

vulkan/libvulkan/api_gen.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -553,7 +553,11 @@ VKAPI_ATTR PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pNa
		"vkEnumeratePhysicalDeviceGroups",
		"vkEnumeratePhysicalDeviceGroupsKHR",
		"vkEnumeratePhysicalDevices",
		"vkGetDisplayModeProperties2KHR",
		"vkGetDisplayPlaneCapabilities2KHR",
		"vkGetInstanceProcAddr",
		"vkGetPhysicalDeviceDisplayPlaneProperties2KHR",
		"vkGetPhysicalDeviceDisplayProperties2KHR",
		"vkGetPhysicalDeviceExternalBufferProperties",
		"vkGetPhysicalDeviceExternalBufferPropertiesKHR",
		"vkGetPhysicalDeviceExternalFenceProperties",