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

vulkan: reset physical device at init 

don't use PhysicalDeviceProperties2KHR with vulkan 1.0
tentative fix for issue #30
This commit is contained in:
Flyinghead 2020-01-06 21:33:31 +01:00
parent 73d34a9ab5
commit 43d924ceae
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/rend/vulkan/vulkan_context.cpp
View File

@ -144,15 +144,6 @@ bool VulkanContext::InitInstance(const char** extensions, uint32_t extensions_co
for (int i = 0; i < extensions_count; i++) for (int i = 0; i < extensions_count; i++)
vext.push_back(extensions[i]); vext.push_back(extensions[i]);
bool getProperties2KHRSupported = false;
for (const auto& property : vk::enumerateInstanceExtensionProperties())
if (!strcmp(property.extensionName, "VK_KHR_get_physical_device_properties2"))
{
getProperties2KHRSupported = true;
vext.push_back("VK_KHR_get_physical_device_properties2");
break;
}
std::vector<const char *> layer_names; std::vector<const char *> layer_names;
//layer_names.push_back("VK_LAYER_ARM_AGA"); //layer_names.push_back("VK_LAYER_ARM_AGA");
#ifdef VK_DEBUG #ifdef VK_DEBUG
@ -191,6 +182,7 @@ bool VulkanContext::InitInstance(const char** extensions, uint32_t extensions_co
#endif #endif
// Choose a discrete gpu if there's one, otherwise just pick the first one // Choose a discrete gpu if there's one, otherwise just pick the first one
physicalDevice = nullptr;
const auto devices = instance->enumeratePhysicalDevices(); const auto devices = instance->enumeratePhysicalDevices();
for (const auto& phyDev : devices) for (const auto& phyDev : devices)
{ {
@ -206,15 +198,12 @@ bool VulkanContext::InitInstance(const char** extensions, uint32_t extensions_co
physicalDevice = instance->enumeratePhysicalDevices().front(); physicalDevice = instance->enumeratePhysicalDevices().front();
const vk::PhysicalDeviceProperties *properties; const vk::PhysicalDeviceProperties *properties;
if (vulkan11 || getProperties2KHRSupported) if (vulkan11)
{ {
static vk::PhysicalDeviceProperties2 properties2; static vk::PhysicalDeviceProperties2 properties2;
vk::PhysicalDeviceMaintenance3Properties properties3; vk::PhysicalDeviceMaintenance3Properties properties3;
properties2.pNext = &properties3; properties2.pNext = &properties3;
if (vulkan11) physicalDevice.getProperties2(&properties2);
physicalDevice.getProperties2(&properties2);
else
physicalDevice.getProperties2KHR(&properties2);
properties = &properties2.properties; properties = &properties2.properties;
maxMemoryAllocationSize = properties3.maxMemoryAllocationSize; maxMemoryAllocationSize = properties3.maxMemoryAllocationSize;
if (maxMemoryAllocationSize == 0) if (maxMemoryAllocationSize == 0)