vulkan: Add header support for gpdp2 (1194edee) · Commits · e / os / android_frameworks_native

vulkan/api/vulkan.api

+149 −0

Original line number	Original line	Diff line number	Diff line
	@@ -108,6 +108,9 @@ define NULL_HANDLE 0
	@extension("VK_NV_dedicated_allocation") define VK_NV_DEDICATED_ALLOCATION_SPEC_VERSION 1		@extension("VK_NV_dedicated_allocation") define VK_NV_DEDICATED_ALLOCATION_SPEC_VERSION 1
	@extension("VK_NV_dedicated_allocation") define VK_NV_DEDICATED_ALLOCATION_EXTENSION_NAME "VK_NV_dedicated_allocation"		@extension("VK_NV_dedicated_allocation") define VK_NV_DEDICATED_ALLOCATION_EXTENSION_NAME "VK_NV_dedicated_allocation"

			@extension("VK_KHR_get_physical_device_properties2") define VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION 1
			@extension("VK_KHR_get_physical_device_properties2") define VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME "VK_KHR_get_physical_device_properties2"

	@extension("VK_AMD_draw_indirect_count") define VK_AMD_DRAW_INDIRECT_COUNT_SPEC_VERSION 1		@extension("VK_AMD_draw_indirect_count") define VK_AMD_DRAW_INDIRECT_COUNT_SPEC_VERSION 1
	@extension("VK_AMD_draw_indirect_count") define VK_AMD_DRAW_INDIRECT_COUNT_EXTENSION_NAME "VK_AMD_draw_indirect_count"		@extension("VK_AMD_draw_indirect_count") define VK_AMD_DRAW_INDIRECT_COUNT_EXTENSION_NAME "VK_AMD_draw_indirect_count"

	@@ -783,6 +786,33 @@ enum VkStructureType {
	//@extension("VK_NV_win32_keyed_mutex")		//@extension("VK_NV_win32_keyed_mutex")
	VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV = 1000058000,		VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV = 1000058000,

			//@extension("VK_KHR_get_physical_device_properties2")
			VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR = 1000059000,

			//@extension("VK_KHR_get_physical_device_properties2")
			VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR = 1000059001,

			//@extension("VK_KHR_get_physical_device_properties2")
			VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2_KHR = 1000059002,

			//@extension("VK_KHR_get_physical_device_properties2")
			VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHR = 1000059003,

			//@extension("VK_KHR_get_physical_device_properties2")
			VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR = 1000059004,

			//@extension("VK_KHR_get_physical_device_properties2")
			VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2_KHR = 1000059005,

			//@extension("VK_KHR_get_physical_device_properties2")
			VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR = 1000059006,

			//@extension("VK_KHR_get_physical_device_properties2")
			VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR = 1000059007,

			//@extension("VK_KHR_get_physical_device_properties2")
			VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR = 1000059008,

	//@extension("VK_EXT_validation_flags")		//@extension("VK_EXT_validation_flags")
	VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT = 1000061000,		VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT = 1000061000,

	@@ -2927,6 +2957,77 @@ class VkDedicatedAllocationMemoryAllocateInfoNV {
	VkBuffer buffer		VkBuffer buffer
	}		}

			@extension("VK_KHR_get_physical_device_properties2")
			class VkPhysicalDeviceFeatures2KHR {
			VkStructureType sType
			void* pNext
			VkPhysicalDeviceFeatures features
			}

			@extension("VK_KHR_get_physical_device_properties2")
			class VkPhysicalDeviceProperties2KHR {
			VkStructureType sType
			void* pNext
			VkPhysicalDeviceProperties properties
			}

			@extension("VK_KHR_get_physical_device_properties2")
			class VkFormatProperties2KHR {
			VkStructureType sType
			void* pNext
			VkFormatProperties formatProperties
			}

			@extension("VK_KHR_get_physical_device_properties2")
			class VkImageFormatProperties2KHR {
			VkStructureType sType
			void* pNext
			VkImageFormatProperties imageFormatProperties
			}

			@extension("VK_KHR_get_physical_device_properties2")
			class VkPhysicalDeviceImageFormatInfo2KHR {
			VkStructureType sType
			const void* pNext
			VkFormat format
			VkImageType type
			VkImageTiling tiling
			VkImageUsageFlags usage
			VkImageCreateFlags flags
			}

			@extension("VK_KHR_get_physical_device_properties2")
			class VkQueueFamilyProperties2KHR {
			VkStructureType sType
			void* pNext
			VkQueueFamilyProperties queueFamilyProperties
			}

			@extension("VK_KHR_get_physical_device_properties2")
			class VkPhysicalDeviceMemoryProperties2KHR {
			VkStructureType sType
			void* pNext
			VkPhysicalDeviceMemoryProperties memoryProperties
			}

			@extension("VK_KHR_get_physical_device_properties2")
			class VkSparseImageFormatProperties2KHR {
			VkStructureType sType
			void* pNext
			VkSparseImageFormatProperties properties
			}

			@extension("VK_KHR_get_physical_device_properties2")
			class VkPhysicalDeviceSparseImageFormatInfo2KHR {
			VkStructureType sType
			const void* pNext
			VkFormat format
			VkImageType type
			VkSampleCountFlagBits samples
			VkImageUsageFlags usage
			VkImageTiling tiling
			}

	@extension("VK_KHR_incremental_present")		@extension("VK_KHR_incremental_present")
	class VkRectLayerKHR {		class VkRectLayerKHR {
	VkOffset2D offset		VkOffset2D offset
	@@ -5781,6 +5882,54 @@ cmd void vkCmdDebugMarkerInsertEXT(
	VkDebugMarkerMarkerInfoEXT* pMarkerInfo) {		VkDebugMarkerMarkerInfoEXT* pMarkerInfo) {
	}		}

			@extension("VK_KHR_get_physical_device_properties2")
			cmd void vkGetPhysicalDeviceFeatures2KHR(
			VkPhysicalDevice physicalDevice,
			VkPhysicalDeviceFeatures2KHR* pFeatures) {
			}

			@extension("VK_KHR_get_physical_device_properties2")
			cmd void vkGetPhysicalDeviceProperties2KHR(
			VkPhysicalDevice physicalDevice,
			VkPhysicalDeviceProperties2KHR* pProperties) {
			}

			@extension("VK_KHR_get_physical_device_properties2")
			cmd void vkGetPhysicalDeviceFormatProperties2KHR(
			VkPhysicalDevice physicalDevice,
			VkFormat format,
			VkFormatProperties2KHR* pFormatProperties) {
			}

			@extension("VK_KHR_get_physical_device_properties2")
			cmd VkResult vkGetPhysicalDeviceImageFormatProperties2KHR(
			VkPhysicalDevice physicalDevice,
			const VkPhysicalDeviceImageFormatInfo2KHR* pImageFormatInfo,
			VkImageFormatProperties2KHR* pImageFormatProperties) {
			return ?
			}

			@extension("VK_KHR_get_physical_device_properties2")
			cmd void vkGetPhysicalDeviceQueueFamilyProperties2KHR(
			VkPhysicalDevice physicalDevice,
			u32* pQueueFamilyPropertyCount,
			VkQueueFamilyProperties2KHR* pQueueFamilyProperties) {
			}

			@extension("VK_KHR_get_physical_device_properties2")
			cmd void vkGetPhysicalDeviceMemoryProperties2KHR(
			VkPhysicalDevice physicalDevice,
			VkPhysicalDeviceMemoryProperties2KHR* pMemoryProperties) {
			}

			@extension("VK_KHR_get_physical_device_properties2")
			cmd void vkGetPhysicalDeviceSparseImageFormatProperties2KHR(
			VkPhysicalDevice physicalDevice,
			const VkPhysicalDeviceSparseImageFormatInfo2KHR* pFormatInfo,
			u32* pPropertyCount,
			VkSparseImageFormatProperties2KHR* pProperties) {
			}

	@extension("VK_AMD_draw_indirect_count")		@extension("VK_AMD_draw_indirect_count")
	cmd void vkCmdDrawIndirectCountAMD(		cmd void vkCmdDrawIndirectCountAMD(
	VkCommandBuffer commandBuffer,		VkCommandBuffer commandBuffer,

vulkan/include/vulkan/vulkan.h

+120 −0

Original line number	Original line	Diff line number	Diff line
	@@ -226,6 +226,15 @@ typedef enum VkStructureType {
	VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV = 1000057000,		VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV = 1000057000,
	VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV = 1000057001,		VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV = 1000057001,
	VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV = 1000058000,		VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV = 1000058000,
			VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR = 1000059000,
			VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR = 1000059001,
			VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2_KHR = 1000059002,
			VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHR = 1000059003,
			VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR = 1000059004,
			VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2_KHR = 1000059005,
			VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR = 1000059006,
			VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR = 1000059007,
			VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR = 1000059008,
	VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT = 1000061000,		VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT = 1000061000,
	VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX = 1000086000,		VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX = 1000086000,
	VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX = 1000086001,		VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX = 1000086001,
	@@ -3741,6 +3750,117 @@ VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceWin32PresentationSupportKHR(
	#define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION 1		#define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION 1
	#define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME "VK_KHR_sampler_mirror_clamp_to_edge"		#define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME "VK_KHR_sampler_mirror_clamp_to_edge"


			#define VK_KHR_get_physical_device_properties2 1
			#define VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION 1
			#define VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME "VK_KHR_get_physical_device_properties2"

			typedef struct VkPhysicalDeviceFeatures2KHR {
			VkStructureType sType;
			void* pNext;
			VkPhysicalDeviceFeatures features;
			} VkPhysicalDeviceFeatures2KHR;

			typedef struct VkPhysicalDeviceProperties2KHR {
			VkStructureType sType;
			void* pNext;
			VkPhysicalDeviceProperties properties;
			} VkPhysicalDeviceProperties2KHR;

			typedef struct VkFormatProperties2KHR {
			VkStructureType sType;
			void* pNext;
			VkFormatProperties formatProperties;
			} VkFormatProperties2KHR;

			typedef struct VkImageFormatProperties2KHR {
			VkStructureType sType;
			void* pNext;
			VkImageFormatProperties imageFormatProperties;
			} VkImageFormatProperties2KHR;

			typedef struct VkPhysicalDeviceImageFormatInfo2KHR {
			VkStructureType sType;
			const void* pNext;
			VkFormat format;
			VkImageType type;
			VkImageTiling tiling;
			VkImageUsageFlags usage;
			VkImageCreateFlags flags;
			} VkPhysicalDeviceImageFormatInfo2KHR;

			typedef struct VkQueueFamilyProperties2KHR {
			VkStructureType sType;
			void* pNext;
			VkQueueFamilyProperties queueFamilyProperties;
			} VkQueueFamilyProperties2KHR;

			typedef struct VkPhysicalDeviceMemoryProperties2KHR {
			VkStructureType sType;
			void* pNext;
			VkPhysicalDeviceMemoryProperties memoryProperties;
			} VkPhysicalDeviceMemoryProperties2KHR;

			typedef struct VkSparseImageFormatProperties2KHR {
			VkStructureType sType;
			void* pNext;
			VkSparseImageFormatProperties properties;
			} VkSparseImageFormatProperties2KHR;

			typedef struct VkPhysicalDeviceSparseImageFormatInfo2KHR {
			VkStructureType sType;
			const void* pNext;
			VkFormat format;
			VkImageType type;
			VkSampleCountFlagBits samples;
			VkImageUsageFlags usage;
			VkImageTiling tiling;
			} VkPhysicalDeviceSparseImageFormatInfo2KHR;


			typedef void (VKAPI_PTR PFN_vkGetPhysicalDeviceFeatures2KHR)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2KHR pFeatures);
			typedef void (VKAPI_PTR PFN_vkGetPhysicalDeviceProperties2KHR)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2KHR pProperties);
			typedef void (VKAPI_PTR PFN_vkGetPhysicalDeviceFormatProperties2KHR)(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2KHR pFormatProperties);
			typedef VkResult (VKAPI_PTR PFN_vkGetPhysicalDeviceImageFormatProperties2KHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2KHR pImageFormatInfo, VkImageFormatProperties2KHR* pImageFormatProperties);
			typedef void (VKAPI_PTR PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR)(VkPhysicalDevice physicalDevice, uint32_t pQueueFamilyPropertyCount, VkQueueFamilyProperties2KHR* pQueueFamilyProperties);
			typedef void (VKAPI_PTR PFN_vkGetPhysicalDeviceMemoryProperties2KHR)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2KHR pMemoryProperties);
			typedef void (VKAPI_PTR PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2KHR pFormatInfo, uint32_t* pPropertyCount, VkSparseImageFormatProperties2KHR* pProperties);

			#ifndef VK_NO_PROTOTYPES
			VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceFeatures2KHR(
			VkPhysicalDevice physicalDevice,
			VkPhysicalDeviceFeatures2KHR* pFeatures);

			VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceProperties2KHR(
			VkPhysicalDevice physicalDevice,
			VkPhysicalDeviceProperties2KHR* pProperties);

			VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceFormatProperties2KHR(
			VkPhysicalDevice physicalDevice,
			VkFormat format,
			VkFormatProperties2KHR* pFormatProperties);

			VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceImageFormatProperties2KHR(
			VkPhysicalDevice physicalDevice,
			const VkPhysicalDeviceImageFormatInfo2KHR* pImageFormatInfo,
			VkImageFormatProperties2KHR* pImageFormatProperties);

			VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyProperties2KHR(
			VkPhysicalDevice physicalDevice,
			uint32_t* pQueueFamilyPropertyCount,
			VkQueueFamilyProperties2KHR* pQueueFamilyProperties);

			VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceMemoryProperties2KHR(
			VkPhysicalDevice physicalDevice,
			VkPhysicalDeviceMemoryProperties2KHR* pMemoryProperties);

			VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceSparseImageFormatProperties2KHR(
			VkPhysicalDevice physicalDevice,
			const VkPhysicalDeviceSparseImageFormatInfo2KHR* pFormatInfo,
			uint32_t* pPropertyCount,
			VkSparseImageFormatProperties2KHR* pProperties);
			#endif

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

vulkan/libvulkan/api_gen.cpp

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -453,13 +453,20 @@ VKAPI_ATTR PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pNa
	"vkGetInstanceProcAddr",		"vkGetInstanceProcAddr",
	"vkGetPhysicalDeviceExternalImageFormatPropertiesNV",		"vkGetPhysicalDeviceExternalImageFormatPropertiesNV",
	"vkGetPhysicalDeviceFeatures",		"vkGetPhysicalDeviceFeatures",
			"vkGetPhysicalDeviceFeatures2KHR",
	"vkGetPhysicalDeviceFormatProperties",		"vkGetPhysicalDeviceFormatProperties",
			"vkGetPhysicalDeviceFormatProperties2KHR",
	"vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX",		"vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX",
	"vkGetPhysicalDeviceImageFormatProperties",		"vkGetPhysicalDeviceImageFormatProperties",
			"vkGetPhysicalDeviceImageFormatProperties2KHR",
	"vkGetPhysicalDeviceMemoryProperties",		"vkGetPhysicalDeviceMemoryProperties",
			"vkGetPhysicalDeviceMemoryProperties2KHR",
	"vkGetPhysicalDeviceProperties",		"vkGetPhysicalDeviceProperties",
			"vkGetPhysicalDeviceProperties2KHR",
	"vkGetPhysicalDeviceQueueFamilyProperties",		"vkGetPhysicalDeviceQueueFamilyProperties",
			"vkGetPhysicalDeviceQueueFamilyProperties2KHR",
	"vkGetPhysicalDeviceSparseImageFormatProperties",		"vkGetPhysicalDeviceSparseImageFormatProperties",
			"vkGetPhysicalDeviceSparseImageFormatProperties2KHR",
	"vkGetPhysicalDeviceSurfaceCapabilitiesKHR",		"vkGetPhysicalDeviceSurfaceCapabilitiesKHR",
	"vkGetPhysicalDeviceSurfaceFormatsKHR",		"vkGetPhysicalDeviceSurfaceFormatsKHR",
	"vkGetPhysicalDeviceSurfacePresentModesKHR",		"vkGetPhysicalDeviceSurfacePresentModesKHR",