Skip to content

Commit

Permalink
Limit amount of physical devices groups requested by user
Browse files Browse the repository at this point in the history
  • Loading branch information
KacperZielinski-Intel authored and baldurk committed Mar 5, 2024
1 parent 3c02b6f commit e594d28
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions renderdoc/driver/vulkan/wrappers/vk_get_funcs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -914,27 +914,28 @@ VkResult WrappedVulkan::vkEnumeratePhysicalDeviceGroups(
{
// We ignore the 'real' physical device groups, and report one group per physical device.
// We use our internal enumerate function to make sure we handle wrapping the objects.
RDCASSERT(pPhysicalDeviceGroupCount);

// Total number of available physical device groups.
uint32_t physicalDevicesNumber = 0;
vkEnumeratePhysicalDevices(instance, &physicalDevicesNumber, NULL);

// Return number of available device groups.
if(pPhysicalDeviceGroupProperties == NULL)
{
if(pPhysicalDeviceGroupCount)
{
*pPhysicalDeviceGroupCount = physicalDevicesNumber;
}
*pPhysicalDeviceGroupCount = physicalDevicesNumber;
return VK_SUCCESS;
}

uint32_t physicalDeviceGroupCount = pPhysicalDeviceGroupCount ? *pPhysicalDeviceGroupCount : 0;
// Number of physical device groups to query.
*pPhysicalDeviceGroupCount = RDCMIN(*pPhysicalDeviceGroupCount, physicalDevicesNumber);

rdcarray<VkPhysicalDevice> physicalDevices;
physicalDevices.resize(physicalDeviceGroupCount);
vkEnumeratePhysicalDevices(instance, &physicalDeviceGroupCount, physicalDevices.data());
physicalDevices.resize(*pPhysicalDeviceGroupCount);
vkEnumeratePhysicalDevices(instance, pPhysicalDeviceGroupCount, physicalDevices.data());

// List one group per device.
for(uint32_t i = 0; i < physicalDeviceGroupCount; i++)
for(uint32_t i = 0; i < *pPhysicalDeviceGroupCount; i++)
{
RDCEraseEl(pPhysicalDeviceGroupProperties[i]);
pPhysicalDeviceGroupProperties[i].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES;
Expand All @@ -943,7 +944,7 @@ VkResult WrappedVulkan::vkEnumeratePhysicalDeviceGroups(
pPhysicalDeviceGroupProperties[i].subsetAllocation = VK_FALSE;
}

if(physicalDeviceGroupCount < physicalDevicesNumber)
if(*pPhysicalDeviceGroupCount < physicalDevicesNumber)
return VK_INCOMPLETE;

return VK_SUCCESS;
Expand Down

0 comments on commit e594d28

Please sign in to comment.