From d671923090e4dc74c0ebdb10c6e09fa0826e1fe9 Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Fri, 13 Jun 2025 12:04:24 -0700 Subject: build: Update to header 1.4.318 --- icd/VkICD_mock_icd.json.in | 2 +- icd/generated/function_declarations.h | 15 ++++++++++++++ icd/generated/function_definitions.h | 15 ++++++++++++++ icd/generated/vk_typemap_helper.h | 38 +++++++++++++++++++++++++++++++++++ scripts/common_codegen.py | 1 + scripts/known_good.json | 4 ++-- 6 files changed, 72 insertions(+), 3 deletions(-) diff --git a/icd/VkICD_mock_icd.json.in b/icd/VkICD_mock_icd.json.in index ec4dc6d6..7f75cf16 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.317" + "api_version": "1.4.318" } } \ No newline at end of file diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index c351f2f9..68aca233 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -72,6 +72,7 @@ static const std::unordered_map instance_extension_map = {"VK_LUNARG_direct_driver_loading", 1}, {"VK_EXT_layer_settings", 2}, {"VK_NV_display_stereo", 1}, + {"VK_OHOS_surface", 1}, }; // Map of device extension name to version static const std::unordered_map device_extension_map = { @@ -442,6 +443,7 @@ static const std::unordered_map device_extension_map = { {"VK_KHR_depth_clamp_zero_one", 1}, {"VK_EXT_vertex_attribute_robustness", 1}, {"VK_ARM_format_pack", 1}, + {"VK_VALVE_fragment_density_map_layered", 1}, {"VK_KHR_robustness2", 1}, {"VK_NV_present_metering", 1}, {"VK_EXT_fragment_density_map_offset", 1}, @@ -4746,6 +4748,15 @@ static VKAPI_ATTR void VKAPI_CALL UpdateIndirectExecutionSetShaderEXT( +#ifdef VK_USE_PLATFORM_OHOS + +static VKAPI_ATTR VkResult VKAPI_CALL CreateSurfaceOHOS( + VkInstance instance, + const VkSurfaceCreateInfoOHOS* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkSurfaceKHR* pSurface); +#endif /* VK_USE_PLATFORM_OHOS */ + static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV( @@ -4770,6 +4781,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryMetalHandlePropertiesEXT( + #ifdef VK_ENABLE_BETA_EXTENSIONS #endif /* VK_ENABLE_BETA_EXTENSIONS */ @@ -5781,6 +5793,9 @@ static const std::unordered_map name_to_funcptr_map = { {"vkDestroyIndirectExecutionSetEXT", (void*)DestroyIndirectExecutionSetEXT}, {"vkUpdateIndirectExecutionSetPipelineEXT", (void*)UpdateIndirectExecutionSetPipelineEXT}, {"vkUpdateIndirectExecutionSetShaderEXT", (void*)UpdateIndirectExecutionSetShaderEXT}, +#ifdef VK_USE_PLATFORM_OHOS + {"vkCreateSurfaceOHOS", (void*)CreateSurfaceOHOS}, +#endif {"vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV", (void*)GetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV}, #ifdef VK_USE_PLATFORM_METAL_EXT {"vkGetMemoryMetalHandleEXT", (void*)GetMemoryMetalHandleEXT}, diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h index 283730e5..6e4ab207 100644 --- a/icd/generated/function_definitions.h +++ b/icd/generated/function_definitions.h @@ -8518,6 +8518,20 @@ static VKAPI_ATTR void VKAPI_CALL UpdateIndirectExecutionSetShaderEXT( +#ifdef VK_USE_PLATFORM_OHOS + +static VKAPI_ATTR VkResult VKAPI_CALL CreateSurfaceOHOS( + VkInstance instance, + const VkSurfaceCreateInfoOHOS* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkSurfaceKHR* pSurface) +{ + unique_lock_t lock(global_lock); + *pSurface = (VkSurfaceKHR)global_unique_handle++; + return VK_SUCCESS; +} +#endif /* VK_USE_PLATFORM_OHOS */ + static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV( @@ -8554,6 +8568,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryMetalHandlePropertiesEXT( + #ifdef VK_ENABLE_BETA_EXTENSIONS #endif /* VK_ENABLE_BETA_EXTENSIONS */ diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index d5a3160d..29954aef 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -9424,6 +9424,17 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_OH_SURFACE_CREATE_INFO_OHOS; +}; + +template <> struct LvlSTypeMap { + typedef VkOHSurfaceCreateInfoOHOS Type; +}; + +#endif // VK_USE_PLATFORM_OHOS // Map type VkPhysicalDeviceHdrVividFeaturesHUAWEI to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HDR_VIVID_FEATURES_HUAWEI template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HDR_VIVID_FEATURES_HUAWEI; @@ -9529,6 +9540,33 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_FEATURES_VALVE; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE Type; +}; + +// Map type VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_PROPERTIES_VALVE +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_PROPERTIES_VALVE; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE Type; +}; + +// Map type VkPipelineFragmentDensityMapLayeredCreateInfoVALVE to id VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_DENSITY_MAP_LAYERED_CREATE_INFO_VALVE +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_DENSITY_MAP_LAYERED_CREATE_INFO_VALVE; +}; + +template <> struct LvlSTypeMap { + typedef VkPipelineFragmentDensityMapLayeredCreateInfoVALVE Type; +}; + #ifdef VK_ENABLE_BETA_EXTENSIONS // Map type VkSetPresentConfigNV to id VK_STRUCTURE_TYPE_SET_PRESENT_CONFIG_NV template <> struct LvlTypeMap { diff --git a/scripts/common_codegen.py b/scripts/common_codegen.py index 7fe51da2..1e4d9700 100644 --- a/scripts/common_codegen.py +++ b/scripts/common_codegen.py @@ -61,6 +61,7 @@ platform_dict = { 'directfb' : 'VK_USE_PLATFORM_DIRECTFB_EXT', 'screen' : 'VK_USE_PLATFORM_SCREEN_QNX', 'sci' : 'VK_USE_PLATFORM_SCI', + 'ohos' : 'VK_USE_PLATFORM_OHOS', } # diff --git a/scripts/known_good.json b/scripts/known_good.json index c99483f9..8bd3c409 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.317" + "commit": "v1.4.318" }, { "name": "MoltenVK", @@ -56,7 +56,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "v1.4.317", + "commit": "v1.4.318", "build_platforms": [ "windows", "linux", -- cgit v1.2.3