Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-10-23 07:35:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Vulkan: Handle potential duplicate GPU/adapter names

Browse source
This commit is contained in:
Connor McLaughlin 2020-06-20 03:33:52 +10:00
parent 7fce9b102e
commit 4a04800132
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/common/vulkan/context.cpp
View file

@ -6,6 +6,7 @@
#include "context.h" #include "context.h"
#include "../assert.h" #include "../assert.h"
#include "../log.h" #include "../log.h"
#include "../string_util.h"
#include "../window_info.h" #include "../window_info.h"
#include "swap_chain.h" #include "swap_chain.h"
#include "util.h" #include "util.h"
@ -246,7 +247,25 @@ Context::GPUNameList Context::EnumerateGPUNames(VkInstance instance)
{ {
VkPhysicalDeviceProperties props = {}; VkPhysicalDeviceProperties props = {};
vkGetPhysicalDeviceProperties(gpus[i], &props); vkGetPhysicalDeviceProperties(gpus[i], &props);
gpu_names.emplace_back(props.deviceName);
std::string gpu_name(props.deviceName);
// handle duplicate adapter names
if (std::any_of(gpu_names.begin(), gpu_names.end(),
[&gpu_name](const std::string& other) { return (gpu_name == other); }))
{
std::string original_adapter_name = std::move(gpu_name);
u32 current_extra = 2;
do
{
gpu_name = StringUtil::StdStringFromFormat("%s (%u)", original_adapter_name.c_str(), current_extra);
current_extra++;
} while (std::any_of(gpu_names.begin(), gpu_names.end(),
[&gpu_name](const std::string& other) { return (gpu_name == other); }));
}
gpu_names.push_back(std::move(gpu_name));
} }
return gpu_names; return gpu_names;