From facac95131acfa1594c6eae82916e24641d93358 Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Thu, 22 Sep 2022 11:00:42 -0700 Subject: build: Update to header 1.3.229 - Update known-good - Generate source --- build-android/vulkan-headers_revision_android | 2 +- icd/generated/mock_icd.cpp | 2 +- icd/generated/mock_icd.h | 12 ++++++------ icd/generated/vk_typemap_helper.h | 11 ----------- scripts/generate_vulkan_wrapper.py | 10 +++++----- scripts/known_good.json | 4 ++-- 6 files changed, 15 insertions(+), 26 deletions(-) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 3a5935d3..cf4cb619 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.3.228 +v1.3.229 diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index 0665895c..a8dcf251 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -2906,7 +2906,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdControlVideoCodingKHR( static VKAPI_ATTR void VKAPI_CALL CmdDecodeVideoKHR( VkCommandBuffer commandBuffer, - const VkVideoDecodeInfoKHR* pFrameInfo) + const VkVideoDecodeInfoKHR* pDecodeInfo) { //Not a CREATE or DESTROY function } diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index ee082689..acc780d0 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", 5}, + {"VK_KHR_video_queue", 6}, {"VK_KHR_video_decode_queue", 6}, {"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", 8}, - {"VK_EXT_video_encode_h265", 8}, - {"VK_EXT_video_decode_h264", 6}, + {"VK_EXT_video_encode_h264", 9}, + {"VK_EXT_video_encode_h265", 9}, + {"VK_EXT_video_decode_h264", 7}, {"VK_AMD_texture_gather_bias_lod", 1}, {"VK_AMD_shader_info", 1}, {"VK_KHR_dynamic_rendering", 1}, @@ -211,7 +211,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", 4}, + {"VK_EXT_video_decode_h265", 5}, {"VK_KHR_global_priority", 1}, {"VK_AMD_memory_overallocation_behavior", 1}, {"VK_EXT_vertex_attribute_divisor", 3}, @@ -1812,7 +1812,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdControlVideoCodingKHR( static VKAPI_ATTR void VKAPI_CALL CmdDecodeVideoKHR( VkCommandBuffer commandBuffer, - const VkVideoDecodeInfoKHR* pFrameInfo); + const VkVideoDecodeInfoKHR* pDecodeInfo); #endif /* VK_ENABLE_BETA_EXTENSIONS */ diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index e849c0f4..0ebe4491 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -3492,17 +3492,6 @@ template <> struct LvlSTypeMap struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_MVC_INFO_EXT; -}; - -template <> struct LvlSTypeMap { - typedef VkVideoDecodeH264MvcInfoEXT Type; -}; - #endif // VK_ENABLE_BETA_EXTENSIONS #ifdef VK_ENABLE_BETA_EXTENSIONS // Map type VkVideoDecodeH264DpbSlotInfoEXT to id VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_EXT diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index 87e80561..ad3f9240 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -1520,7 +1520,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=5, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ +VK_KHR_video_queue = Extension(name='VK_KHR_video_queue', version=6, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ Command(name='vkGetPhysicalDeviceVideoCapabilitiesKHR', dispatch='VkPhysicalDevice'), Command(name='vkGetPhysicalDeviceVideoFormatPropertiesKHR', dispatch='VkPhysicalDevice'), Command(name='vkCreateVideoSessionKHR', dispatch='VkDevice'), @@ -1546,16 +1546,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=8, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ +VK_EXT_video_encode_h264 = Extension(name='VK_EXT_video_encode_h264', version=9, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ ]) -VK_EXT_video_encode_h265 = Extension(name='VK_EXT_video_encode_h265', version=8, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ +VK_EXT_video_encode_h265 = Extension(name='VK_EXT_video_encode_h265', version=9, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ ]) -VK_EXT_video_decode_h264 = Extension(name='VK_EXT_video_decode_h264', version=6, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ +VK_EXT_video_decode_h264 = Extension(name='VK_EXT_video_decode_h264', version=7, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ ]) -VK_EXT_video_decode_h265 = Extension(name='VK_EXT_video_decode_h265', version=4, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ +VK_EXT_video_decode_h265 = Extension(name='VK_EXT_video_decode_h265', version=5, guard='VK_ENABLE_BETA_EXTENSIONS', commands=[ ]) extensions = [ diff --git a/scripts/known_good.json b/scripts/known_good.json index 87abaa22..a25a203c 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.228" + "commit" : "v1.3.229" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.3.228", + "commit" : "v1.3.229", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", -- cgit v1.2.3