diff --git a/CMakeLists.txt b/CMakeLists.txt index cea2510f7..9906c0da7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 3.22.1) # The VERSION field is generated with the "--generated-version" flag in the generate_source.py script -project(Vulkan-Tools VERSION 1.4.343) +project(Vulkan-Tools VERSION 1.4.344) # This variable enables downstream users to customize the target API # variant (e.g. Vulkan SC) diff --git a/icd/VkICD_mock_icd.json.in b/icd/VkICD_mock_icd.json.in index 59ae90703..f9d8723bb 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.4.343" + "api_version": "1.4.344" } } \ No newline at end of file diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index fac3ae973..92c0be3fb 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -549,6 +549,7 @@ static const std::unordered_map device_extension_map = { {"VK_EXT_shader_uniform_buffer_unsized_array", VK_EXT_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_SPEC_VERSION}, {"VK_NV_compute_occupancy_priority", VK_NV_COMPUTE_OCCUPANCY_PRIORITY_SPEC_VERSION}, {"VK_EXT_shader_subgroup_partitioned", VK_EXT_SHADER_SUBGROUP_PARTITIONED_SPEC_VERSION}, + {"VK_VALVE_shader_mixed_float_dot_product", VK_VALVE_SHADER_MIXED_FLOAT_DOT_PRODUCT_SPEC_VERSION}, {"VK_KHR_acceleration_structure", VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION}, {"VK_KHR_ray_tracing_pipeline", VK_KHR_RAY_TRACING_PIPELINE_SPEC_VERSION}, {"VK_KHR_ray_query", VK_KHR_RAY_QUERY_SPEC_VERSION}, @@ -2970,7 +2971,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateUbmSurfaceSEC(VkInstance instance, c static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceUbmPresentationSupportSEC(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, - struct ubm_device* ubm_device); + struct ubm_device* device); #endif /* VK_USE_PLATFORM_UBM_SEC */ static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h index 0261e0a81..c080684e6 100644 --- a/icd/generated/function_definitions.h +++ b/icd/generated/function_definitions.h @@ -4465,7 +4465,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateUbmSurfaceSEC(VkInstance instance, c } static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceUbmPresentationSupportSEC(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, - struct ubm_device* ubm_device) { + struct ubm_device* device) { // Not a CREATE or DESTROY function return VK_SUCCESS; } diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index f2d868d11..07dc8639c 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -40,39 +40,6 @@ struct LvlSTypeMap {}; template struct LvlTypeMap {}; -// Map type VkBufferMemoryBarrier to id VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER -template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; -}; - -template <> -struct LvlSTypeMap { - typedef VkBufferMemoryBarrier Type; -}; - -// Map type VkImageMemoryBarrier to id VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER -template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; -}; - -template <> -struct LvlSTypeMap { - typedef VkImageMemoryBarrier Type; -}; - -// Map type VkMemoryBarrier to id VK_STRUCTURE_TYPE_MEMORY_BARRIER -template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_MEMORY_BARRIER; -}; - -template <> -struct LvlSTypeMap { - typedef VkMemoryBarrier Type; -}; - // Map type VkApplicationInfo to id VK_STRUCTURE_TYPE_APPLICATION_INFO template <> struct LvlTypeMap { @@ -271,6 +238,39 @@ struct LvlSTypeMap { typedef VkCommandBufferBeginInfo Type; }; +// Map type VkBufferMemoryBarrier to id VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER +template <> +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; +}; + +template <> +struct LvlSTypeMap { + typedef VkBufferMemoryBarrier Type; +}; + +// Map type VkImageMemoryBarrier to id VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER +template <> +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; +}; + +template <> +struct LvlSTypeMap { + typedef VkImageMemoryBarrier Type; +}; + +// Map type VkMemoryBarrier to id VK_STRUCTURE_TYPE_MEMORY_BARRIER +template <> +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_MEMORY_BARRIER; +}; + +template <> +struct LvlSTypeMap { + typedef VkMemoryBarrier Type; +}; + // Map type VkEventCreateInfo to id VK_STRUCTURE_TYPE_EVENT_CREATE_INFO template <> struct LvlTypeMap { @@ -414,103 +414,103 @@ struct LvlSTypeMap { typedef VkWriteDescriptorSet Type; }; -// Map type VkPipelineVertexInputStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO +// Map type VkPipelineColorBlendStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; }; template <> -struct LvlSTypeMap { - typedef VkPipelineVertexInputStateCreateInfo Type; +struct LvlSTypeMap { + typedef VkPipelineColorBlendStateCreateInfo Type; }; -// Map type VkPipelineInputAssemblyStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO +// Map type VkPipelineDepthStencilStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; }; template <> -struct LvlSTypeMap { - typedef VkPipelineInputAssemblyStateCreateInfo Type; +struct LvlSTypeMap { + typedef VkPipelineDepthStencilStateCreateInfo Type; }; -// Map type VkPipelineTessellationStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO +// Map type VkPipelineDynamicStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO; }; template <> -struct LvlSTypeMap { - typedef VkPipelineTessellationStateCreateInfo Type; +struct LvlSTypeMap { + typedef VkPipelineDynamicStateCreateInfo Type; }; -// Map type VkPipelineViewportStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO +// Map type VkPipelineInputAssemblyStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; }; template <> -struct LvlSTypeMap { - typedef VkPipelineViewportStateCreateInfo Type; +struct LvlSTypeMap { + typedef VkPipelineInputAssemblyStateCreateInfo Type; }; -// Map type VkPipelineRasterizationStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO +// Map type VkPipelineMultisampleStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO; +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; }; template <> -struct LvlSTypeMap { - typedef VkPipelineRasterizationStateCreateInfo Type; +struct LvlSTypeMap { + typedef VkPipelineMultisampleStateCreateInfo Type; }; -// Map type VkPipelineMultisampleStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO +// Map type VkPipelineRasterizationStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO; }; template <> -struct LvlSTypeMap { - typedef VkPipelineMultisampleStateCreateInfo Type; +struct LvlSTypeMap { + typedef VkPipelineRasterizationStateCreateInfo Type; }; -// Map type VkPipelineDepthStencilStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO +// Map type VkPipelineTessellationStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; }; template <> -struct LvlSTypeMap { - typedef VkPipelineDepthStencilStateCreateInfo Type; +struct LvlSTypeMap { + typedef VkPipelineTessellationStateCreateInfo Type; }; -// Map type VkPipelineColorBlendStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO +// Map type VkPipelineVertexInputStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; }; template <> -struct LvlSTypeMap { - typedef VkPipelineColorBlendStateCreateInfo Type; +struct LvlSTypeMap { + typedef VkPipelineVertexInputStateCreateInfo Type; }; -// Map type VkPipelineDynamicStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO +// Map type VkPipelineViewportStateCreateInfo to id VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO; +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; }; template <> -struct LvlSTypeMap { - typedef VkPipelineDynamicStateCreateInfo Type; +struct LvlSTypeMap { + typedef VkPipelineViewportStateCreateInfo Type; }; // Map type VkGraphicsPipelineCreateInfo to id VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO @@ -1273,6 +1273,17 @@ struct LvlSTypeMap +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES; +}; + +template <> +struct LvlSTypeMap { + typedef VkPhysicalDeviceDriverProperties Type; +}; + // Map type VkPhysicalDeviceVulkan11Features to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES template <> struct LvlTypeMap { @@ -1328,17 +1339,6 @@ struct LvlSTypeMap { typedef VkImageFormatListCreateInfo Type; }; -// Map type VkPhysicalDeviceDriverProperties to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES -template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES; -}; - -template <> -struct LvlSTypeMap { - typedef VkPhysicalDeviceDriverProperties Type; -}; - // Map type VkPhysicalDeviceVulkanMemoryModelFeatures to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES template <> struct LvlTypeMap { @@ -1684,17 +1684,6 @@ struct LvlSTypeMap { typedef VkSubpassDependency2 Type; }; -// Map type VkRenderPassCreateInfo2 to id VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2 -template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2; -}; - -template <> -struct LvlSTypeMap { - typedef VkRenderPassCreateInfo2 Type; -}; - // Map type VkSubpassBeginInfo to id VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO template <> struct LvlTypeMap { @@ -1717,6 +1706,17 @@ struct LvlSTypeMap { typedef VkSubpassEndInfo Type; }; +// Map type VkRenderPassCreateInfo2 to id VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2 +template <> +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2; +}; + +template <> +struct LvlSTypeMap { + typedef VkRenderPassCreateInfo2 Type; +}; + // Map type VkSubpassDescriptionDepthStencilResolve to id VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE template <> struct LvlTypeMap { @@ -1772,26 +1772,26 @@ struct LvlSTypeMap { typedef VkFramebufferAttachmentImageInfo Type; }; -// Map type VkFramebufferAttachmentsCreateInfo to id VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO +// Map type VkRenderPassAttachmentBeginInfo to id VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO; +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO; }; template <> -struct LvlSTypeMap { - typedef VkFramebufferAttachmentsCreateInfo Type; +struct LvlSTypeMap { + typedef VkRenderPassAttachmentBeginInfo Type; }; -// Map type VkRenderPassAttachmentBeginInfo to id VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO +// Map type VkFramebufferAttachmentsCreateInfo to id VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO; +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO; }; template <> -struct LvlSTypeMap { - typedef VkRenderPassAttachmentBeginInfo Type; +struct LvlSTypeMap { + typedef VkFramebufferAttachmentsCreateInfo Type; }; // Map type VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures to id @@ -2518,6 +2518,17 @@ struct LvlSTypeMap { typedef VkPhysicalDeviceMaintenance5Properties Type; }; +// Map type VkSubresourceLayout2 to id VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2 +template <> +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2; +}; + +template <> +struct LvlSTypeMap { + typedef VkSubresourceLayout2 Type; +}; + // Map type VkImageSubresource2 to id VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2 template <> struct LvlTypeMap { @@ -2540,17 +2551,6 @@ struct LvlSTypeMap { typedef VkDeviceImageSubresourceInfo Type; }; -// Map type VkSubresourceLayout2 to id VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2 -template <> -struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2; -}; - -template <> -struct LvlSTypeMap { - typedef VkSubresourceLayout2 Type; -}; - // Map type VkBufferUsageFlags2CreateInfo to id VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO template <> struct LvlTypeMap { @@ -13025,6 +13025,18 @@ struct LvlSTypeMap { }; #endif // VK_USE_PLATFORM_UBM_SEC +// Map type VkPhysicalDeviceShaderMixedFloatDotProductFeaturesVALVE to id +// VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MIXED_FLOAT_DOT_PRODUCT_FEATURES_VALVE +template <> +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MIXED_FLOAT_DOT_PRODUCT_FEATURES_VALVE; +}; + +template <> +struct LvlSTypeMap { + typedef VkPhysicalDeviceShaderMixedFloatDotProductFeaturesVALVE Type; +}; + // Map type VkAccelerationStructureGeometryTrianglesDataKHR to id // VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR template <> diff --git a/scripts/known_good.json b/scripts/known_good.json index 40c390c59..547fcc894 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.4.343" + "commit": "v1.4.344" }, { "name": "MoltenVK", @@ -56,7 +56,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "v1.4.343", + "commit": "v1.4.344", "build_platforms": [ "windows", "linux",