From 2030a5b09f5656d1e9b8c9c4ab3ebe98024da150 Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Fri, 18 Oct 2024 08:42:36 -0700 Subject: [PATCH] build: Update to header 1.3.299 --- icd/VkICD_mock_icd.json.in | 2 +- icd/generated/function_declarations.h | 28 ++++----- icd/generated/function_definitions.h | 36 ++++++------ icd/generated/vk_typemap_helper.h | 108 +++++++++++++++++----------------- scripts/known_good.json | 4 +- 5 files changed, 89 insertions(+), 89 deletions(-) diff --git a/icd/VkICD_mock_icd.json.in b/icd/VkICD_mock_icd.json.in index e7d69739..4d21d0fe 100644 --- a/icd/VkICD_mock_icd.json.in +++ b/icd/VkICD_mock_icd.json.in @@ -2,6 +2,6 @@ "file_format_version": "1.0.1", "ICD": { "library_path": "@JSON_LIBRARY_PATH@", - "api_version": "1.3.298" + "api_version": "1.3.299" } } \ No newline at end of file diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index 22738e68..f541eecb 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -2421,18 +2421,6 @@ static VKAPI_ATTR VkResult VKAPI_CALL QueueSubmit2KHR( const VkSubmitInfo2* pSubmits, VkFence fence); -static VKAPI_ATTR void VKAPI_CALL CmdWriteBufferMarker2AMD( - VkCommandBuffer commandBuffer, - VkPipelineStageFlags2 stage, - VkBuffer dstBuffer, - VkDeviceSize dstOffset, - uint32_t marker); - -static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointData2NV( - VkQueue queue, - uint32_t* pCheckpointDataCount, - VkCheckpointData2NV* pCheckpointData); - @@ -3242,6 +3230,13 @@ static VKAPI_ATTR void VKAPI_CALL CmdWriteBufferMarkerAMD( VkDeviceSize dstOffset, uint32_t marker); +static VKAPI_ATTR void VKAPI_CALL CmdWriteBufferMarker2AMD( + VkCommandBuffer commandBuffer, + VkPipelineStageFlags2 stage, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, + uint32_t marker); + static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCalibrateableTimeDomainsEXT( @@ -3312,6 +3307,11 @@ static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointDataNV( uint32_t* pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData); +static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointData2NV( + VkQueue queue, + uint32_t* pCheckpointDataCount, + VkCheckpointData2NV* pCheckpointData); + static VKAPI_ATTR VkResult VKAPI_CALL InitializePerformanceApiINTEL( @@ -5011,8 +5011,6 @@ static const std::unordered_map name_to_funcptr_map = { {"vkCmdPipelineBarrier2KHR", (void*)CmdPipelineBarrier2KHR}, {"vkCmdWriteTimestamp2KHR", (void*)CmdWriteTimestamp2KHR}, {"vkQueueSubmit2KHR", (void*)QueueSubmit2KHR}, - {"vkCmdWriteBufferMarker2AMD", (void*)CmdWriteBufferMarker2AMD}, - {"vkGetQueueCheckpointData2NV", (void*)GetQueueCheckpointData2NV}, {"vkCmdCopyBuffer2KHR", (void*)CmdCopyBuffer2KHR}, {"vkCmdCopyImage2KHR", (void*)CmdCopyImage2KHR}, {"vkCmdCopyBufferToImage2KHR", (void*)CmdCopyBufferToImage2KHR}, @@ -5166,6 +5164,7 @@ static const std::unordered_map name_to_funcptr_map = { {"vkCompileDeferredNV", (void*)CompileDeferredNV}, {"vkGetMemoryHostPointerPropertiesEXT", (void*)GetMemoryHostPointerPropertiesEXT}, {"vkCmdWriteBufferMarkerAMD", (void*)CmdWriteBufferMarkerAMD}, + {"vkCmdWriteBufferMarker2AMD", (void*)CmdWriteBufferMarker2AMD}, {"vkGetPhysicalDeviceCalibrateableTimeDomainsEXT", (void*)GetPhysicalDeviceCalibrateableTimeDomainsEXT}, {"vkGetCalibratedTimestampsEXT", (void*)GetCalibratedTimestampsEXT}, {"vkCmdDrawMeshTasksNV", (void*)CmdDrawMeshTasksNV}, @@ -5175,6 +5174,7 @@ static const std::unordered_map name_to_funcptr_map = { {"vkCmdSetExclusiveScissorNV", (void*)CmdSetExclusiveScissorNV}, {"vkCmdSetCheckpointNV", (void*)CmdSetCheckpointNV}, {"vkGetQueueCheckpointDataNV", (void*)GetQueueCheckpointDataNV}, + {"vkGetQueueCheckpointData2NV", (void*)GetQueueCheckpointData2NV}, {"vkInitializePerformanceApiINTEL", (void*)InitializePerformanceApiINTEL}, {"vkUninitializePerformanceApiINTEL", (void*)UninitializePerformanceApiINTEL}, {"vkCmdSetPerformanceMarkerINTEL", (void*)CmdSetPerformanceMarkerINTEL}, diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h index 11c645c6..9c099671 100644 --- a/icd/generated/function_definitions.h +++ b/icd/generated/function_definitions.h @@ -4531,24 +4531,6 @@ static VKAPI_ATTR VkResult VKAPI_CALL QueueSubmit2KHR( return VK_SUCCESS; } -static VKAPI_ATTR void VKAPI_CALL CmdWriteBufferMarker2AMD( - VkCommandBuffer commandBuffer, - VkPipelineStageFlags2 stage, - VkBuffer dstBuffer, - VkDeviceSize dstOffset, - uint32_t marker) -{ -//Not a CREATE or DESTROY function -} - -static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointData2NV( - VkQueue queue, - uint32_t* pCheckpointDataCount, - VkCheckpointData2NV* pCheckpointData) -{ -//Not a CREATE or DESTROY function -} - @@ -5832,6 +5814,16 @@ static VKAPI_ATTR void VKAPI_CALL CmdWriteBufferMarkerAMD( //Not a CREATE or DESTROY function } +static VKAPI_ATTR void VKAPI_CALL CmdWriteBufferMarker2AMD( + VkCommandBuffer commandBuffer, + VkPipelineStageFlags2 stage, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, + uint32_t marker) +{ +//Not a CREATE or DESTROY function +} + static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCalibrateableTimeDomainsEXT( @@ -5936,6 +5928,14 @@ static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointDataNV( //Not a CREATE or DESTROY function } +static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointData2NV( + VkQueue queue, + uint32_t* pCheckpointDataCount, + VkCheckpointData2NV* pCheckpointData) +{ +//Not a CREATE or DESTROY function +} + static VKAPI_ATTR VkResult VKAPI_CALL InitializePerformanceApiINTEL( diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 2bc0b568..01ad126d 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -2605,42 +2605,6 @@ template <> struct LvlSTypeMap struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR; -}; - -template <> struct LvlSTypeMap { - typedef VkRenderingFragmentShadingRateAttachmentInfoKHR Type; -}; - -// Map type VkRenderingFragmentDensityMapAttachmentInfoEXT to id VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT -template <> struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT; -}; - -template <> struct LvlSTypeMap { - typedef VkRenderingFragmentDensityMapAttachmentInfoEXT Type; -}; - -// Map type VkAttachmentSampleCountInfoAMD to id VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD -template <> struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD; -}; - -template <> struct LvlSTypeMap { - typedef VkAttachmentSampleCountInfoAMD Type; -}; - -// Map type VkMultiviewPerViewAttributesInfoNVX to id VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX -template <> struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX; -}; - -template <> struct LvlSTypeMap { - typedef VkMultiviewPerViewAttributesInfoNVX Type; -}; - #ifdef VK_USE_PLATFORM_WIN32_KHR // Map type VkImportMemoryWin32HandleInfoKHR to id VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR template <> struct LvlTypeMap { @@ -3155,6 +3119,15 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkRenderingFragmentShadingRateAttachmentInfoKHR Type; +}; + // Map type VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR; @@ -3407,24 +3380,6 @@ template <> struct LvlSTypeMap struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV; -}; - -template <> struct LvlSTypeMap { - typedef VkQueueFamilyCheckpointProperties2NV Type; -}; - -// Map type VkCheckpointData2NV to id VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV -template <> struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV; -}; - -template <> struct LvlSTypeMap { - typedef VkCheckpointData2NV Type; -}; - // Map type VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_KHR template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_KHR; @@ -4380,6 +4335,15 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX; +}; + +template <> struct LvlSTypeMap { + typedef VkMultiviewPerViewAttributesInfoNVX Type; +}; + // Map type VkPipelineViewportSwizzleStateCreateInfoNV to id VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV; @@ -4660,6 +4624,15 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD; +}; + +template <> struct LvlSTypeMap { + typedef VkAttachmentSampleCountInfoAMD Type; +}; + // Map type VkSampleLocationsInfoEXT to id VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT; @@ -5148,6 +5121,24 @@ template <> struct LvlSTypeMap { typedef VkCheckpointDataNV Type; }; +// Map type VkQueueFamilyCheckpointProperties2NV to id VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkQueueFamilyCheckpointProperties2NV Type; +}; + +// Map type VkCheckpointData2NV to id VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkCheckpointData2NV Type; +}; + // Map type VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL; @@ -5287,6 +5278,15 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT; +}; + +template <> struct LvlSTypeMap { + typedef VkRenderingFragmentDensityMapAttachmentInfoEXT Type; +}; + // Map type VkPhysicalDeviceShaderCoreProperties2AMD to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD; diff --git a/scripts/known_good.json b/scripts/known_good.json index cc4cb66a..e9c122b1 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -7,7 +7,7 @@ "sub_dir": "Vulkan-Headers", "build_dir": "Vulkan-Headers/build", "install_dir": "Vulkan-Headers/build/install", - "commit": "v1.3.298" + "commit": "v1.3.299" }, { "name": "MoltenVK", @@ -74,7 +74,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "v1.3.298", + "commit": "v1.3.299", "build_platforms": [ "windows", "linux", -- 2.11.4.GIT