claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Option for dedicated transfer queue upon device creation

Browse source
This commit is contained in:
saschawillems 2016-10-03 10:13:20 +02:00
parent 52f34c67a9
commit 90315fb783
1 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

47
base/vulkandevice.hpp
View file

@ -44,6 +44,7 @@ namespace vk
{ {
uint32_t graphics; uint32_t graphics;
uint32_t compute; uint32_t compute;
uint32_t transfer;
} queueFamilyIndices; } queueFamilyIndices;
/** /**
@ -148,7 +149,8 @@ namespace vk
*/ */
uint32_t getQueueFamiliyIndex(VkQueueFlagBits queueFlags) uint32_t getQueueFamiliyIndex(VkQueueFlagBits queueFlags)
{ {
// If a compute queue is requested, try to find a separate compute queue family from graphics first // Dedicated queue for compute
// Try to find a queue family index that supports compute but not graphics
if (queueFlags & VK_QUEUE_COMPUTE_BIT) if (queueFlags & VK_QUEUE_COMPUTE_BIT)
{ {
for (uint32_t i = 0; i < static_cast<uint32_t>(queueFamilyProperties.size()); i++) for (uint32_t i = 0; i < static_cast<uint32_t>(queueFamilyProperties.size()); i++)
@ -161,6 +163,20 @@ namespace vk
} }
} }
// Dedicated queue for transfer
// Try to find a queue family index that supports transfer but not graphics and compute
if (queueFlags & VK_QUEUE_TRANSFER_BIT)
{
for (uint32_t i = 0; i < static_cast<uint32_t>(queueFamilyProperties.size()); i++)
{
if ((queueFamilyProperties[i].queueFlags & queueFlags) && ((queueFamilyProperties[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) == 0) && ((queueFamilyProperties[i].queueFlags & VK_QUEUE_COMPUTE_BIT) == 0))
{
return i;
break;
}
}
}
// For other queue types or if no separate compute queue is present, return the first one to support the requested flags // For other queue types or if no separate compute queue is present, return the first one to support the requested flags
for (uint32_t i = 0; i < static_cast<uint32_t>(queueFamilyProperties.size()); i++) for (uint32_t i = 0; i < static_cast<uint32_t>(queueFamilyProperties.size()); i++)
{ {
@ -217,15 +233,13 @@ namespace vk
queueFamilyIndices.graphics = VK_NULL_HANDLE; queueFamilyIndices.graphics = VK_NULL_HANDLE;
} }
// Compute queue // Dedicated compute queue
if (requestedQueueTypes & VK_QUEUE_COMPUTE_BIT) if (requestedQueueTypes & VK_QUEUE_COMPUTE_BIT)
{ {
queueFamilyIndices.compute = getQueueFamiliyIndex(VK_QUEUE_COMPUTE_BIT); queueFamilyIndices.compute = getQueueFamiliyIndex(VK_QUEUE_COMPUTE_BIT);
if (queueFamilyIndices.compute != queueFamilyIndices.graphics) if (queueFamilyIndices.compute != queueFamilyIndices.graphics)
{ {
// If compute family index differs, we need an additional queue create info for the compute queue // If compute family index differs, we need an additional queue create info for the compute queue
//todo: possibly wrong for release due to scope
float queuePriority(0.0f);
VkDeviceQueueCreateInfo queueInfo{}; VkDeviceQueueCreateInfo queueInfo{};
queueInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; queueInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queueInfo.queueFamilyIndex = queueFamilyIndices.compute; queueInfo.queueFamilyIndex = queueFamilyIndices.compute;
@ -233,11 +247,32 @@ namespace vk
queueInfo.pQueuePriorities = &defaultQueuePriority; queueInfo.pQueuePriorities = &defaultQueuePriority;
queueCreateInfos.push_back(queueInfo); queueCreateInfos.push_back(queueInfo);
} }
// Else we use the same queue
} }
else else
{ {
queueFamilyIndices.compute = VK_NULL_HANDLE; // Else we use the same queue
queueFamilyIndices.compute = queueFamilyIndices.graphics;
}
// Dedicated transfer queue
if (requestedQueueTypes & VK_QUEUE_TRANSFER_BIT)
{
queueFamilyIndices.transfer = getQueueFamiliyIndex(VK_QUEUE_TRANSFER_BIT);
if ((queueFamilyIndices.transfer != queueFamilyIndices.graphics) && (queueFamilyIndices.transfer != queueFamilyIndices.compute))
{
// If compute family index differs, we need an additional queue create info for the compute queue
VkDeviceQueueCreateInfo queueInfo{};
queueInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queueInfo.queueFamilyIndex = queueFamilyIndices.compute;
queueInfo.queueCount = 1;
queueInfo.pQueuePriorities = &defaultQueuePriority;
queueCreateInfos.push_back(queueInfo);
}
}
else
{
// Else we use the same queue
queueFamilyIndices.transfer = queueFamilyIndices.graphics;
} }
// Create the logical device representation // Create the logical device representation