blob: 8e3ab633784cb909882bda6216dfa4d57ac8a9bd (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
Revert https://github.com/yuzu-emu/yuzu/pull/12414 until 2024Q1 branches
--- CMakeLists.txt.orig 2023-12-20 17:46:50 UTC
+++ CMakeLists.txt
@@ -305,7 +305,7 @@ if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
find_package(zstd 1.5 REQUIRED)
if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
- find_package(Vulkan 1.3.274 REQUIRED)
+ find_package(Vulkan 1.3.256 REQUIRED)
endif()
if (ENABLE_LIBUSB)
--- src/video_core/vulkan_common/vulkan_wrapper.cpp.orig 2023-12-20 17:46:50 UTC
+++ src/video_core/vulkan_common/vulkan_wrapper.cpp
@@ -377,8 +377,10 @@ const char* ToString(VkResult result) noexcept {
return "VK_OPERATION_DEFERRED_KHR";
case VkResult::VK_OPERATION_NOT_DEFERRED_KHR:
return "VK_OPERATION_NOT_DEFERRED_KHR";
+#ifdef VK_KHR_VIDEO_ENCODE_QUEUE_SPEC_VERSION
case VkResult::VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR:
return "VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR";
+#endif
case VkResult::VK_PIPELINE_COMPILE_REQUIRED_EXT:
return "VK_PIPELINE_COMPILE_REQUIRED_EXT";
case VkResult::VK_RESULT_MAX_ENUM:
|
