diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f4caffbc..cea2510f7 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.342) +project(Vulkan-Tools VERSION 1.4.343) # 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 927381a2a..59ae90703 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.342" + "api_version": "1.4.343" } } \ No newline at end of file diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index 93399bace..fac3ae973 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -101,6 +101,9 @@ static const std::unordered_map instance_extension_map = #ifdef VK_USE_PLATFORM_OHOS {"VK_OHOS_surface", VK_OHOS_SURFACE_SPEC_VERSION}, #endif +#ifdef VK_USE_PLATFORM_UBM_SEC + {"VK_SEC_ubm_surface", VK_SEC_UBM_SURFACE_SPEC_VERSION}, +#endif }; // Map of device extension name to version static const std::unordered_map device_extension_map = { @@ -2960,7 +2963,15 @@ static VKAPI_ATTR void VKAPI_CALL CmdBeginCustomResolveEXT(VkCommandBuffer comma static VKAPI_ATTR void VKAPI_CALL CmdSetComputeOccupancyPriorityNV(VkCommandBuffer commandBuffer, const VkComputeOccupancyPriorityParametersNV* pParameters); +#ifdef VK_USE_PLATFORM_UBM_SEC + +static VKAPI_ATTR VkResult VKAPI_CALL CreateUbmSurfaceSEC(VkInstance instance, const VkUbmSurfaceCreateInfoSEC* pCreateInfo, + const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface); +static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceUbmPresentationSupportSEC(VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + struct ubm_device* ubm_device); +#endif /* VK_USE_PLATFORM_UBM_SEC */ static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, @@ -3955,6 +3966,12 @@ static const std::unordered_map name_to_funcptr_map = { {"vkCmdEndRendering2EXT", (void*)CmdEndRendering2EXT}, {"vkCmdBeginCustomResolveEXT", (void*)CmdBeginCustomResolveEXT}, {"vkCmdSetComputeOccupancyPriorityNV", (void*)CmdSetComputeOccupancyPriorityNV}, +#ifdef VK_USE_PLATFORM_UBM_SEC + {"vkCreateUbmSurfaceSEC", (void*)CreateUbmSurfaceSEC}, +#endif +#ifdef VK_USE_PLATFORM_UBM_SEC + {"vkGetPhysicalDeviceUbmPresentationSupportSEC", (void*)GetPhysicalDeviceUbmPresentationSupportSEC}, +#endif {"vkCreateAccelerationStructureKHR", (void*)CreateAccelerationStructureKHR}, {"vkDestroyAccelerationStructureKHR", (void*)DestroyAccelerationStructureKHR}, {"vkCmdBuildAccelerationStructuresKHR", (void*)CmdBuildAccelerationStructuresKHR}, diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h index 373816b74..0261e0a81 100644 --- a/icd/generated/function_definitions.h +++ b/icd/generated/function_definitions.h @@ -4456,6 +4456,20 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetComputeOccupancyPriorityNV(VkCommandBuff const VkComputeOccupancyPriorityParametersNV* pParameters) { // Not a CREATE or DESTROY function } +#ifdef VK_USE_PLATFORM_UBM_SEC +static VKAPI_ATTR VkResult VKAPI_CALL CreateUbmSurfaceSEC(VkInstance instance, const VkUbmSurfaceCreateInfoSEC* pCreateInfo, + const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) { + unique_lock_t lock(global_lock); + *pSurface = (VkSurfaceKHR)global_unique_handle++; + return VK_SUCCESS; +} +static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceUbmPresentationSupportSEC(VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + struct ubm_device* ubm_device) { + // Not a CREATE or DESTROY function + return VK_SUCCESS; +} +#endif /* VK_USE_PLATFORM_UBM_SEC */ static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 545ee03e4..f2d868d11 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -13012,6 +13012,19 @@ struct LvlSTypeMap +struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_UBM_SURFACE_CREATE_INFO_SEC; +}; + +template <> +struct LvlSTypeMap { + typedef VkUbmSurfaceCreateInfoSEC Type; +}; + +#endif // VK_USE_PLATFORM_UBM_SEC // 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 825172090..fa82a8465 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.342" + "commit": "v1.4.343" }, { "name": "MoltenVK", @@ -56,7 +56,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "v1.4.342", + "commit": "v1.4.343", "build_platforms": [ "windows", "linux", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 718d99ad4..d9c5aabbe 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -1750,6 +1750,12 @@ std::string VkFormatString(VkFormat value) { return "FORMAT_ASTC_6x6x6_SFLOAT_BLOCK_EXT"; case (VK_FORMAT_R8_BOOL_ARM): return "FORMAT_R8_BOOL_ARM"; + case (VK_FORMAT_R16_SFLOAT_FPENCODING_BFLOAT16_ARM): + return "FORMAT_R16_SFLOAT_FPENCODING_BFLOAT16_ARM"; + case (VK_FORMAT_R8_SFLOAT_FPENCODING_FLOAT8E4M3_ARM): + return "FORMAT_R8_SFLOAT_FPENCODING_FLOAT8E4M3_ARM"; + case (VK_FORMAT_R8_SFLOAT_FPENCODING_FLOAT8E5M2_ARM): + return "FORMAT_R8_SFLOAT_FPENCODING_FLOAT8E5M2_ARM"; case (VK_FORMAT_R16G16_SFIXED5_NV): return "FORMAT_R16G16_SFIXED5_NV"; case (VK_FORMAT_R10X6_UINT_PACK16_ARM): @@ -12302,7 +12308,7 @@ auto format_ranges = std::array{ FormatRange{0, VK_IMG_FORMAT_PVRTC_EXTENSION_NAME, static_cast(1000054000), static_cast(1000054007)}, FormatRange{0, VK_EXT_TEXTURE_COMPRESSION_ASTC_3D_EXTENSION_NAME, static_cast(1000288000), static_cast(1000288029)}, - FormatRange{0, VK_ARM_TENSORS_EXTENSION_NAME, static_cast(1000460000), static_cast(1000460000)}, + FormatRange{0, VK_ARM_TENSORS_EXTENSION_NAME, static_cast(1000460000), static_cast(1000460003)}, FormatRange{0, VK_NV_OPTICAL_FLOW_EXTENSION_NAME, static_cast(1000464000), static_cast(1000464000)}, FormatRange{0, VK_ARM_FORMAT_PACK_EXTENSION_NAME, static_cast(1000609000), static_cast(1000609013)}, };