From d15ff77bda1ef895ea5cf23d19472b7442e878cb Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Tue, 4 Jan 2022 10:12:40 -0800 Subject: [PATCH] build: Update to header 1.2.203 - Update known-good - Generate source --- build-android/vulkan-headers_revision_android | 2 +- icd/generated/mock_icd.cpp | 3 ++ icd/generated/mock_icd.h | 10 ++++-- icd/generated/vk_typemap_helper.h | 47 +++++++++++++++++++++++++++ scripts/generate_vulkan_wrapper.py | 16 +++++++-- scripts/known_good.json | 4 +-- vulkaninfo/generated/vulkaninfo.hpp | 1 + 7 files changed, 76 insertions(+), 7 deletions(-) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 2893b03..434ce3e 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.2.201 +d99496fcb1f4aecbeb25c1e70eda0cdee7e1eba5 diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index f968e4d..1068b8e 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -5350,6 +5350,9 @@ static VKAPI_ATTR void VKAPI_CALL SetDeviceMemoryPriorityEXT( } + + + static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index 5bed2a9..abea0ae 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -84,6 +84,7 @@ static const std::unordered_map instance_extension_map = {"VK_EXT_acquire_drm_display", 1}, {"VK_EXT_directfb_surface", 1}, {"VK_QNX_screen_surface", 1}, + {"VK_GOOGLE_surfaceless_query", 1}, }; // Map of device extension name to version static const std::unordered_map device_extension_map = { @@ -108,8 +109,8 @@ static const std::unordered_map device_extension_map = { {"VK_AMD_negative_viewport_height", 1}, {"VK_AMD_gpu_shader_half_float", 2}, {"VK_AMD_shader_ballot", 1}, - {"VK_EXT_video_encode_h264", 2}, - {"VK_EXT_video_encode_h265", 2}, + {"VK_EXT_video_encode_h264", 3}, + {"VK_EXT_video_encode_h265", 3}, {"VK_EXT_video_decode_h264", 3}, {"VK_AMD_texture_gather_bias_lod", 1}, {"VK_AMD_shader_info", 1}, @@ -319,6 +320,8 @@ static const std::unordered_map device_extension_map = { {"VK_EXT_border_color_swizzle", 1}, {"VK_EXT_pageable_device_local_memory", 1}, {"VK_KHR_maintenance4", 2}, + {"VK_QCOM_fragment_density_map_offset", 1}, + {"VK_NV_linear_color_attachment", 1}, }; @@ -3318,6 +3321,9 @@ static VKAPI_ATTR void VKAPI_CALL SetDeviceMemoryPriorityEXT( float priority); + + + static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 6ec7429..d5c8311 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -1652,6 +1652,17 @@ template <> struct LvlSTypeMap #endif // VK_USE_PLATFORM_WIN32_KHR #ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkQueueFamilyQueryResultStatusProperties2KHR to id VK_STRUCTURE_TYPE_QUEUE_FAMILY_QUERY_RESULT_STATUS_PROPERTIES_2_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_QUERY_RESULT_STATUS_PROPERTIES_2_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkQueueFamilyQueryResultStatusProperties2KHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS // Map type VkVideoQueueFamilyProperties2KHR to id VK_STRUCTURE_TYPE_VIDEO_QUEUE_FAMILY_PROPERTIES_2_KHR template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_QUEUE_FAMILY_PROPERTIES_2_KHR; @@ -5649,6 +5660,42 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM Type; +}; + +// Map type VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM Type; +}; + +// Map type VkSubpassFragmentDensityMapOffsetEndInfoQCOM to id VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkSubpassFragmentDensityMapOffsetEndInfoQCOM Type; +}; + +// Map type VkPhysicalDeviceLinearColorAttachmentFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceLinearColorAttachmentFeaturesNV Type; +}; + // Map type VkAccelerationStructureGeometryTrianglesDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR; diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index c656ab8..028f592 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -1225,6 +1225,15 @@ VK_EXT_pageable_device_local_memory = Extension(name='VK_EXT_pageable_device_loc Command(name='vkSetDeviceMemoryPriorityEXT', dispatch='VkDevice'), ]) +VK_QCOM_fragment_density_map_offset = Extension(name='VK_QCOM_fragment_density_map_offset', version=1, guard=None, commands=[ +]) + +VK_NV_linear_color_attachment = Extension(name='VK_NV_linear_color_attachment', version=1, guard=None, commands=[ +]) + +VK_GOOGLE_surfaceless_query = Extension(name='VK_GOOGLE_surfaceless_query', version=1, guard=None, commands=[ +]) + VK_KHR_acceleration_structure = Extension(name='VK_KHR_acceleration_structure', version=13, guard=None, commands=[ Command(name='vkCreateAccelerationStructureKHR', dispatch='VkDevice'), Command(name='vkDestroyAccelerationStructureKHR', dispatch='VkDevice'), @@ -1403,10 +1412,10 @@ VK_KHR_video_encode_queue = Extension(name='VK_KHR_video_encode_queue', version= Command(name='vkCmdEncodeVideoKHR', dispatch='VkCommandBuffer'), ]) -VK_EXT_video_encode_h264 = Extension(name='VK_EXT_video_encode_h264', version=2, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ +VK_EXT_video_encode_h264 = Extension(name='VK_EXT_video_encode_h264', version=3, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ ]) -VK_EXT_video_encode_h265 = Extension(name='VK_EXT_video_encode_h265', version=2, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ +VK_EXT_video_encode_h265 = Extension(name='VK_EXT_video_encode_h265', version=3, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ ]) VK_EXT_video_decode_h264 = Extension(name='VK_EXT_video_decode_h264', version=3, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ @@ -1650,6 +1659,9 @@ extensions = [ VK_EXT_load_store_op_none, VK_EXT_border_color_swizzle, VK_EXT_pageable_device_local_memory, + VK_QCOM_fragment_density_map_offset, + VK_NV_linear_color_attachment, + VK_GOOGLE_surfaceless_query, VK_KHR_acceleration_structure, VK_KHR_ray_tracing_pipeline, VK_KHR_ray_query, diff --git a/scripts/known_good.json b/scripts/known_good.json index e79f88c..325afd0 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -6,7 +6,7 @@ "sub_dir" : "Vulkan-Headers", "build_dir" : "Vulkan-Headers/build", "install_dir" : "Vulkan-Headers/build/install", - "commit" : "v1.2.201" + "commit" : "d99496fcb1f4aecbeb25c1e70eda0cdee7e1eba5" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.2.201", + "commit" : "v1.2.203", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index a0b9dc0..82a2a18 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -646,6 +646,7 @@ std::vectorVkFormatFeatureFlagBits2KHRGetStrings(VkFormatFeatureFl if (0x40000000 & value) strings.push_back("FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR"); if (0x8000000 & value) strings.push_back("FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR"); if (0x10000000 & value) strings.push_back("FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR"); + if (0x4000000000 & value) strings.push_back("FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV"); return strings; } void DumpVkFormatFeatureFlags2KHR(Printer &p, std::string name, VkFormatFeatureFlags2KHR value, int width = 0) { -- 2.7.4