From b1fc6158fd3da69cd16b1e261e0e84f1f3bed89f Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Fri, 18 Apr 2025 12:24:45 -0700 Subject: build: Update to header 1.4.313 --- icd/VkICD_mock_icd.json.in | 2 +- icd/generated/function_declarations.h | 7 ++++++ icd/generated/function_definitions.h | 8 +++++++ icd/generated/vk_typemap_helper.h | 45 +++++++++++++++++++++++++++++++++++ scripts/known_good.json | 4 ++-- vulkaninfo/generated/vulkaninfo.hpp | 2 ++ 6 files changed, 65 insertions(+), 3 deletions(-) diff --git a/icd/VkICD_mock_icd.json.in b/icd/VkICD_mock_icd.json.in index 6780533b..22fc45ee 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.312" + "api_version": "1.4.313" } } \ No newline at end of file diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index 16b3240e..661c19a6 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -411,6 +411,7 @@ static const std::unordered_map device_extension_map = { {"VK_KHR_shader_expect_assume", 1}, {"VK_KHR_maintenance6", 1}, {"VK_NV_descriptor_pool_overallocation", 1}, + {"VK_QCOM_tile_memory_heap", 1}, {"VK_KHR_video_encode_quantization_map", 2}, {"VK_NV_raw_access_chains", 1}, {"VK_NV_external_compute_queue", 1}, @@ -4566,6 +4567,11 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetScreenBufferPropertiesQNX( +static VKAPI_ATTR void VKAPI_CALL CmdBindTileMemoryQCOM( + VkCommandBuffer commandBuffer, + const VkTileMemoryBindInfoQCOM* pTileMemoryBindInfo); + + static VKAPI_ATTR VkResult VKAPI_CALL CreateExternalComputeQueueNV( @@ -5664,6 +5670,7 @@ static const std::unordered_map name_to_funcptr_map = { #ifdef VK_USE_PLATFORM_SCREEN_QNX {"vkGetScreenBufferPropertiesQNX", (void*)GetScreenBufferPropertiesQNX}, #endif + {"vkCmdBindTileMemoryQCOM", (void*)CmdBindTileMemoryQCOM}, {"vkCreateExternalComputeQueueNV", (void*)CreateExternalComputeQueueNV}, {"vkDestroyExternalComputeQueueNV", (void*)DestroyExternalComputeQueueNV}, {"vkGetExternalComputeQueueDataNV", (void*)GetExternalComputeQueueDataNV}, diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h index 40b7e984..7657c12d 100644 --- a/icd/generated/function_definitions.h +++ b/icd/generated/function_definitions.h @@ -8248,6 +8248,14 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetScreenBufferPropertiesQNX( +static VKAPI_ATTR void VKAPI_CALL CmdBindTileMemoryQCOM( + VkCommandBuffer commandBuffer, + const VkTileMemoryBindInfoQCOM* pTileMemoryBindInfo) +{ +//Not a CREATE or DESTROY function +} + + static VKAPI_ATTR VkResult VKAPI_CALL CreateExternalComputeQueueNV( diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 56aabfff..37626b5e 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -8614,6 +8614,51 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_FEATURES_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceTileMemoryHeapFeaturesQCOM Type; +}; + +// Map type VkPhysicalDeviceTileMemoryHeapPropertiesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_PROPERTIES_QCOM +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_PROPERTIES_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceTileMemoryHeapPropertiesQCOM Type; +}; + +// Map type VkTileMemoryRequirementsQCOM to id VK_STRUCTURE_TYPE_TILE_MEMORY_REQUIREMENTS_QCOM +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_TILE_MEMORY_REQUIREMENTS_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkTileMemoryRequirementsQCOM Type; +}; + +// Map type VkTileMemoryBindInfoQCOM to id VK_STRUCTURE_TYPE_TILE_MEMORY_BIND_INFO_QCOM +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_TILE_MEMORY_BIND_INFO_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkTileMemoryBindInfoQCOM Type; +}; + +// Map type VkTileMemorySizeInfoQCOM to id VK_STRUCTURE_TYPE_TILE_MEMORY_SIZE_INFO_QCOM +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_TILE_MEMORY_SIZE_INFO_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkTileMemorySizeInfoQCOM Type; +}; + // Map type VkDisplaySurfaceStereoCreateInfoNV to id VK_STRUCTURE_TYPE_DISPLAY_SURFACE_STEREO_CREATE_INFO_NV template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_DISPLAY_SURFACE_STEREO_CREATE_INFO_NV; diff --git a/scripts/known_good.json b/scripts/known_good.json index 7b5b36a6..1da74d2d 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.312" + "commit": "v1.4.313" }, { "name": "MoltenVK", @@ -74,7 +74,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "v1.4.312", + "commit": "v1.4.313", "build_platforms": [ "windows", "linux", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 83127bd3..873aca02 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -1451,6 +1451,7 @@ std::vector VkImageUsageFlagBitsGetStrings(VkImageUsageFlagBits va if (VK_IMAGE_USAGE_INVOCATION_MASK_BIT_HUAWEI & value) strings.push_back("IMAGE_USAGE_INVOCATION_MASK_BIT_HUAWEI"); if (VK_IMAGE_USAGE_SAMPLE_WEIGHT_BIT_QCOM & value) strings.push_back("IMAGE_USAGE_SAMPLE_WEIGHT_BIT_QCOM"); if (VK_IMAGE_USAGE_SAMPLE_BLOCK_MATCH_BIT_QCOM & value) strings.push_back("IMAGE_USAGE_SAMPLE_BLOCK_MATCH_BIT_QCOM"); + if (VK_IMAGE_USAGE_TILE_MEMORY_QCOM & value) strings.push_back("IMAGE_USAGE_TILE_MEMORY_QCOM"); if (VK_IMAGE_USAGE_VIDEO_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR & value) strings.push_back("IMAGE_USAGE_VIDEO_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR"); if (VK_IMAGE_USAGE_VIDEO_ENCODE_EMPHASIS_MAP_BIT_KHR & value) strings.push_back("IMAGE_USAGE_VIDEO_ENCODE_EMPHASIS_MAP_BIT_KHR"); return strings; @@ -1519,6 +1520,7 @@ std::vector VkMemoryHeapFlagBitsGetStrings(VkMemoryHeapFlagBits va if (value == 0) { strings.push_back("None"); return strings; } if (VK_MEMORY_HEAP_DEVICE_LOCAL_BIT & value) strings.push_back("MEMORY_HEAP_DEVICE_LOCAL_BIT"); if (VK_MEMORY_HEAP_MULTI_INSTANCE_BIT & value) strings.push_back("MEMORY_HEAP_MULTI_INSTANCE_BIT"); + if (VK_MEMORY_HEAP_TILE_MEMORY_BIT_QCOM & value) strings.push_back("MEMORY_HEAP_TILE_MEMORY_BIT_QCOM"); return strings; } void DumpVkMemoryHeapFlags(Printer &p, std::string name, VkMemoryHeapFlags value) { -- cgit v1.2.3