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

vk: (lr) use one vk::DeviceQueueCreateInfo when possible 

Using 2 with the same queue index causes a validation error and crash.
This commit is contained in:
Flyinghead 2024-10-14 16:39:33 +02:00
parent b4937ef271
commit 5aec6d05b0
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/rend/vulkan/vk_context_lr.cpp
View File

@ -216,21 +216,18 @@ bool VkCreateDevice(retro_vulkan_context* context, VkInstance instance, VkPhysic
vk::DeviceQueueCreateInfo(vk::DeviceQueueCreateFlags(), context->queue_family_index, 1, &queuePriority),
vk::DeviceQueueCreateInfo(vk::DeviceQueueCreateFlags(), context->presentation_queue_family_index, 1, &queuePriority),
};
vk::Device newDevice{};
if (getPhysicalDeviceProperties2Supported)
{
vk::DeviceCreateInfo deviceCreateInfo(vk::DeviceCreateFlags(), deviceQueueCreateInfo,
nullptr, enabledExtensions);
deviceCreateInfo.pNext = &featuresChain;
newDevice = physicalDevice.createDevice(deviceCreateInfo);
}
bool singleQueue = context->queue_family_index == context->presentation_queue_family_index;
vk::DeviceCreateInfo deviceCreateInfo;
if (singleQueue)
deviceCreateInfo = vk::DeviceCreateInfo(vk::DeviceCreateFlags(), deviceQueueCreateInfo[0], nullptr, enabledExtensions);
else
{
newDevice = physicalDevice.createDevice(vk::DeviceCreateInfo(vk::DeviceCreateFlags(), deviceQueueCreateInfo,
nullptr, enabledExtensions, &features));
}
deviceCreateInfo = vk::DeviceCreateInfo(vk::DeviceCreateFlags(), deviceQueueCreateInfo, nullptr, enabledExtensions);
if (getPhysicalDeviceProperties2Supported)
deviceCreateInfo.pNext = &featuresChain;
else
deviceCreateInfo.setPEnabledFeatures(&features);
vk::Device newDevice = physicalDevice.createDevice(deviceCreateInfo);
context->device = (VkDevice)newDevice;
#if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1