summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar liamwhite2023-04-01 09:44:52 -0400
committerGravatar GitHub2023-04-01 09:44:52 -0400
commit986336b0d832221de420d5b3b8e78ea7508581fc (patch)
tree52da5617b414cc6d3a672be57feeb1dd81225d1b
parentMerge pull request #10005 from liamwhite/kernel-atomics (diff)
parentexternals: update Vulkan-Headers to v1.3.246 (diff)
downloadyuzu-986336b0d832221de420d5b3b8e78ea7508581fc.tar.gz
yuzu-986336b0d832221de420d5b3b8e78ea7508581fc.tar.xz
yuzu-986336b0d832221de420d5b3b8e78ea7508581fc.zip
Merge pull request #10017 from jbeich/vk-246
externals: update Vulkan-Headers to v1.3.246 to fix -Werror=switch with system package
-rw-r--r--CMakeLists.txt2
m---------externals/Vulkan-Headers0
-rw-r--r--src/video_core/vulkan_common/vulkan_wrapper.cpp2
3 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6c43f401..561eaafb2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,7 +222,7 @@ find_package(ZLIB 1.2 REQUIRED)
222find_package(zstd 1.5 REQUIRED) 222find_package(zstd 1.5 REQUIRED)
223 223
224if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) 224if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
225 find_package(Vulkan 1.3.238 REQUIRED) 225 find_package(Vulkan 1.3.246 REQUIRED)
226endif() 226endif()
227 227
228if (ENABLE_LIBUSB) 228if (ENABLE_LIBUSB)
diff --git a/externals/Vulkan-Headers b/externals/Vulkan-Headers
Subproject 00671c64ba5c488ade22ad572a0ef81d5e64c80 Subproject 63af1cf1ee906ba4dcd5a324bdd0201d4f4bfd1
diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp
index 486d4dfaf..336f53700 100644
--- a/src/video_core/vulkan_common/vulkan_wrapper.cpp
+++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp
@@ -375,6 +375,8 @@ const char* ToString(VkResult result) noexcept {
375 return "VK_RESULT_MAX_ENUM"; 375 return "VK_RESULT_MAX_ENUM";
376 case VkResult::VK_ERROR_COMPRESSION_EXHAUSTED_EXT: 376 case VkResult::VK_ERROR_COMPRESSION_EXHAUSTED_EXT:
377 return "VK_ERROR_COMPRESSION_EXHAUSTED_EXT"; 377 return "VK_ERROR_COMPRESSION_EXHAUSTED_EXT";
378 case VkResult::VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT:
379 return "VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT";
378 } 380 }
379 return "Unknown"; 381 return "Unknown";
380} 382}