From 6f61a9c4e8b0b25c4215b5acdd0d08c5b05d8f00 Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Mon, 7 Feb 2022 10:28:53 -0800 Subject: build: Update to header 1.3.205 - Update known-good - Generate source --- build-android/vulkan-headers_revision_android | 2 +- icd/generated/mock_icd.h | 2 +- icd/generated/vk_typemap_helper.h | 10 +++++----- scripts/generate_vulkan_wrapper.py | 2 +- scripts/known_good.json | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 390621e6..d8b937c2 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.3.204 +v1.3.205 diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index 34029702..29bd8656 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -110,7 +110,7 @@ static const std::unordered_map device_extension_map = { {"VK_AMD_gpu_shader_half_float", 2}, {"VK_AMD_shader_ballot", 1}, {"VK_EXT_video_encode_h264", 3}, - {"VK_EXT_video_encode_h265", 3}, + {"VK_EXT_video_encode_h265", 4}, {"VK_EXT_video_decode_h264", 3}, {"VK_AMD_texture_gather_bias_lod", 1}, {"VK_AMD_shader_info", 1}, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 6d7601c9..77747eaa 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -3313,13 +3313,13 @@ template <> struct LvlSTypeMap struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_EXT; +// Map type VkVideoEncodeH265NaluSliceSegmentEXT to id VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_SEGMENT_EXT +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_SEGMENT_EXT; }; -template <> struct LvlSTypeMap { - typedef VkVideoEncodeH265NaluSliceEXT Type; +template <> struct LvlSTypeMap { + typedef VkVideoEncodeH265NaluSliceSegmentEXT Type; }; #endif // VK_ENABLE_BETA_EXTENSIONS diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index 01f53f65..85fc6390 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -1458,7 +1458,7 @@ VK_KHR_video_encode_queue = Extension(name='VK_KHR_video_encode_queue', version= 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=3, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ +VK_EXT_video_encode_h265 = Extension(name='VK_EXT_video_encode_h265', version=4, 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=[ diff --git a/scripts/known_good.json b/scripts/known_good.json index 950e2ed3..4783707c 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.204" + "commit" : "v1.3.205" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "sdk-1.3.204", + "commit" : "v1.3.205", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", -- cgit v1.2.3