kbz_8/KVF
1
0
Fork 0
Code Issues Pull Requests actions.actions Packages Projects Releases 1 Wiki Activity

fixing queues management in devices creations

Browse Source
This commit is contained in:
kbz_8
2024-09-13 09:24:00 +02:00
parent 64565bbff4
commit 8654cf72d8
1 changed files with 78 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
kvf.h
View File

@@ -1300,24 +1300,48 @@ VkDevice kvfCreateDevice(VkPhysicalDevice physical, const char** extensions, uin
KVF_ASSERT(kvfdevice != NULL); KVF_ASSERT(kvfdevice != NULL);
VkDeviceQueueCreateInfo queue_create_info[2]; uint32_t queue_count = 0;
queue_create_info[0].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; queue_count += (kvfdevice->queues.graphics != -1);
queue_create_info[0].queueFamilyIndex = kvfdevice->queues.graphics; queue_count += (kvfdevice->queues.present != -1);
queue_create_info[0].queueCount = 1; queue_count += (kvfdevice->queues.compute != -1);
queue_create_info[0].pQueuePriorities = &queue_priority;
queue_create_info[0].flags = 0; VkDeviceQueueCreateInfo* queue_create_infos = (VkDeviceQueueCreateInfo*)KVF_MALLOC(queue_count * sizeof(VkDeviceQueueCreateInfo));
queue_create_info[0].pNext = NULL; size_t i = 0;
queue_create_info[1].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; if(kvfdevice->queues.graphics != -1)
queue_create_info[1].queueFamilyIndex = kvfdevice->queues.present; {
queue_create_info[1].queueCount = 1; queue_create_infos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queue_create_info[1].pQueuePriorities = &queue_priority; queue_create_infos[i].queueFamilyIndex = kvfdevice->queues.graphics;
queue_create_info[1].flags = 0; queue_create_infos[i].queueCount = 1;
queue_create_info[1].pNext = NULL; queue_create_infos[i].pQueuePriorities = &queue_priority;
queue_create_infos[i].flags = 0;
queue_create_infos[i].pNext = NULL;
i++;
}
if(kvfdevice->queues.present != -1 && kvfdevice->queues.present != kvfdevice->queues.graphics)
{
queue_create_infos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queue_create_infos[i].queueFamilyIndex = kvfdevice->queues.present;
queue_create_infos[i].queueCount = 1;
queue_create_infos[i].pQueuePriorities = &queue_priority;
queue_create_infos[i].flags = 0;
queue_create_infos[i].pNext = NULL;
i++;
}
if(kvfdevice->queues.compute != -1 && kvfdevice->queues.present != kvfdevice->queues.compute && kvfdevice->queues.graphics != kvfdevice->queues.compute)
{
queue_create_infos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queue_create_infos[i].queueFamilyIndex = kvfdevice->queues.compute;
queue_create_infos[i].queueCount = 1;
queue_create_infos[i].pQueuePriorities = &queue_priority;
queue_create_infos[i].flags = 0;
queue_create_infos[i].pNext = NULL;
i++;
}
VkDeviceCreateInfo createInfo; VkDeviceCreateInfo createInfo;
createInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; createInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
createInfo.queueCreateInfoCount = (kvfdevice->queues.graphics == kvfdevice->queues.present ? 1 : 2); createInfo.queueCreateInfoCount = i;
createInfo.pQueueCreateInfos = queue_create_info; createInfo.pQueueCreateInfos = queue_create_infos;
createInfo.pEnabledFeatures = features; createInfo.pEnabledFeatures = features;
createInfo.enabledExtensionCount = extensions_count; createInfo.enabledExtensionCount = extensions_count;
createInfo.ppEnabledExtensionNames = extensions; createInfo.ppEnabledExtensionNames = extensions;
@@ -1344,24 +1368,48 @@ VkDevice kvfCreateDeviceCustomPhysicalDeviceAndQueues(VkPhysicalDevice physical,
{ {
const float queue_priority = 1.0f; const float queue_priority = 1.0f;
VkDeviceQueueCreateInfo queue_create_info[2]; uint32_t queue_count = 0;
queue_create_info[0].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; queue_count += (graphics_queue != -1);
queue_create_info[0].queueFamilyIndex = graphics_queue; queue_count += (present_queue != -1);
queue_create_info[0].queueCount = 1; queue_count += (compute_queue != -1);
queue_create_info[0].pQueuePriorities = &queue_priority;
queue_create_info[0].flags = 0; VkDeviceQueueCreateInfo* queue_create_infos = (VkDeviceQueueCreateInfo*)KVF_MALLOC(queue_count * sizeof(VkDeviceQueueCreateInfo));
queue_create_info[0].pNext = NULL; size_t i = 0;
queue_create_info[1].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; if(graphics_queue != -1)
queue_create_info[1].queueFamilyIndex = present_queue; {
queue_create_info[1].queueCount = 1; queue_create_infos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queue_create_info[1].pQueuePriorities = &queue_priority; queue_create_infos[i].queueFamilyIndex = graphics_queue;
queue_create_info[1].flags = 0; queue_create_infos[i].queueCount = 1;
queue_create_info[1].pNext = NULL; queue_create_infos[i].pQueuePriorities = &queue_priority;
queue_create_infos[i].flags = 0;
queue_create_infos[i].pNext = NULL;
i++;
}
if(present_queue != -1 && present_queue != graphics_queue)
{
queue_create_infos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queue_create_infos[i].queueFamilyIndex = present_queue;
queue_create_infos[i].queueCount = 1;
queue_create_infos[i].pQueuePriorities = &queue_priority;
queue_create_infos[i].flags = 0;
queue_create_infos[i].pNext = NULL;
i++;
}
if(compute_queue != -1 && present_queue != compute_queue && graphics_queue != compute_queue)
{
queue_create_infos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queue_create_infos[i].queueFamilyIndex = compute_queue;
queue_create_infos[i].queueCount = 1;
queue_create_infos[i].pQueuePriorities = &queue_priority;
queue_create_infos[i].flags = 0;
queue_create_infos[i].pNext = NULL;
i++;
}
VkDeviceCreateInfo createInfo; VkDeviceCreateInfo createInfo;
createInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; createInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
createInfo.queueCreateInfoCount = (graphics_queue == present_queue ? 1 : 2); createInfo.queueCreateInfoCount = queue_count;
createInfo.pQueueCreateInfos = queue_create_info; createInfo.pQueueCreateInfos = queue_create_infos;
createInfo.pEnabledFeatures = features; createInfo.pEnabledFeatures = features;
createInfo.enabledExtensionCount = extensions_count; createInfo.enabledExtensionCount = extensions_count;
createInfo.ppEnabledExtensionNames = extensions; createInfo.ppEnabledExtensionNames = extensions;