From f296c58ae43c91c126314237856b09af97278f6f Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Mon, 7 Oct 2024 09:46:40 -0700 Subject: [PATCH] build: Update to header 1.3.297 --- icd/VkICD_mock_icd.json.in | 2 +- icd/generated/function_declarations.h | 2 ++ icd/generated/function_definitions.h | 1 + icd/generated/vk_typemap_helper.h | 9 +++++++++ scripts/known_good.json | 4 ++-- vulkaninfo/generated/vulkaninfo.hpp | 15 +++++++++++++++ 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/icd/VkICD_mock_icd.json.in b/icd/VkICD_mock_icd.json.in index f10d3d29d..aa84fed48 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.296" + "api_version": "1.3.297" } } \ No newline at end of file diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index 45e6606ae..d7139ec7e 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -315,6 +315,7 @@ static const std::unordered_map device_extension_map = { {"VK_EXT_depth_clip_control", 1}, {"VK_EXT_primitive_topology_list_restart", 1}, {"VK_KHR_format_feature_flags2", 2}, + {"VK_EXT_present_mode_fifo_latest_ready", 1}, {"VK_FUCHSIA_external_memory", 1}, {"VK_FUCHSIA_external_semaphore", 1}, {"VK_FUCHSIA_buffer_collection", 2}, @@ -3799,6 +3800,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetVertexInputEXT( + #ifdef VK_USE_PLATFORM_FUCHSIA static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryZirconHandleFUCHSIA( diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h index 559a3b0dd..9cde3184d 100644 --- a/icd/generated/function_definitions.h +++ b/icd/generated/function_definitions.h @@ -6711,6 +6711,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetVertexInputEXT( + #ifdef VK_USE_PLATFORM_FUCHSIA static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryZirconHandleFUCHSIA( diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 8c82b52cb..2bc0b568b 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -6633,6 +6633,15 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_EXT; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDevicePresentModeFifoLatestReadyFeaturesEXT Type; +}; + #ifdef VK_USE_PLATFORM_FUCHSIA // Map type VkImportMemoryZirconHandleInfoFUCHSIA to id VK_STRUCTURE_TYPE_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA template <> struct LvlTypeMap { diff --git a/scripts/known_good.json b/scripts/known_good.json index ef2567206..f55bb330f 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.296" + "commit": "v1.3.297" }, { "name": "MoltenVK", @@ -74,7 +74,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "v1.3.296", + "commit": "v1.3.297", "build_platforms": [ "windows", "linux", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index f55215132..5b3dc7191 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -508,6 +508,7 @@ std::string VkPresentModeKHRString(VkPresentModeKHR value) { case (VK_PRESENT_MODE_FIFO_RELAXED_KHR): return "PRESENT_MODE_FIFO_RELAXED_KHR"; case (VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR): return "PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR"; case (VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR): return "PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR"; + case (VK_PRESENT_MODE_FIFO_LATEST_READY_EXT): return "PRESENT_MODE_FIFO_LATEST_READY_EXT"; default: return std::string("UNKNOWN_VkPresentModeKHR_value") + std::to_string(value); } } @@ -2670,6 +2671,11 @@ void DumpVkPhysicalDevicePresentIdFeaturesKHR(Printer &p, std::string name, cons p.SetMinKeyWidth(9); p.PrintKeyBool("presentId", static_cast(obj.presentId)); } +void DumpVkPhysicalDevicePresentModeFifoLatestReadyFeaturesEXT(Printer &p, std::string name, const VkPhysicalDevicePresentModeFifoLatestReadyFeaturesEXT &obj) { + ObjectWrapper object{p, name}; + p.SetMinKeyWidth(26); + p.PrintKeyBool("presentModeFifoLatestReady", static_cast(obj.presentModeFifoLatestReady)); +} void DumpVkPhysicalDevicePresentWaitFeaturesKHR(Printer &p, std::string name, const VkPhysicalDevicePresentWaitFeaturesKHR &obj) { ObjectWrapper object{p, name}; p.SetMinKeyWidth(11); @@ -4262,6 +4268,7 @@ struct phys_device_features2_chain { VkPhysicalDevicePortabilitySubsetFeaturesKHR PhysicalDevicePortabilitySubsetFeaturesKHR{}; #endif // VK_ENABLE_BETA_EXTENSIONS VkPhysicalDevicePresentIdFeaturesKHR PhysicalDevicePresentIdFeaturesKHR{}; + VkPhysicalDevicePresentModeFifoLatestReadyFeaturesEXT PhysicalDevicePresentModeFifoLatestReadyFeaturesEXT{}; VkPhysicalDevicePresentWaitFeaturesKHR PhysicalDevicePresentWaitFeaturesKHR{}; VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT{}; VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT{}; @@ -4405,6 +4412,7 @@ struct phys_device_features2_chain { PhysicalDevicePortabilitySubsetFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PORTABILITY_SUBSET_FEATURES_KHR; #endif // VK_ENABLE_BETA_EXTENSIONS PhysicalDevicePresentIdFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR; + PhysicalDevicePresentModeFifoLatestReadyFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_EXT; PhysicalDevicePresentWaitFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR; PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT; PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVES_GENERATED_QUERY_FEATURES_EXT; @@ -4645,6 +4653,8 @@ struct phys_device_features2_chain { #endif // VK_ENABLE_BETA_EXTENSIONS if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_PRESENT_ID_EXTENSION_NAME)) chain_members.push_back(reinterpret_cast(&PhysicalDevicePresentIdFeaturesKHR)); + if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_PRESENT_MODE_FIFO_LATEST_READY_EXTENSION_NAME)) + chain_members.push_back(reinterpret_cast(&PhysicalDevicePresentModeFifoLatestReadyFeaturesEXT)); if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_PRESENT_WAIT_EXTENSION_NAME)) chain_members.push_back(reinterpret_cast(&PhysicalDevicePresentWaitFeaturesKHR)); if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_EXTENSION_NAME)) @@ -5204,6 +5214,11 @@ void chain_iterator_phys_device_features2(Printer &p, AppGpu &gpu, bool show_pro DumpVkPhysicalDevicePresentIdFeaturesKHR(p, "VkPhysicalDevicePresentIdFeaturesKHR", *props); p.AddNewline(); } + if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_EXT) { + VkPhysicalDevicePresentModeFifoLatestReadyFeaturesEXT* props = (VkPhysicalDevicePresentModeFifoLatestReadyFeaturesEXT*)structure; + DumpVkPhysicalDevicePresentModeFifoLatestReadyFeaturesEXT(p, "VkPhysicalDevicePresentModeFifoLatestReadyFeaturesEXT", *props); + p.AddNewline(); + } if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR) { VkPhysicalDevicePresentWaitFeaturesKHR* props = (VkPhysicalDevicePresentWaitFeaturesKHR*)structure; DumpVkPhysicalDevicePresentWaitFeaturesKHR(p, "VkPhysicalDevicePresentWaitFeaturesKHR", *props);