diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-04-19 02:31:15 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-04-19 02:31:15 +0200 |
commit | c81bf06d0358b8d49d9bc22fa12b0ee715ff6d3c (patch) | |
tree | cbceaa732b2b80e5ba6be0c7cfb60f05b84f9bdf /src/video_core/renderer_vulkan/wrapper.cpp | |
parent | Merge pull request #3716 from bunnei/fix-another-impl-fallthrough (diff) | |
download | yuzu-c81bf06d0358b8d49d9bc22fa12b0ee715ff6d3c.tar yuzu-c81bf06d0358b8d49d9bc22fa12b0ee715ff6d3c.tar.gz yuzu-c81bf06d0358b8d49d9bc22fa12b0ee715ff6d3c.tar.bz2 yuzu-c81bf06d0358b8d49d9bc22fa12b0ee715ff6d3c.tar.lz yuzu-c81bf06d0358b8d49d9bc22fa12b0ee715ff6d3c.tar.xz yuzu-c81bf06d0358b8d49d9bc22fa12b0ee715ff6d3c.tar.zst yuzu-c81bf06d0358b8d49d9bc22fa12b0ee715ff6d3c.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_vulkan/wrapper.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/video_core/renderer_vulkan/wrapper.cpp b/src/video_core/renderer_vulkan/wrapper.cpp index 9b94dfff1..cffa243e9 100644 --- a/src/video_core/renderer_vulkan/wrapper.cpp +++ b/src/video_core/renderer_vulkan/wrapper.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <algorithm> #include <exception> #include <memory> #include <optional> @@ -16,6 +17,23 @@ namespace Vulkan::vk { namespace { +void SortPhysicalDevices(std::vector<VkPhysicalDevice>& devices, const InstanceDispatch& dld) { + std::stable_sort(devices.begin(), devices.end(), [&](auto lhs, auto rhs) { + // This will call Vulkan more than needed, but these calls are cheap. + const auto lhs_properties = vk::PhysicalDevice(lhs, dld).GetProperties(); + const auto rhs_properties = vk::PhysicalDevice(rhs, dld).GetProperties(); + + // Prefer discrete GPUs, Nvidia over AMD, AMD over Intel, Intel over the rest. + const bool preferred = + (lhs_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU && + rhs_properties.deviceType != VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU) || + (lhs_properties.vendorID == 0x10DE && rhs_properties.vendorID != 0x10DE) || + (lhs_properties.vendorID == 0x1002 && rhs_properties.vendorID != 0x1002) || + (lhs_properties.vendorID == 0x8086 && rhs_properties.vendorID != 0x8086); + return !preferred; + }); +} + template <typename T> bool Proc(T& result, const InstanceDispatch& dld, const char* proc_name, VkInstance instance = nullptr) noexcept { @@ -383,7 +401,8 @@ std::optional<std::vector<VkPhysicalDevice>> Instance::EnumeratePhysicalDevices( if (dld->vkEnumeratePhysicalDevices(handle, &num, physical_devices.data()) != VK_SUCCESS) { return std::nullopt; } - return physical_devices; + SortPhysicalDevices(physical_devices, *dld); + return std::make_optional(std::move(physical_devices)); } DebugCallback Instance::TryCreateDebugCallback( |