ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Fix crash when opening settings window -> resizing

This commit is contained in:
Connor McLaughlin 2020-06-22 15:58:00 +10:00
parent 1455e793d5
commit f846817848
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/frontend-common/vulkan_host_display.cpp
View File

@ -496,6 +496,9 @@ void VulkanHostDisplay::RenderSoftwareCursor(s32 left, s32 top, s32 width, s32 h
std::vector<std::string> VulkanHostDisplay::EnumerateAdapterNames() std::vector<std::string> VulkanHostDisplay::EnumerateAdapterNames()
{ {
if (g_vulkan_context)
return Vulkan::Context::EnumerateGPUNames(g_vulkan_context->GetVulkanInstance());
if (Vulkan::LoadVulkanLibrary()) if (Vulkan::LoadVulkanLibrary())
{ {
Common::ScopeGuard lib_guard([]() { Vulkan::UnloadVulkanLibrary(); }); Common::ScopeGuard lib_guard([]() { Vulkan::UnloadVulkanLibrary(); });
@ -506,15 +509,11 @@ std::vector<std::string> VulkanHostDisplay::EnumerateAdapterNames()
Common::ScopeGuard instance_guard([&instance]() { vkDestroyInstance(instance, nullptr); }); Common::ScopeGuard instance_guard([&instance]() { vkDestroyInstance(instance, nullptr); });
if (Vulkan::LoadVulkanInstanceFunctions(instance)) if (Vulkan::LoadVulkanInstanceFunctions(instance))
{ return Vulkan::Context::EnumerateGPUNames(instance);
Vulkan::Context::GPUNameList gpus = Vulkan::Context::EnumerateGPUNames(instance);
if (!gpus.empty())
return gpus;
}
} }
} }
return {"(Default)"}; return {};
} }
} // namespace FrontendCommon } // namespace FrontendCommon