Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some changes to queues

Browse Source
This commit is contained in:
Dynamitos
2021-10-16 13:21:53 +02:00
parent 528b79812e
commit 1e742c1f45
1 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Graphics/Vulkan/VulkanGraphics.cpp
+36 -29
View File
@@ -460,61 +460,68 @@ void Graphics::createDevice(GraphicsInitializer initializer)
vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &numQueueFamilies, queueProperties.data()); vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &numQueueFamilies, queueProperties.data());
Array<VkDeviceQueueCreateInfo> queueInfos; Array<VkDeviceQueueCreateInfo> queueInfos;
int32_t graphicsQueueFamilyIndex = -1; struct QueueCreateInfo
int32_t transferQueueFamilyIndex = -1; {
int32_t dedicatedTransferQueueFamilyIndex = -1; int32 familyIndex = -1;
int32_t computeQueueFamilyIndex = -1; int32 queueIndex = -1;
int32_t asyncComputeFamilyIndex = -1; };
QueueCreateInfo graphicsQueueInfo;
QueueCreateInfo transferQueueInfo;
QueueCreateInfo dedicatedTransferQueueInfo;
QueueCreateInfo computeQueueInfo;
QueueCreateInfo asyncComputeInfo;
uint32 numPriorities = 0; uint32 numPriorities = 0;
auto checkFamilyProperty = [](VkQueueFamilyProperties currProps, uint32 checkBit){
return (currProps.queueFlags & checkBit) == checkBit;
};
for (uint32 familyIndex = 0; familyIndex < queueProperties.size(); ++familyIndex) for (uint32 familyIndex = 0; familyIndex < queueProperties.size(); ++familyIndex)
{ {
uint32 numQueuesForFamily = 0; uint32 numQueuesForFamily = 0;
VkQueueFamilyProperties currProps = queueProperties[familyIndex]; VkQueueFamilyProperties currProps = queueProperties[familyIndex];
// bool bSparse = currProps.queueFlags & VK_QUEUE_SPARSE_BINDING_BIT;
currProps.queueFlags = currProps.queueFlags ^ VK_QUEUE_SPARSE_BINDING_BIT; if (checkFamilyProperty(currProps, VK_QUEUE_GRAPHICS_BIT))
if ((currProps.queueFlags & VK_QUEUE_GRAPHICS_BIT) == VK_QUEUE_GRAPHICS_BIT)
{ {
if (graphicsQueueFamilyIndex == -1) if (graphicsQueueInfo.familyIndex == -1)
{ {
graphicsQueueFamilyIndex = familyIndex; graphicsQueueInfo.familyIndex = familyIndex;
numQueuesForFamily++; numQueuesForFamily++;
} }
} }
if ((currProps.queueFlags & VK_QUEUE_COMPUTE_BIT) == VK_QUEUE_COMPUTE_BIT) if ((currProps.queueFlags & VK_QUEUE_COMPUTE_BIT) == VK_QUEUE_COMPUTE_BIT)
{ {
if (computeQueueFamilyIndex == -1) if (computeQueueInfo.familyIndex == -1)
{ {
computeQueueFamilyIndex = familyIndex; computeQueueInfo.familyIndex = familyIndex;
} }
if (Gfx::useAsyncCompute) if (Gfx::useAsyncCompute && numQueueFamilies > 1)
{ {
if (asyncComputeFamilyIndex == -1) if (asyncComputeInfo.familyIndex == -1)
{ {
if (familyIndex == (uint32)graphicsQueueFamilyIndex) if (familyIndex == (uint32)graphicsQueueInfo.familyIndex)
{ {
if (currProps.queueCount > 1) if (currProps.queueCount > 1)
{ {
asyncComputeFamilyIndex = familyIndex; asyncComputeInfo.familyIndex = familyIndex;
numQueuesForFamily++; numQueuesForFamily++;
} }
} }
else else
{ {
asyncComputeFamilyIndex = familyIndex; asyncComputeInfo.familyIndex = familyIndex;
} }
} }
} }
} }
if ((currProps.queueFlags & VK_QUEUE_TRANSFER_BIT) == VK_QUEUE_TRANSFER_BIT) if ((currProps.queueFlags & VK_QUEUE_TRANSFER_BIT) == VK_QUEUE_TRANSFER_BIT)
{ {
if (transferQueueFamilyIndex == -1) if (transferQueueInfo.familyIndex == -1)
{ {
transferQueueFamilyIndex = familyIndex; transferQueueInfo.familyIndex = familyIndex;
numQueuesForFamily++; numQueuesForFamily++;
} }
if ((currProps.queueFlags ^ VK_QUEUE_TRANSFER_BIT) == 0) if ((currProps.queueFlags ^ VK_QUEUE_TRANSFER_BIT) == 0)
{ {
dedicatedTransferQueueFamilyIndex = familyIndex; dedicatedTransferQueueInfo.familyIndex = familyIndex;
numQueuesForFamily++; numQueuesForFamily++;
} }
} }
@@ -560,28 +567,28 @@ void Graphics::createDevice(GraphicsInitializer initializer)
VK_CHECK(vkCreateDevice(physicalDevice, &deviceInfo, nullptr, &handle)); VK_CHECK(vkCreateDevice(physicalDevice, &deviceInfo, nullptr, &handle));
graphicsQueue = new Queue(this, Gfx::QueueType::GRAPHICS, graphicsQueueFamilyIndex, 0); graphicsQueue = new Queue(this, Gfx::QueueType::GRAPHICS, graphicsQueueInfo.familyIndex, 0);
if (Gfx::useAsyncCompute && asyncComputeFamilyIndex != -1) if (Gfx::useAsyncCompute && asyncComputeInfo.familyIndex != -1)
{ {
if (asyncComputeFamilyIndex == graphicsQueueFamilyIndex) if (asyncComputeInfo.familyIndex == graphicsQueueInfo.familyIndex)
{ {
// Same family as graphics, but different queue // Same family as graphics, but different queue
computeQueue = new Queue(this, Gfx::QueueType::COMPUTE, asyncComputeFamilyIndex, 1); computeQueue = new Queue(this, Gfx::QueueType::COMPUTE, asyncComputeInfo.familyIndex, 1);
} }
else else
{ {
// Different family // Different family
computeQueue = new Queue(this, Gfx::QueueType::COMPUTE, asyncComputeFamilyIndex, 0); computeQueue = new Queue(this, Gfx::QueueType::COMPUTE, asyncComputeInfo.familyIndex, 0);
} }
} }
else else
{ {
computeQueue = new Queue(this, Gfx::QueueType::COMPUTE, computeQueueFamilyIndex, 0); computeQueue = new Queue(this, Gfx::QueueType::COMPUTE, computeQueueInfo.familyIndex, 0);
} }
transferQueue = new Queue(this, Gfx::QueueType::TRANSFER, transferQueueFamilyIndex, 0); transferQueue = new Queue(this, Gfx::QueueType::TRANSFER, transferQueueInfo.familyIndex, 0);
if (dedicatedTransferQueueFamilyIndex != -1) if (dedicatedTransferQueueInfo.familyIndex != -1)
{ {
dedicatedTransferQueue = new Queue(this, Gfx::QueueType::DEDICATED_TRANSFER, dedicatedTransferQueueFamilyIndex, 0); dedicatedTransferQueue = new Queue(this, Gfx::QueueType::DEDICATED_TRANSFER, dedicatedTransferQueueInfo.familyIndex, 0);
} }
else else
{ {