Merge "vulkan: Update Vulkan headers to 1.0.22" (05b4a495) · Commits · e / os / platform_frameworks_native

vulkan/api/vulkan.api

+47 −3

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 13
		define VERSION_PATCH 22

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

		@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_SPEC_VERSION 2
		@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_SPEC_VERSION 3
		@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_NAME "VK_EXT_debug_report"

		@extension("VK_NV_glsl_shader") define VK_NV_GLSL_SHADER_SPEC_VERSION 1
		@@ -93,9 +93,21 @@ define NULL_HANDLE 0
		@extension("VK_AMD_rasterization_order") define VK_AMD_RASTERIZATION_ORDER_SPEC_VERSION 1
		@extension("VK_AMD_rasterization_order") define VK_AMD_RASTERIZATION_ORDER_NAME "VK_AMD_rasterization_order"

		@extension("VK_AMD_shader_trinary_minmax") define VK_AMD_SHADER_TRINARY_MINMAX_SPEC_VERSION 1
		@extension("VK_AMD_shader_trinary_minmax") define VK_AMD_SHADER_TRINARY_MINMAX_EXTENSION_NAME "VK_AMD_shader_trinary_minmax"

		@extension("VK_AMD_shader_explicit_vertex_parameter") define VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_SPEC_VERSION 1
		@extension("VK_AMD_shader_explicit_vertex_parameter") define VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_EXTENSION_NAME "VK_AMD_shader_explicit_vertex_parameter"

		@extension("VK_EXT_debug_marker") define VK_EXT_DEBUG_MARKER_SPEC_VERSION 3
		@extension("VK_EXT_debug_marker") define VK_EXT_DEBUG_MARKER_NAME "VK_EXT_debug_marker"

		@extension("VK_AMD_gcn_shader") define VK_AMD_GCN_SHADER_SPEC_VERSION 1
		@extension("VK_AMD_gcn_shader") define VK_AMD_GCN_SHADER_EXTENSION_NAME "VK_AMD_gcn_shader"

		@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"


		/////////////
		// Types //
		@@ -684,6 +696,15 @@ enum VkStructureType {

		//@extension("VK_EXT_debug_marker")
		VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT = 1000022002,

		//@extension("VK_NV_dedicated_allocation")
		VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV = 1000026000,

		//@extension("VK_NV_dedicated_allocation")
		VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV = 1000026001,

		//@extension("VK_NV_dedicated_allocation")
		VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV = 1000026002,
		}

		enum VkSubpassContents {
		@@ -721,6 +742,7 @@ enum VkResult {
		VK_ERROR_INCOMPATIBLE_DRIVER = 0xFFFFFFF7, // -9
		VK_ERROR_TOO_MANY_OBJECTS = 0xFFFFFFF6, // -10
		VK_ERROR_FORMAT_NOT_SUPPORTED = 0xFFFFFFF5, // -11
		VK_ERROR_FRAGMENTED_POOL = 0xFFFFFFF4, // -12

		//@extension("VK_KHR_surface")
		VK_ERROR_SURFACE_LOST_KHR = 0xC4653600, // -1000000000
		@@ -2693,6 +2715,28 @@ class VkDebugMarkerMarkerInfoEXT {
		f32[4] color
		}

		@extension("VK_NV_dedicated_allocation")
		class VkDedicatedAllocationImageCreateInfoNV {
		VkStructureType sType
		const void* pNext
		VkBool32 dedicatedAllocation
		}

		@extension("VK_NV_dedicated_allocation")
		class VkDedicatedAllocationBufferCreateInfoNV {
		VkStructureType sType
		const void* pNext
		VkBool32 dedicatedAllocation
		}

		@extension("VK_NV_dedicated_allocation")
		class VkDedicatedAllocationMemoryAllocateInfoNV {
		VkStructureType sType
		const void* pNext
		VkImage image
		VkBuffer buffer
		}


		////////////////
		// Commands //
		@@ -4570,7 +4614,7 @@ cmd void vkCmdUpdateBuffer(
		VkBuffer dstBuffer,
		VkDeviceSize dstOffset,
		VkDeviceSize dataSize,
		const u32* pData) {
		const void* pData) {
		commandBufferObject := GetCommandBuffer(commandBuffer)
		dstBufferObject := GetBuffer(dstBuffer)
		assert(commandBufferObject.device == dstBufferObject.device)

vulkan/include/vulkan/vk_platform.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -51,13 +51,13 @@ extern "C"
		#define VKAPI_ATTR
		#define VKAPI_CALL __stdcall
		#define VKAPI_PTR VKAPI_CALL
		#elif defined(__ANDROID__) && defined(__ARM_EABI__) && !defined(__ARM_ARCH_7A__)
		// Android does not support Vulkan in native code using the "armeabi" ABI.
		#error "Vulkan requires the 'armeabi-v7a' or 'armeabi-v7a-hard' ABI on 32-bit ARM CPUs"
		#elif defined(__ANDROID__) && defined(__ARM_ARCH_7A__)
		// On Android/ARMv7a, Vulkan functions use the armeabi-v7a-hard calling
		// convention, even if the application's native code is compiled with the
		// armeabi-v7a calling convention.
		#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7
		#error "Vulkan isn't supported for the 'armeabi' NDK ABI"
		#elif defined(__ANDROID__) && __ARM_ARCH >= 7 && __ARM_32BIT_STATE
		// On Android 32-bit ARM targets, Vulkan functions use the "hardfloat"
		// calling convention, i.e. float parameters are passed in registers. This
		// is true even if the rest of the application passes floats on the stack,
		// as it does by default when compiling for the armeabi-v7a NDK ABI.
		#define VKAPI_ATTR __attribute__((pcs("aapcs-vfp")))
		#define VKAPI_CALL
		#define VKAPI_PTR VKAPI_ATTR

vulkan/include/vulkan/vulkan.h

+51 −7

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 13
		#define VK_HEADER_VERSION 22


		#define VK_NULL_HANDLE 0
		@@ -53,7 +53,7 @@ extern "C" {
		#define VK_DEFINE_HANDLE(object) typedef struct object##_T* object;


		#if defined(__LP64__) \|\| defined(_WIN64) \|\| defined(__x86_64__) \|\| defined(_M_X64) \|\| defined(__ia64) \|\| defined (_M_IA64) \|\| defined(__aarch64__) \|\| defined(__powerpc64__)
		#if defined(__LP64__) \|\| defined(_WIN64) \|\| (defined(__x86_64__) && !defined(__ILP32__) ) \|\| defined(_M_X64) \|\| defined(__ia64) \|\| defined (_M_IA64) \|\| defined(__aarch64__) \|\| defined(__powerpc64__)
		#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef struct object##_T *object;
		#else
		#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object;
		@@ -135,6 +135,7 @@ typedef enum VkResult {
		VK_ERROR_INCOMPATIBLE_DRIVER = -9,
		VK_ERROR_TOO_MANY_OBJECTS = -10,
		VK_ERROR_FORMAT_NOT_SUPPORTED = -11,
		VK_ERROR_FRAGMENTED_POOL = -12,
		VK_ERROR_SURFACE_LOST_KHR = -1000000000,
		VK_ERROR_NATIVE_WINDOW_IN_USE_KHR = -1000000001,
		VK_SUBOPTIMAL_KHR = 1000001003,
		@@ -142,9 +143,9 @@ typedef enum VkResult {
		VK_ERROR_INCOMPATIBLE_DISPLAY_KHR = -1000003001,
		VK_ERROR_VALIDATION_FAILED_EXT = -1000011001,
		VK_ERROR_INVALID_SHADER_NV = -1000012000,
		VK_RESULT_BEGIN_RANGE = VK_ERROR_FORMAT_NOT_SUPPORTED,
		VK_RESULT_BEGIN_RANGE = VK_ERROR_FRAGMENTED_POOL,
		VK_RESULT_END_RANGE = VK_INCOMPLETE,
		VK_RESULT_RANGE_SIZE = (VK_INCOMPLETE - VK_ERROR_FORMAT_NOT_SUPPORTED + 1),
		VK_RESULT_RANGE_SIZE = (VK_INCOMPLETE - VK_ERROR_FRAGMENTED_POOL + 1),
		VK_RESULT_MAX_ENUM = 0x7FFFFFFF
		} VkResult;

		@@ -214,6 +215,9 @@ typedef enum VkStructureType {
		VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT = 1000022000,
		VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT = 1000022001,
		VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT = 1000022002,
		VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV = 1000026000,
		VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV = 1000026001,
		VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV = 1000026002,
		VK_STRUCTURE_TYPE_BEGIN_RANGE = VK_STRUCTURE_TYPE_APPLICATION_INFO,
		VK_STRUCTURE_TYPE_END_RANGE = VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO,
		VK_STRUCTURE_TYPE_RANGE_SIZE = (VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO - VK_STRUCTURE_TYPE_APPLICATION_INFO + 1),
		@@ -2347,7 +2351,7 @@ typedef void (VKAPI_PTR *PFN_vkCmdCopyImage)(VkCommandBuffer commandBuffer, VkIm
		typedef void (VKAPI_PTR PFN_vkCmdBlitImage)(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit pRegions, VkFilter filter);
		typedef void (VKAPI_PTR PFN_vkCmdCopyBufferToImage)(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy pRegions);
		typedef void (VKAPI_PTR PFN_vkCmdCopyImageToBuffer)(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy pRegions);
		typedef void (VKAPI_PTR PFN_vkCmdUpdateBuffer)(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t pData);
		typedef void (VKAPI_PTR PFN_vkCmdUpdateBuffer)(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void pData);
		typedef void (VKAPI_PTR *PFN_vkCmdFillBuffer)(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data);
		typedef void (VKAPI_PTR PFN_vkCmdClearColorImage)(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);
		typedef void (VKAPI_PTR PFN_vkCmdClearDepthStencilImage)(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);
		@@ -3032,7 +3036,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdUpdateBuffer(
		VkBuffer dstBuffer,
		VkDeviceSize dstOffset,
		VkDeviceSize dataSize,
		const uint32_t* pData);
		const void* pData);

		VKAPI_ATTR void VKAPI_CALL vkCmdFillBuffer(
		VkCommandBuffer commandBuffer,
		@@ -3715,7 +3719,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceWin32PresentationSupportKHR(
		#define VK_EXT_debug_report 1
		VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT)

		#define VK_EXT_DEBUG_REPORT_SPEC_VERSION 2
		#define VK_EXT_DEBUG_REPORT_SPEC_VERSION 3
		#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

		@@ -3855,6 +3859,16 @@ typedef struct VkPipelineRasterizationStateRasterizationOrderAMD {



		#define VK_AMD_shader_trinary_minmax 1
		#define VK_AMD_SHADER_TRINARY_MINMAX_SPEC_VERSION 1
		#define VK_AMD_SHADER_TRINARY_MINMAX_EXTENSION_NAME "VK_AMD_shader_trinary_minmax"


		#define VK_AMD_shader_explicit_vertex_parameter 1
		#define VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_SPEC_VERSION 1
		#define VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_EXTENSION_NAME "VK_AMD_shader_explicit_vertex_parameter"


		#define VK_EXT_debug_marker 1
		#define VK_EXT_DEBUG_MARKER_SPEC_VERSION 3
		#define VK_EXT_DEBUG_MARKER_EXTENSION_NAME "VK_EXT_debug_marker"
		@@ -3912,6 +3926,36 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDebugMarkerInsertEXT(
		VkDebugMarkerMarkerInfoEXT* pMarkerInfo);
		#endif

		#define VK_AMD_gcn_shader 1
		#define VK_AMD_GCN_SHADER_SPEC_VERSION 1
		#define VK_AMD_GCN_SHADER_EXTENSION_NAME "VK_AMD_gcn_shader"


		#define VK_NV_dedicated_allocation 1
		#define VK_NV_DEDICATED_ALLOCATION_SPEC_VERSION 1
		#define VK_NV_DEDICATED_ALLOCATION_EXTENSION_NAME "VK_NV_dedicated_allocation"

		typedef struct VkDedicatedAllocationImageCreateInfoNV {
		VkStructureType sType;
		const void* pNext;
		VkBool32 dedicatedAllocation;
		} VkDedicatedAllocationImageCreateInfoNV;

		typedef struct VkDedicatedAllocationBufferCreateInfoNV {
		VkStructureType sType;
		const void* pNext;
		VkBool32 dedicatedAllocation;
		} VkDedicatedAllocationBufferCreateInfoNV;

		typedef struct VkDedicatedAllocationMemoryAllocateInfoNV {
		VkStructureType sType;
		const void* pNext;
		VkImage image;
		VkBuffer buffer;
		} VkDedicatedAllocationMemoryAllocateInfoNV;



		#ifdef __cplusplus
		}
		#endif

vulkan/libvulkan/api_gen.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -394,7 +394,7 @@ VKAPI_ATTR void CmdCopyImage(VkCommandBuffer commandBuffer, VkImage srcImage, Vk
		VKAPI_ATTR void CmdBlitImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter);
		VKAPI_ATTR void CmdCopyBufferToImage(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions);
		VKAPI_ATTR void CmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions);
		VKAPI_ATTR void CmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData);
		VKAPI_ATTR void CmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData);
		VKAPI_ATTR void CmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data);
		VKAPI_ATTR void CmdClearColorImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);
		VKAPI_ATTR void CmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);
		@@ -1075,7 +1075,7 @@ VKAPI_ATTR void CmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage srcI
		GetData(commandBuffer).dispatch.CmdCopyImageToBuffer(commandBuffer, srcImage, srcImageLayout, dstBuffer, regionCount, pRegions);
		}

		VKAPI_ATTR void CmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData) {
		VKAPI_ATTR void CmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData) {
		GetData(commandBuffer).dispatch.CmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize, pData);
		}

		@@ -1795,7 +1795,7 @@ VKAPI_ATTR void vkCmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage sr
		}

		__attribute__((visibility("default")))
		VKAPI_ATTR void vkCmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData) {
		VKAPI_ATTR void vkCmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData) {
		vulkan::api::CmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize, pData);
		}

vulkan/nulldrv/null_driver.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1334,7 +1334,7 @@ void CmdCopyBufferToImage(VkCommandBuffer cmdBuffer, VkBuffer srcBuffer, VkImage
		void CmdCopyImageToBuffer(VkCommandBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer destBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions) {
		}

		void CmdUpdateBuffer(VkCommandBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize dataSize, const uint32_t* pData) {
		void CmdUpdateBuffer(VkCommandBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize dataSize, const void* pData) {
		}

		void CmdFillBuffer(VkCommandBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize fillSize, uint32_t data) {