Просмотр исходного кода

Merge pull request #12414 from jbeich/vk274

externals: update Vulkan-Headers to v1.3.274
liamwhite 2 лет назад
Родитель
Сommit
bedc758fe7
3 измененных файлов с 4 добавлено и 2 удалено
  1. 1 1
      CMakeLists.txt
  2. 1 1
      externals/Vulkan-Headers
  3. 2 0
      src/video_core/vulkan_common/vulkan_wrapper.cpp

+ 1 - 1
CMakeLists.txt

@@ -305,7 +305,7 @@ find_package(ZLIB 1.2 REQUIRED)
 find_package(zstd 1.5 REQUIRED)
 find_package(zstd 1.5 REQUIRED)
 
 
 if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
 if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
-    find_package(Vulkan 1.3.256 REQUIRED)
+    find_package(Vulkan 1.3.274 REQUIRED)
 endif()
 endif()
 
 
 if (ENABLE_LIBUSB)
 if (ENABLE_LIBUSB)

+ 1 - 1
externals/Vulkan-Headers

@@ -1 +1 @@
-Subproject commit df60f0316899460eeaaefa06d2dd7e4e300c1604
+Subproject commit 80207f9da86423ce33aff8328a792fd715f3c08f

+ 2 - 0
src/video_core/vulkan_common/vulkan_wrapper.cpp

@@ -377,6 +377,8 @@ const char* ToString(VkResult result) noexcept {
         return "VK_OPERATION_DEFERRED_KHR";
         return "VK_OPERATION_DEFERRED_KHR";
     case VkResult::VK_OPERATION_NOT_DEFERRED_KHR:
     case VkResult::VK_OPERATION_NOT_DEFERRED_KHR:
         return "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:
     case VkResult::VK_PIPELINE_COMPILE_REQUIRED_EXT:
         return "VK_PIPELINE_COMPILE_REQUIRED_EXT";
         return "VK_PIPELINE_COMPILE_REQUIRED_EXT";
     case VkResult::VK_RESULT_MAX_ENUM:
     case VkResult::VK_RESULT_MAX_ENUM: