vulkan: update Vulkan headers to 1.0.43 (fdc8ab30) · Commits · e / os / android_frameworks_native

vulkan/api/vulkan.api

+47 −82

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 42
		define VERSION_PATCH 43

		// API limits
		define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256
		@@ -73,7 +73,7 @@ define NULL_HANDLE 0
		@extension("VK_KHR_xcb_surface") define VK_KHR_XCB_SURFACE_NAME "VK_KHR_xcb_surface"

		// 7
		@extension("VK_KHR_wayland_surface") define VK_KHR_WAYLAND_SURFACE_SPEC_VERSION 5
		@extension("VK_KHR_wayland_surface") define VK_KHR_WAYLAND_SURFACE_SPEC_VERSION 6
		@extension("VK_KHR_wayland_surface") define VK_KHR_WAYLAND_SURFACE_NAME "VK_KHR_wayland_surface"

		// 8
		@@ -282,7 +282,7 @@ define NULL_HANDLE 0

		// 93
		@extension("VK_GOOGLE_display_timing") define VK_GOOGLE_DISPLAY_TIMING_SPEC_VERSION 1
		@extension("VK_GOOGLE_display_timing") define VK_GOOGLE_DISPLAY_TIMING_NAME "VK_GOOGLE_display_timing"
		@extension("VK_GOOGLE_display_timing") define VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME "VK_GOOGLE_display_timing"

		// 95
		@extension("VK_NV_sample_mask_override_coverage") define VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_SPEC_VERSION 1
		@@ -1079,6 +1079,9 @@ enum VkStructureType {
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT = 1000099000,
		VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT = 1000099001,

		//@extension("VK_EXT_hdr_metadata") // 106
		VK_STRUCTURE_TYPE_HDR_METADATA_EXT = 1000105000,

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

		@@ -3781,31 +3784,6 @@ class VkPhysicalDeviceIDPropertiesKHX {
		VkBool32 deviceLUIDValid
		}

		@extension("VK_KHX_external_memory_capabilities") // 72
		class VkPhysicalDeviceProperties2KHX {
		VkStructureType sType
		void* pNext
		VkPhysicalDeviceProperties properties
		}

		@extension("VK_KHX_external_memory_capabilities") // 72
		class VkImageFormatProperties2KHX {
		VkStructureType sType
		void* pNext
		VkImageFormatProperties imageFormatProperties
		}

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

		@extension("VK_KHX_external_memory") // 73
		class VkExternalMemoryImageCreateInfoKHX {
		VkStructureType sType
		@@ -4180,8 +4158,7 @@ class VkSwapchainCounterCreateInfoEXT {

		@extension("VK_GOOGLE_display_timing") // 93
		class VkRefreshCycleDurationGOOGLE {
		u64 minRefreshDuration
		u64 maxRefreshDuration
		u64 refreshDuration
		}

		@extension("VK_GOOGLE_display_timing") // 93
		@@ -4256,6 +4233,8 @@ class VkXYColorEXT {

		@extension("VK_EXT_hdr_metadata") // 106
		class VkHdrMetadataEXT {
		VkStructureType sType
		const void* pNext
		VkXYColorEXT displayPrimaryRed
		VkXYColorEXT displayPrimaryGreen
		VkXYColorEXT displayPrimaryBlue
		@@ -7128,20 +7107,6 @@ cmd void vkGetPhysicalDeviceExternalBufferPropertiesKHX(
		VkExternalBufferPropertiesKHX* pExternalBufferProperties) {
		}

		@extension("VK_KHX_external_memory_capabilities") // 72
		cmd void vkGetPhysicalDeviceProperties2KHX(
		VkPhysicalDevice physicalDevice,
		VkPhysicalDeviceProperties2KHX* pProperties) {
		}

		@extension("VK_KHX_external_memory_capabilities") // 72
		cmd VkResult vkGetPhysicalDeviceImageFormatProperties2KHX(
		VkPhysicalDevice physicalDevice,
		const VkPhysicalDeviceImageFormatInfo2KHX* pImageFormatInfo,
		VkImageFormatProperties2KHX* pImageFormatProperties) {
		return ?
		}

		@extension("VK_KHX_external_memory_win32") // 74
		cmd VkResult vkGetMemoryWin32HandleKHX(
		VkDevice device,

vulkan/include/vulkan/vulkan.h

+4 −36

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


		#define VK_NULL_HANDLE 0
		@@ -300,6 +300,7 @@ typedef enum VkStructureType {
		VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV = 1000098000,
		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_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,
		@@ -3721,7 +3722,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceXcbPresentationSupportKHR(
		#define VK_KHR_wayland_surface 1
		#include <wayland-client.h>

		#define VK_KHR_WAYLAND_SURFACE_SPEC_VERSION 5
		#define VK_KHR_WAYLAND_SURFACE_SPEC_VERSION 6
		#define VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME "VK_KHR_wayland_surface"

		typedef VkFlags VkWaylandSurfaceCreateFlagsKHR;
		@@ -4866,47 +4867,14 @@ typedef struct VkPhysicalDeviceIDPropertiesKHX {
		VkBool32 deviceLUIDValid;
		} VkPhysicalDeviceIDPropertiesKHX;

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

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

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


		typedef void (VKAPI_PTR PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHX)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfoKHX pExternalBufferInfo, VkExternalBufferPropertiesKHX* pExternalBufferProperties);
		typedef void (VKAPI_PTR PFN_vkGetPhysicalDeviceProperties2KHX)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2KHX pProperties);
		typedef VkResult (VKAPI_PTR PFN_vkGetPhysicalDeviceImageFormatProperties2KHX)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2KHX pImageFormatInfo, VkImageFormatProperties2KHX* pImageFormatProperties);

		#ifndef VK_NO_PROTOTYPES
		VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceExternalBufferPropertiesKHX(
		VkPhysicalDevice physicalDevice,
		const VkPhysicalDeviceExternalBufferInfoKHX* pExternalBufferInfo,
		VkExternalBufferPropertiesKHX* pExternalBufferProperties);

		VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceProperties2KHX(
		VkPhysicalDevice physicalDevice,
		VkPhysicalDeviceProperties2KHX* pProperties);

		VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceImageFormatProperties2KHX(
		VkPhysicalDevice physicalDevice,
		const VkPhysicalDeviceImageFormatInfo2KHX* pImageFormatInfo,
		VkImageFormatProperties2KHX* pImageFormatProperties);
		#endif

		#define VK_KHX_external_memory 1
		@@ -5762,7 +5730,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetDiscardRectangleEXT(
		#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 0
		#define VK_EXT_HDR_METADATA_SPEC_VERSION 1
		#define VK_EXT_HDR_METADATA_EXTENSION_NAME "VK_EXT_hdr_metadata"

		typedef struct VkXYColorEXT {

vulkan/libvulkan/api_gen.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -464,13 +464,11 @@ VKAPI_ATTR PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pNa
		"vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX",
		"vkGetPhysicalDeviceImageFormatProperties",
		"vkGetPhysicalDeviceImageFormatProperties2KHR",
		"vkGetPhysicalDeviceImageFormatProperties2KHX",
		"vkGetPhysicalDeviceMemoryProperties",
		"vkGetPhysicalDeviceMemoryProperties2KHR",
		"vkGetPhysicalDevicePresentRectanglesKHX",
		"vkGetPhysicalDeviceProperties",
		"vkGetPhysicalDeviceProperties2KHR",
		"vkGetPhysicalDeviceProperties2KHX",
		"vkGetPhysicalDeviceQueueFamilyProperties",
		"vkGetPhysicalDeviceQueueFamilyProperties2KHR",
		"vkGetPhysicalDeviceSparseImageFormatProperties",