From 310834aea2fa3293ec30bad9f5f37ac7b5681b26 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 20 Dec 2023 01:07:26 +0100 Subject: [PATCH 1/2] vulkan_common: unbreak build with Vulkan-Headers 1.3.274 src/video_core/vulkan_common/vulkan_wrapper.cpp:293:13: error: enumeration value 'VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR' not handled in switch [-Werror,-Wswitch] switch (result) { ^~~~~~ --- src/video_core/vulkan_common/vulkan_wrapper.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp index 70cf14afa..2f78b8af0 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.cpp +++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp @@ -377,6 +377,8 @@ const char* ToString(VkResult result) noexcept { return "VK_OPERATION_DEFERRED_KHR"; case VkResult::VK_OPERATION_NOT_DEFERRED_KHR: return "VK_OPERATION_NOT_DEFERRED_KHR"; + case VkResult::VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR: + return "VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR"; case VkResult::VK_PIPELINE_COMPILE_REQUIRED_EXT: return "VK_PIPELINE_COMPILE_REQUIRED_EXT"; case VkResult::VK_RESULT_MAX_ENUM: From ecfba79d987b68a2ec1a4cc524e9303e48f398cb Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 20 Dec 2023 01:08:18 +0100 Subject: [PATCH 2/2] externals: update Vulkan-Headers to v1.3.274 --- CMakeLists.txt | 2 +- externals/Vulkan-Headers | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dfc06ac3..7cd6b2108 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -305,7 +305,7 @@ find_package(ZLIB 1.2 REQUIRED) find_package(zstd 1.5 REQUIRED) if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) - find_package(Vulkan 1.3.256 REQUIRED) + find_package(Vulkan 1.3.274 REQUIRED) endif() if (ENABLE_LIBUSB) diff --git a/externals/Vulkan-Headers b/externals/Vulkan-Headers index df60f0316..80207f9da 160000 --- a/externals/Vulkan-Headers +++ b/externals/Vulkan-Headers @@ -1 +1 @@ -Subproject commit df60f0316899460eeaaefa06d2dd7e4e300c1604 +Subproject commit 80207f9da86423ce33aff8328a792fd715f3c08f