diff options
| author | Mike Schuchardt <mikes@lunarg.com> | 2025-09-19 09:41:15 -0700 |
|---|---|---|
| committer | Mike Schuchardt <mikes@lunarg.com> | 2025-09-22 08:14:43 -0700 |
| commit | e76d0e871d057960c61fa96fb3a595007e5e2194 (patch) | |
| tree | c738d5cc92575b2974dbfbace67c6ee4c6ad7f51 | |
| parent | f5f5add52941db500e84c01d40ebd4cda986e43f (diff) | |
| download | usermoji-e76d0e871d057960c61fa96fb3a595007e5e2194.tar.xz | |
build: Update to header 1.4.327
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | icd/VkICD_mock_icd.json.in | 2 | ||||
| -rw-r--r-- | icd/generated/function_declarations.h | 2 | ||||
| -rw-r--r-- | icd/generated/function_definitions.h | 1 | ||||
| -rw-r--r-- | icd/generated/vk_typemap_helper.h | 36 | ||||
| -rw-r--r-- | scripts/known_good.json | 4 | ||||
| -rw-r--r-- | vulkaninfo/generated/vulkaninfo.hpp | 24 |
7 files changed, 67 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 87766581..b4059b2c 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.326) +project(Vulkan-Tools VERSION 1.4.327) # 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 ed64e857..5b86cb3e 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.326" + "api_version": "1.4.327" } }
\ No newline at end of file diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index ebfd4ffa..5b6818e1 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -336,6 +336,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = { {"VK_KHR_ray_tracing_maintenance1", 1}, {"VK_KHR_shader_untyped_pointers", 1}, {"VK_EXT_global_priority_query", 1}, + {"VK_VALVE_video_encode_rgb_conversion", 1}, {"VK_EXT_image_view_min_lod", 1}, {"VK_EXT_multi_draw", 1}, {"VK_EXT_image_2d_view_of_3d", 1}, @@ -4115,6 +4116,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetColor + static VKAPI_ATTR void VKAPI_CALL CmdDrawMultiEXT( VkCommandBuffer commandBuffer, uint32_t drawCount, diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h index b106bca4..6c63bc20 100644 --- a/icd/generated/function_definitions.h +++ b/icd/generated/function_definitions.h @@ -6669,6 +6669,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetColor + static VKAPI_ATTR void VKAPI_CALL CmdDrawMultiEXT( VkCommandBuffer commandBuffer, uint32_t drawCount, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 9f8dbbf0..ff74424d 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -7521,6 +7521,42 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVES_GENE typedef VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT Type; }; +// Map type VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_RGB_CONVERSION_FEATURES_VALVE +template <> struct LvlTypeMap<VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE> { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_RGB_CONVERSION_FEATURES_VALVE; +}; + +template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_RGB_CONVERSION_FEATURES_VALVE> { + typedef VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE Type; +}; + +// Map type VkVideoEncodeRgbConversionCapabilitiesVALVE to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE +template <> struct LvlTypeMap<VkVideoEncodeRgbConversionCapabilitiesVALVE> { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE; +}; + +template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE> { + typedef VkVideoEncodeRgbConversionCapabilitiesVALVE Type; +}; + +// Map type VkVideoEncodeProfileRgbConversionInfoVALVE to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_PROFILE_RGB_CONVERSION_INFO_VALVE +template <> struct LvlTypeMap<VkVideoEncodeProfileRgbConversionInfoVALVE> { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_PROFILE_RGB_CONVERSION_INFO_VALVE; +}; + +template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_PROFILE_RGB_CONVERSION_INFO_VALVE> { + typedef VkVideoEncodeProfileRgbConversionInfoVALVE Type; +}; + +// Map type VkVideoEncodeSessionRgbConversionCreateInfoVALVE to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_RGB_CONVERSION_CREATE_INFO_VALVE +template <> struct LvlTypeMap<VkVideoEncodeSessionRgbConversionCreateInfoVALVE> { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_RGB_CONVERSION_CREATE_INFO_VALVE; +}; + +template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_RGB_CONVERSION_CREATE_INFO_VALVE> { + typedef VkVideoEncodeSessionRgbConversionCreateInfoVALVE Type; +}; + // Map type VkPhysicalDeviceImageViewMinLodFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT template <> struct LvlTypeMap<VkPhysicalDeviceImageViewMinLodFeaturesEXT> { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT; diff --git a/scripts/known_good.json b/scripts/known_good.json index fedc04e6..d13eaf65 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.326" + "commit": "v1.4.327" }, { "name": "MoltenVK", @@ -56,7 +56,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "v1.4.326", + "commit": "v1.4.327", "build_platforms": [ "windows", "linux", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 67b47de3..6094e9b3 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -8976,6 +8976,14 @@ std::vector<std::unique_ptr<AppVideoProfile>> enumerate_supported_video_profiles } } if (capabilities_chain != nullptr) { + if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_VALVE_VIDEO_ENCODE_RGB_CONVERSION_EXTENSION_NAME)) { + capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.sType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE; + capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.pNext = nullptr; + *ppnext = &capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE; + ppnext = &capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.pNext; + } + } + if (capabilities_chain != nullptr) { if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_VIDEO_ENCODE_H264_EXTENSION_NAME)) { capabilities_chain->VideoEncodeH264CapabilitiesKHR.sType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_KHR; capabilities_chain->VideoEncodeH264CapabilitiesKHR.pNext = nullptr; @@ -9169,6 +9177,14 @@ std::vector<std::unique_ptr<AppVideoProfile>> enumerate_supported_video_profiles } } if (capabilities_chain != nullptr) { + if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_VALVE_VIDEO_ENCODE_RGB_CONVERSION_EXTENSION_NAME)) { + capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.sType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE; + capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.pNext = nullptr; + *ppnext = &capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE; + ppnext = &capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.pNext; + } + } + if (capabilities_chain != nullptr) { if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_VIDEO_ENCODE_H265_EXTENSION_NAME)) { capabilities_chain->VideoEncodeH265CapabilitiesKHR.sType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_KHR; capabilities_chain->VideoEncodeH265CapabilitiesKHR.pNext = nullptr; @@ -9384,6 +9400,14 @@ std::vector<std::unique_ptr<AppVideoProfile>> enumerate_supported_video_profiles } } if (capabilities_chain != nullptr) { + if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_VALVE_VIDEO_ENCODE_RGB_CONVERSION_EXTENSION_NAME)) { + capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.sType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE; + capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.pNext = nullptr; + *ppnext = &capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE; + ppnext = &capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.pNext; + } + } + if (capabilities_chain != nullptr) { if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_VIDEO_ENCODE_AV1_EXTENSION_NAME)) { capabilities_chain->VideoEncodeAV1CapabilitiesKHR.sType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_CAPABILITIES_KHR; capabilities_chain->VideoEncodeAV1CapabilitiesKHR.pNext = nullptr; |
