ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Context/Vulkan: Handle VK_INCOMPLETE return from vkEnumeratePhysicalDevices()

This commit is contained in:
Stenzek 2023-02-25 23:25:04 +10:00 committed by refractionpcsx2
parent 9a3904103a
commit b484f7aef0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/Vulkan/Context.cpp
View File

@ -197,9 +197,9 @@ namespace Vulkan
{ {
u32 gpu_count = 0; u32 gpu_count = 0;
VkResult res = vkEnumeratePhysicalDevices(instance, &gpu_count, nullptr); VkResult res = vkEnumeratePhysicalDevices(instance, &gpu_count, nullptr);
if (res != VK_SUCCESS || gpu_count == 0) if ((res != VK_SUCCESS && res != VK_INCOMPLETE) || gpu_count == 0)
{ {
LOG_VULKAN_ERROR(res, "vkEnumeratePhysicalDevices failed: "); LOG_VULKAN_ERROR(res, "vkEnumeratePhysicalDevices (1) failed: ");
return {}; return {};
} }
@ -207,12 +207,20 @@ namespace Vulkan
gpus.resize(gpu_count); gpus.resize(gpu_count);
res = vkEnumeratePhysicalDevices(instance, &gpu_count, gpus.data()); res = vkEnumeratePhysicalDevices(instance, &gpu_count, gpus.data());
if (res != VK_SUCCESS) if (res == VK_INCOMPLETE)
{ {
LOG_VULKAN_ERROR(res, "vkEnumeratePhysicalDevices failed: "); Console.Warning("First vkEnumeratePhysicalDevices() call returned %zu devices, but second returned %u", gpus.size(), gpu_count);
}
else if (res != VK_SUCCESS)
{
LOG_VULKAN_ERROR(res, "vkEnumeratePhysicalDevices (2) failed: ");
return {}; return {};
} }
// Maybe we lost a GPU?
if (gpu_count < gpus.size())
gpus.resize(gpu_count);
return gpus; return gpus;
} }