diff options
| author | 2023-12-20 12:46:50 -0500 | |
|---|---|---|
| committer | 2023-12-20 12:46:50 -0500 | |
| commit | bedc758fe760db8958e31d4efb5f3a2950553d71 (patch) | |
| tree | 22160d9c98abda80359397607427b4a3c549ab79 | |
| parent | Merge pull request #12400 from ameerj/vk-query-prefix-fix (diff) | |
| parent | externals: update Vulkan-Headers to v1.3.274 (diff) | |
| download | yuzu-bedc758fe760db8958e31d4efb5f3a2950553d71.tar.gz yuzu-bedc758fe760db8958e31d4efb5f3a2950553d71.tar.xz yuzu-bedc758fe760db8958e31d4efb5f3a2950553d71.zip | |
Merge pull request #12414 from jbeich/vk274
externals: update Vulkan-Headers to v1.3.274
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| m--------- | externals/Vulkan-Headers | 0 | ||||
| -rw-r--r-- | src/video_core/vulkan_common/vulkan_wrapper.cpp | 2 |
3 files changed, 3 insertions, 1 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) | |||
| 305 | find_package(zstd 1.5 REQUIRED) | 305 | find_package(zstd 1.5 REQUIRED) |
| 306 | 306 | ||
| 307 | if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) | 307 | if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) |
| 308 | find_package(Vulkan 1.3.256 REQUIRED) | 308 | find_package(Vulkan 1.3.274 REQUIRED) |
| 309 | endif() | 309 | endif() |
| 310 | 310 | ||
| 311 | if (ENABLE_LIBUSB) | 311 | if (ENABLE_LIBUSB) |
diff --git a/externals/Vulkan-Headers b/externals/Vulkan-Headers | |||
| Subproject df60f0316899460eeaaefa06d2dd7e4e300c160 | Subproject 80207f9da86423ce33aff8328a792fd715f3c08 | ||
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 { | |||
| 377 | return "VK_OPERATION_DEFERRED_KHR"; | 377 | return "VK_OPERATION_DEFERRED_KHR"; |
| 378 | case VkResult::VK_OPERATION_NOT_DEFERRED_KHR: | 378 | case VkResult::VK_OPERATION_NOT_DEFERRED_KHR: |
| 379 | return "VK_OPERATION_NOT_DEFERRED_KHR"; | 379 | return "VK_OPERATION_NOT_DEFERRED_KHR"; |
| 380 | case VkResult::VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR: | ||
| 381 | return "VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR"; | ||
| 380 | case VkResult::VK_PIPELINE_COMPILE_REQUIRED_EXT: | 382 | case VkResult::VK_PIPELINE_COMPILE_REQUIRED_EXT: |
| 381 | return "VK_PIPELINE_COMPILE_REQUIRED_EXT"; | 383 | return "VK_PIPELINE_COMPILE_REQUIRED_EXT"; |
| 382 | case VkResult::VK_RESULT_MAX_ENUM: | 384 | case VkResult::VK_RESULT_MAX_ENUM: |