lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-23 23:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add fallback to remove queue priorities if device creation fails

Browse Source
This commit is contained in:
baldurk
2020-04-29 22:12:12 +01:00
parent 54abdc3d14
commit e8f3c547be
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+28
View File
@@ -1438,6 +1438,19 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
RDCLOG("Creating replay device from physical device %u", physicalDeviceIndex);
rdcarray<VkDeviceQueueGlobalPriorityCreateInfoEXT *> queuePriorities;
for(uint32_t i = 0; i < CreateInfo.queueCreateInfoCount; i++)
{
VkDeviceQueueGlobalPriorityCreateInfoEXT *queuePrio =
(VkDeviceQueueGlobalPriorityCreateInfoEXT *)FindNextStruct(
&CreateInfo.pQueueCreateInfos[i],
VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT);
if(queuePrio)
queuePriorities.push_back(queuePrio);
}
// we must make any modifications locally, so the free of pointers
// in the serialised VkDeviceCreateInfo don't double-free
VkDeviceCreateInfo createInfo = CreateInfo;
@@ -2872,6 +2885,21 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
vkr = GetDeviceDispatchTable(NULL)->CreateDevice(Unwrap(physicalDevice), &createInfo, NULL,
&device);
if(vkr != VK_SUCCESS && !queuePriorities.empty())
{
RDCWARN("Failed to create logical device: %s. Reducing queue priorities", ToStr(vkr).c_str());
for(VkDeviceQueueGlobalPriorityCreateInfoEXT *q : queuePriorities)
{
// medium is considered the default if no priority is set otherwise
if(q->globalPriority > VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT)
q->globalPriority = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT;
}
vkr = GetDeviceDispatchTable(NULL)->CreateDevice(Unwrap(physicalDevice), &createInfo, NULL,
&device);
}
if(vkr != VK_SUCCESS)
{
RDCERR("Failed to create logical device: %s", ToStr(vkr).c_str());