AstralTech/Gryphn
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finally redo physical device creation

Browse Source
This commit is contained in:
Gregory Wells
2025-10-01 13:22:52 -04:00
parent 5ce0ff3350
commit 5228b6630c
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
projects/apis/vulkan/src/output_device/vulkan_output_device.c
View File

@@ -8,6 +8,8 @@
#include "vulkan_result_converter.h" #include "vulkan_result_converter.h"
#include "string.h" #include "string.h"
#include <stdio.h>
gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device, gnOutputDeviceInfo deviceInfo) { gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device, gnOutputDeviceInfo deviceInfo) {
device->outputDevice = malloc(sizeof(gnPlatformOutputDevice)); device->outputDevice = malloc(sizeof(gnPlatformOutputDevice));
device->outputDevice->physicalDevice = (VkPhysicalDevice)deviceInfo.physicalDevice; device->outputDevice->physicalDevice = (VkPhysicalDevice)deviceInfo.physicalDevice;
@@ -18,7 +20,6 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
if (!instance->enabledExtensions[GN_EXT_QUEUES]) { if (!instance->enabledExtensions[GN_EXT_QUEUES]) {
uint32_t neededQueueCount; uint32_t neededQueueCount;
vulkanNeededQueue* neededQueues = vulkanLoadNeededQueues(deviceInfo.physicalDevice, &neededQueueCount); vulkanNeededQueue* neededQueues = vulkanLoadNeededQueues(deviceInfo.physicalDevice, &neededQueueCount);
queueCreateInfos = malloc(sizeof(VkDeviceQueueCreateInfo) * neededQueueCount); queueCreateInfos = malloc(sizeof(VkDeviceQueueCreateInfo) * neededQueueCount);
createQueueCount = neededQueueCount; createQueueCount = neededQueueCount;
float queuePriority = 1.0f; float queuePriority = 1.0f;
@@ -68,7 +69,6 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
deviceCreateInfo.enabledLayerCount = 1; deviceCreateInfo.enabledLayerCount = 1;
deviceCreateInfo.ppEnabledLayerNames = validation_layers; deviceCreateInfo.ppEnabledLayerNames = validation_layers;
} }
VkResult result = vkCreateDevice((VkPhysicalDevice)deviceInfo.physicalDevice, &deviceCreateInfo, NULL, &device->outputDevice->device); VkResult result = vkCreateDevice((VkPhysicalDevice)deviceInfo.physicalDevice, &deviceCreateInfo, NULL, &device->outputDevice->device);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return VkResultToGnReturnCode(result); return VkResultToGnReturnCode(result);
@@ -76,6 +76,7 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
device->outputDevice->queues = malloc(sizeof(vulkanQueue) * createQueueCount); device->outputDevice->queues = malloc(sizeof(vulkanQueue) * createQueueCount);
uint32_t transferQueue = 0; uint32_t transferQueue = 0;
gnBool foundTransferQueue = GN_FALSE, foundGraphicsQueue = GN_FALSE; gnBool foundTransferQueue = GN_FALSE, foundGraphicsQueue = GN_FALSE;
for (uint32_t i = 0; i < createQueueCount; i++) { for (uint32_t i = 0; i < createQueueCount; i++) {
vkGetDeviceQueue(device->outputDevice->device, queueCreateInfos[i].queueFamilyIndex, 0, &device->outputDevice->queues[i].queue); vkGetDeviceQueue(device->outputDevice->device, queueCreateInfos[i].queueFamilyIndex, 0, &device->outputDevice->queues[i].queue);
if ((device->outputDevice->queues[i].queueInfo.createFlags & VK_QUEUE_TRANSFER_BIT) == VK_QUEUE_TRANSFER_BIT && !foundTransferQueue) { if ((device->outputDevice->queues[i].queueInfo.createFlags & VK_QUEUE_TRANSFER_BIT) == VK_QUEUE_TRANSFER_BIT && !foundTransferQueue) {
@@ -88,7 +89,12 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
device->outputDevice->graphicsQueueIndex = i; device->outputDevice->graphicsQueueIndex = i;
foundGraphicsQueue = GN_FALSE; foundGraphicsQueue = GN_FALSE;
} }
if ((device->outputDevice->queues[i].queueInfo.createFlags & VK_QUEUE_GRAPHICS_BIT) == VK_QUEUE_GRAPHICS_BIT && !foundGraphicsQueue) {
device->outputDevice->graphicsQueueIndex = i;
foundGraphicsQueue = GN_FALSE;
} }
}
VkCommandPoolCreateInfo poolInfo = { VkCommandPoolCreateInfo poolInfo = {
.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO,

14
projects/apis/vulkan/src/output_device/vulkan_physical_device.c
View File

@@ -147,13 +147,22 @@ vulkanNeededQueue* vulkanLoadNeededQueues(gnPhysicalDevice physicalDevice, uint3
vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyCount, NULL); vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyCount, NULL);
VkQueueFamilyProperties* queueFamilies = malloc(sizeof(VkQueueFamilyProperties) * queueFamilyCount); VkQueueFamilyProperties* queueFamilies = malloc(sizeof(VkQueueFamilyProperties) * queueFamilyCount);
vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyCount, queueFamilies); vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyCount, queueFamilies);
*neededQueueCount = 0;
gnBool foundGraphicsQueue = GN_FALSE, foundTransferQueue = GN_FALSE;
vulkanNeededQueue* neededQueues = malloc(sizeof(vulkanNeededQueue) * queueFamilyCount); vulkanNeededQueue* neededQueues = malloc(sizeof(vulkanNeededQueue) * queueFamilyCount);
for (uint32_t c = 0; c < queueFamilyCount; c++) { for (uint32_t c = 0; c < queueFamilyCount; c++) {
gnBool hasNeededQueue = GN_FALSE; gnBool hasNeededQueue = GN_FALSE;
if ((queueFamilies[c].queueFlags & VK_QUEUE_GRAPHICS_BIT) == VK_QUEUE_GRAPHICS_BIT) if ((queueFamilies[c].queueFlags & VK_QUEUE_GRAPHICS_BIT) == VK_QUEUE_GRAPHICS_BIT && !foundGraphicsQueue) {
hasNeededQueue = GN_TRUE; hasNeededQueue = GN_TRUE;
if ((queueFamilies[c].queueFlags & VK_QUEUE_TRANSFER_BIT) == VK_QUEUE_TRANSFER_BIT) foundGraphicsQueue = GN_TRUE;
}
if ((queueFamilies[c].queueFlags & VK_QUEUE_TRANSFER_BIT) == VK_QUEUE_TRANSFER_BIT && !foundTransferQueue) {
hasNeededQueue = GN_TRUE; hasNeededQueue = GN_TRUE;
foundTransferQueue = GN_TRUE;
}
if (hasNeededQueue) { if (hasNeededQueue) {
vulkanNeededQueue neededQueue = { vulkanNeededQueue neededQueue = {
@@ -169,6 +178,7 @@ vulkanNeededQueue* vulkanLoadNeededQueues(gnPhysicalDevice physicalDevice, uint3
} }
} }
free(queueFamilies); free(queueFamilies);
neededQueues = realloc(neededQueues, sizeof(vulkanNeededQueue) * *neededQueueCount);
return neededQueues; return neededQueues;
} }