From 3758a53671b0cb16a74b6780609e58be4741ad9e Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Wed, 23 Mar 2022 10:33:40 -0700 Subject: build: Update to header 1.3.209 - Update known-good - Generate source --- build-android/vulkan-headers_revision_android | 2 +- icd/generated/mock_icd.h | 10 +++--- icd/generated/vk_typemap_helper.h | 44 --------------------------- scripts/generate_vulkan_wrapper.py | 10 +++--- scripts/known_good.json | 4 +-- 5 files changed, 13 insertions(+), 57 deletions(-) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index cdb1b1f5..38317506 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.3.208 +v1.3.209 diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index aab85c90..1959b0a5 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -99,7 +99,7 @@ static const std::unordered_map device_extension_map = { {"VK_AMD_shader_trinary_minmax", 1}, {"VK_AMD_shader_explicit_vertex_parameter", 1}, {"VK_EXT_debug_marker", 4}, - {"VK_KHR_video_queue", 2}, + {"VK_KHR_video_queue", 3}, {"VK_KHR_video_decode_queue", 3}, {"VK_AMD_gcn_shader", 1}, {"VK_NV_dedicated_allocation", 1}, @@ -110,9 +110,9 @@ 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", 5}, - {"VK_EXT_video_encode_h265", 5}, - {"VK_EXT_video_decode_h264", 3}, + {"VK_EXT_video_encode_h264", 6}, + {"VK_EXT_video_encode_h265", 6}, + {"VK_EXT_video_decode_h264", 4}, {"VK_AMD_texture_gather_bias_lod", 1}, {"VK_AMD_shader_info", 1}, {"VK_KHR_dynamic_rendering", 1}, @@ -210,7 +210,7 @@ static const std::unordered_map device_extension_map = { {"VK_AMD_pipeline_compiler_control", 1}, {"VK_EXT_calibrated_timestamps", 2}, {"VK_AMD_shader_core_properties", 2}, - {"VK_EXT_video_decode_h265", 1}, + {"VK_EXT_video_decode_h265", 2}, {"VK_KHR_global_priority", 1}, {"VK_AMD_memory_overallocation_behavior", 1}, {"VK_EXT_vertex_attribute_divisor", 3}, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 22da8d19..ab4495b8 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -3157,17 +3157,6 @@ template <> struct LvlSTypeMap struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_CREATE_INFO_EXT; -}; - -template <> struct LvlSTypeMap { - typedef VkVideoEncodeH264SessionCreateInfoEXT Type; -}; - #endif // VK_ENABLE_BETA_EXTENSIONS #ifdef VK_ENABLE_BETA_EXTENSIONS // Map type VkVideoEncodeH264SessionParametersAddInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT @@ -3289,17 +3278,6 @@ template <> struct LvlSTypeMap struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_CREATE_INFO_EXT; -}; - -template <> struct LvlSTypeMap { - typedef VkVideoEncodeH265SessionCreateInfoEXT Type; -}; - #endif // VK_ENABLE_BETA_EXTENSIONS #ifdef VK_ENABLE_BETA_EXTENSIONS // Map type VkVideoEncodeH265SessionParametersAddInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT @@ -3432,17 +3410,6 @@ template <> struct LvlSTypeMap struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_CREATE_INFO_EXT; -}; - -template <> struct LvlSTypeMap { - typedef VkVideoDecodeH264SessionCreateInfoEXT Type; -}; - #endif // VK_ENABLE_BETA_EXTENSIONS #ifdef VK_ENABLE_BETA_EXTENSIONS // Map type VkVideoDecodeH264SessionParametersAddInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT @@ -4358,17 +4325,6 @@ template <> struct LvlSTypeMap struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_CREATE_INFO_EXT; -}; - -template <> struct LvlSTypeMap { - typedef VkVideoDecodeH265SessionCreateInfoEXT Type; -}; - #endif // VK_ENABLE_BETA_EXTENSIONS #ifdef VK_ENABLE_BETA_EXTENSIONS // Map type VkVideoDecodeH265SessionParametersAddInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index 5a31bce8..07012fb3 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -1437,7 +1437,7 @@ VK_QNX_screen_surface = Extension(name='VK_QNX_screen_surface', version=1, guard Command(name='vkGetPhysicalDeviceScreenPresentationSupportQNX', dispatch='VkPhysicalDevice'), ]) -VK_KHR_video_queue = Extension(name='VK_KHR_video_queue', version=2, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ +VK_KHR_video_queue = Extension(name='VK_KHR_video_queue', version=3, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ Command(name='vkGetPhysicalDeviceVideoCapabilitiesKHR', dispatch='VkPhysicalDevice'), Command(name='vkGetPhysicalDeviceVideoFormatPropertiesKHR', dispatch='VkPhysicalDevice'), Command(name='vkCreateVideoSessionKHR', dispatch='VkDevice'), @@ -1463,16 +1463,16 @@ 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=5, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ +VK_EXT_video_encode_h264 = Extension(name='VK_EXT_video_encode_h264', version=6, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ ]) -VK_EXT_video_encode_h265 = Extension(name='VK_EXT_video_encode_h265', version=5, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ +VK_EXT_video_encode_h265 = Extension(name='VK_EXT_video_encode_h265', version=6, 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=[ +VK_EXT_video_decode_h264 = Extension(name='VK_EXT_video_decode_h264', version=4, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ ]) -VK_EXT_video_decode_h265 = Extension(name='VK_EXT_video_decode_h265', version=1, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ +VK_EXT_video_decode_h265 = Extension(name='VK_EXT_video_decode_h265', version=2, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ ]) extensions = [ diff --git a/scripts/known_good.json b/scripts/known_good.json index f8f4f9c1..b8595219 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.3.208" + "commit" : "v1.3.209" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.3.208", + "commit" : "v1.3.209", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", -- cgit v1.2.3