Merge "vulkan: Update Vulkan headers to 1.1.93" am: f25cf0661e am: a27923446e (cfeae44f) · Commits · e / os / android_frameworks_native-old

vulkan/api/vulkan.api

+31 −2

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 91
		define VERSION_PATCH 93

		// API limits
		define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256
		@@ -615,6 +615,10 @@ define NULL_HANDLE 0
		@extension("VK_FUCHSIA_imagepipe_surface") define VK_FUCHSIA_IMAGEPIPE_SURFACE_SPEC_VERSION 1
		@extension("VK_FUCHSIA_imagepipe_surface") define VK_FUCHSIA_IMAGEPIPE_SURFACE_EXTENSION_NAME "VK_FUCHSIA_imagepipe_surface"

		// 222
		@extension("VK_EXT_scalar_block_layout") define VK_EXT_SCALAR_BLOCK_LAYOUT_SPEC_VERSION 1
		@extension("VK_EXT_scalar_block_layout") define VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME "VK_EXT_scalar_block_layout"

		// 224
		@extension("VK_GOOGLE_hlsl_functionality1") define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION 0
		@extension("VK_GOOGLE_hlsl_functionality1") define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME "VK_GOOGLE_hlsl_functionality1"
		@@ -623,6 +627,10 @@ define NULL_HANDLE 0
		@extension("VK_GOOGLE_decorate_string") define VK_GOOGLE_DECORATE_STRING_SPEC_VERSION 0
		@extension("VK_GOOGLE_decorate_string") define VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME "VK_GOOGLE_decorate_string"

		// 247
		@extension("VK_EXT_separate_stencil_usage") define VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION 1
		@extension("VK_EXT_separate_stencil_usage") define VK_EXT_SEPARATE_STENCIL_USAGE_EXTENSION_NAME "VK_EXT_separate_stencil_usage"

		/////////////
		// Types //
		/////////////
		@@ -1852,6 +1860,12 @@ enum VkStructureType {

		//@extension("VK_FUCHSIA_imagepipe_surface") // 215
		VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA = 1000214000,

		//@extension("VK_EXT_scalar_block_layout")
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT = 1000221000,

		//@extension("VK_EXT_separate_stencil_usage") // 247
		VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT = 1000246000,
		}

		enum VkSubpassContents {
		@@ -2382,6 +2396,7 @@ enum VkDriverIdKHR {
		VK_DRIVER_ID_IMAGINATION_PROPRIETARY_KHR = 7,
		VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR = 8,
		VK_DRIVER_ID_ARM_PROPRIETARY_KHR = 9,
		VK_DRIVER_ID_GOOGLE_PASTEL_KHR = 10,
		}

		/////////////////
		@@ -7656,6 +7671,20 @@ class VkImagePipeSurfaceCreateInfoFUCHSIA {
		platform.zx_handle_t imagePipeHandle
		}

		@extension("VK_EXT_scalar_block_layout") // 222
		class VkPhysicalDeviceScalarBlockLayoutFeaturesEXT {
		VkStructureType sType
		void* pNext
		VkBool32 scalarBlockLayout
		}

		@extension("VK_EXT_separate_stencil_usage") // 247
		class VkImageStencilUsageCreateInfoEXT {
		VkStructureType sType
		const void* pNext
		VkImageUsageFlags stencilUsage
		}


		////////////////
		// Commands //

vulkan/include/vulkan/vulkan_core.h

+30 −5

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 91
		#define VK_HEADER_VERSION 93


		#define VK_NULL_HANDLE 0
		@@ -454,6 +454,8 @@ typedef enum VkStructureType {
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR = 1000211000,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT = 1000212000,
		VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA = 1000214000,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT = 1000221000,
		VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT = 1000246000,
		VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT,
		VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO,
		VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES,
		@@ -6101,9 +6103,10 @@ typedef enum VkDriverIdKHR {
		VK_DRIVER_ID_IMAGINATION_PROPRIETARY_KHR = 7,
		VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR = 8,
		VK_DRIVER_ID_ARM_PROPRIETARY_KHR = 9,
		VK_DRIVER_ID_GOOGLE_PASTEL_KHR = 10,
		VK_DRIVER_ID_BEGIN_RANGE_KHR = VK_DRIVER_ID_AMD_PROPRIETARY_KHR,
		VK_DRIVER_ID_END_RANGE_KHR = VK_DRIVER_ID_ARM_PROPRIETARY_KHR,
		VK_DRIVER_ID_RANGE_SIZE_KHR = (VK_DRIVER_ID_ARM_PROPRIETARY_KHR - VK_DRIVER_ID_AMD_PROPRIETARY_KHR + 1),
		VK_DRIVER_ID_END_RANGE_KHR = VK_DRIVER_ID_GOOGLE_PASTEL_KHR,
		VK_DRIVER_ID_RANGE_SIZE_KHR = (VK_DRIVER_ID_GOOGLE_PASTEL_KHR - VK_DRIVER_ID_AMD_PROPRIETARY_KHR + 1),
		VK_DRIVER_ID_MAX_ENUM_KHR = 0x7FFFFFFF
		} VkDriverIdKHR;

		@@ -7791,8 +7794,6 @@ typedef struct VkPipelineCoverageModulationStateCreateInfoNV {


		#define VK_EXT_image_drm_format_modifier 1
		#define VK_EXT_EXTENSION_159_SPEC_VERSION 0
		#define VK_EXT_EXTENSION_159_EXTENSION_NAME "VK_EXT_extension_159"
		#define VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_SPEC_VERSION 1
		#define VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME "VK_EXT_image_drm_format_modifier"

		@@ -8806,6 +8807,18 @@ typedef struct VkPhysicalDevicePCIBusInfoPropertiesEXT {



		#define VK_EXT_scalar_block_layout 1
		#define VK_EXT_SCALAR_BLOCK_LAYOUT_SPEC_VERSION 1
		#define VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME "VK_EXT_scalar_block_layout"

		typedef struct VkPhysicalDeviceScalarBlockLayoutFeaturesEXT {
		VkStructureType sType;
		void* pNext;
		VkBool32 scalarBlockLayout;
		} VkPhysicalDeviceScalarBlockLayoutFeaturesEXT;



		#define VK_GOOGLE_hlsl_functionality1 1
		#define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION 0
		#define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME "VK_GOOGLE_hlsl_functionality1"
		@@ -8816,6 +8829,18 @@ typedef struct VkPhysicalDevicePCIBusInfoPropertiesEXT {
		#define VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME "VK_GOOGLE_decorate_string"


		#define VK_EXT_separate_stencil_usage 1
		#define VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION 1
		#define VK_EXT_SEPARATE_STENCIL_USAGE_EXTENSION_NAME "VK_EXT_separate_stencil_usage"

		typedef struct VkImageStencilUsageCreateInfoEXT {
		VkStructureType sType;
		const void* pNext;
		VkImageUsageFlags stencilUsage;
		} VkImageStencilUsageCreateInfoEXT;



		#ifdef __cplusplus
		}
		#endif