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

did some stuff in queue creation for vulkan

Browse Source
This commit is contained in:
Gregory Wells
2025-10-01 09:18:22 -04:00
parent d79a3c45bf
commit 481f590234
5 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
projects/apis/vulkan/src/extensions/queues/vulkan_device_queues.c
View File

@@ -2,11 +2,11 @@
#include "output_device/vulkan_output_devices.h" #include "output_device/vulkan_output_devices.h"
gnReturnCode vulkanPhysicalDeviceQueueProperties(gnPhysicalDeviceHandle device, uint32_t queueFamilyCount, gnQueueFamilyProperties* queues) { gnReturnCode vulkanPhysicalDeviceQueueProperties(gnPhysicalDeviceHandle device, uint32_t queueFamilyCount, gnQueueFamilyProperties* queues) {
vkGetPhysicalDeviceQueueFamilyProperties(device->physicalDevice->device, &queueFamilyCount, NULL); vkGetPhysicalDeviceQueueFamilyProperties((VkPhysicalDevice)device, &queueFamilyCount, NULL);
if (queues == NULL) return GN_SUCCESS; if (queues == NULL) return GN_SUCCESS;
VkQueueFamilyProperties* queueFamilies = malloc(sizeof(VkQueueFamilyProperties) * queueFamilyCount); VkQueueFamilyProperties* queueFamilies = malloc(sizeof(VkQueueFamilyProperties) * queueFamilyCount);
vkGetPhysicalDeviceQueueFamilyProperties(device->physicalDevice->device, &queueFamilyCount, queueFamilies); vkGetPhysicalDeviceQueueFamilyProperties((VkPhysicalDevice)device, &queueFamilyCount, queueFamilies);
for (uint32_t i = 0; i < queueFamilyCount; i++) { for (uint32_t i = 0; i < queueFamilyCount; i++) {
queues[i].queueCount = queueFamilies[i].queueCount; queues[i].queueCount = queueFamilies[i].queueCount;
@@ -21,8 +21,9 @@ gnReturnCode vulkanPhysicalDeviceQueueProperties(gnPhysicalDeviceHandle device,
return GN_SUCCESS; return GN_SUCCESS;
} }
void getVulkanDeviceQueue(gnOutputDevice device, uint32_t queueFamily, uint32_t queueIndex, gnQueue* queue) { void getVulkanDeviceQueue(gnOutputDevice device, uint32_t queueFamily, uint32_t queueIndex, gnQueue* queue) {
VkQueue vulkanQueue; VkQueue vulkanQueue;
vkGetDeviceQueue(device->outputDevice->device, queueFamily, queueIndex, &vulkanQueue); vkGetDeviceQueue(device->outputDevice->device, queueFamily, queueIndex, &vulkanQueue);
*queue = (uint64_t)vulkanQueue; *queue = (gnQueue)vulkanQueue;
} }

2
projects/apis/vulkan/src/instance/vulkan_instance.h
View File

@@ -4,8 +4,6 @@
#include "utils/lists/gryphn_array_list.h" #include "utils/lists/gryphn_array_list.h"
#include "loader/src/gryphn_instance_functions.h" #include "loader/src/gryphn_instance_functions.h"
void vulkanLoadNeededQueues(gnPhysicalDevice physicalDevice);
typedef struct vkUserData { typedef struct vkUserData {
gnDebuggerCallback debuggerCallback; gnDebuggerCallback debuggerCallback;
void* userData; void* userData;

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

@@ -8,25 +8,26 @@
#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 = deviceInfo.physicalDevice->physicalDevice->device; device->outputDevice->physicalDevice = (VkPhysicalDevice)deviceInfo.physicalDevice;
int createQueueCount = 0; int createQueueCount = 0;
VkDeviceQueueCreateInfo* queueCreateInfos = NULL; VkDeviceQueueCreateInfo* queueCreateInfos = NULL;
if (!instance->enabledExtensions[GN_EXT_QUEUES]) { if (!instance->enabledExtensions[GN_EXT_QUEUES]) {
queueCreateInfos = malloc(sizeof(VkDeviceQueueCreateInfo) * deviceInfo.physicalDevice->physicalDevice->neededQueueCount); uint32_t neededQueueCount;
createQueueCount = deviceInfo.physicalDevice->physicalDevice->neededQueueCount; vulkanNeededQueue* neededQueues = vulkanLoadNeededQueues(deviceInfo.physicalDevice, &neededQueueCount);
queueCreateInfos = malloc(sizeof(VkDeviceQueueCreateInfo) * neededQueueCount);
createQueueCount = neededQueueCount;
float queuePriority = 1.0f; float queuePriority = 1.0f;
for (uint32_t i = 0; i < deviceInfo.physicalDevice->physicalDevice->neededQueueCount; i++) { for (uint32_t i = 0; i < neededQueueCount; i++) {
queueCreateInfos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; queueCreateInfos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queueCreateInfos[i].pNext = NULL; queueCreateInfos[i].pNext = NULL;
queueCreateInfos[i].flags = 0; queueCreateInfos[i].flags = 0;
queueCreateInfos[i].queueCount = 1; queueCreateInfos[i].queueCount = 1;
queueCreateInfos[i].queueFamilyIndex = deviceInfo.physicalDevice->physicalDevice->neededQueues[i].queueIndex; queueCreateInfos[i].queueFamilyIndex = neededQueues[i].queueIndex;
queueCreateInfos[i].pQueuePriorities = &queuePriority; queueCreateInfos[i].pQueuePriorities = &queuePriority;
} }
} else { } else {
@@ -54,7 +55,7 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
.pQueueCreateInfos = queueCreateInfos, .pQueueCreateInfos = queueCreateInfos,
.pEnabledFeatures = &deviceFeatures .pEnabledFeatures = &deviceFeatures
}; };
deviceCreateInfo.ppEnabledExtensionNames = vkGetGryphnDeviceExtensions(&deviceCreateInfo.enabledExtensionCount, deviceInfo.physicalDevice->physicalDevice->device); deviceCreateInfo.ppEnabledExtensionNames = vkGetGryphnDeviceExtensions(&deviceCreateInfo.enabledExtensionCount, (VkPhysicalDevice)deviceInfo.physicalDevice);
device->outputDevice->enabledOversizedDescriptorPools = GN_FALSE; device->outputDevice->enabledOversizedDescriptorPools = GN_FALSE;
for (uint32_t i = 0; i < deviceCreateInfo.enabledExtensionCount; i++) for (uint32_t i = 0; i < deviceCreateInfo.enabledExtensionCount; i++)
@@ -68,17 +69,15 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
deviceCreateInfo.ppEnabledLayerNames = validation_layers; deviceCreateInfo.ppEnabledLayerNames = validation_layers;
} }
VkResult result = vkCreateDevice(deviceInfo.physicalDevice->physicalDevice->device, &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);
device->outputDevice->queues = malloc(sizeof(vulkanQueue) * deviceInfo.physicalDevice->physicalDevice->neededQueueCount); 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 < deviceInfo.physicalDevice->physicalDevice->neededQueueCount; i++) { for (uint32_t i = 0; i < createQueueCount; i++) {
device->outputDevice->queues[i].queueInfo = deviceInfo.physicalDevice->physicalDevice->neededQueues[i]; vkGetDeviceQueue(device->outputDevice->device, queueCreateInfos[i].queueFamilyIndex, 0, &device->outputDevice->queues[i].queue);
vkGetDeviceQueue(device->outputDevice->device, deviceInfo.physicalDevice->physicalDevice->neededQueues[i].queueIndex, 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) {
device->outputDevice->transferQueueIndex = i; device->outputDevice->transferQueueIndex = i;
transferQueue = device->outputDevice->queues[i].queueInfo.queueIndex; transferQueue = device->outputDevice->queues[i].queueInfo.queueIndex;

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

@@ -142,39 +142,36 @@ VkSampleCountFlags gnSampleCountToVulkan(gnSampleCountFlags counts) {
return sampleCount; return sampleCount;
} }
// void vulkanLoadNeededQueues(gnPhysicalDevice physicalDevice) { vulkanNeededQueue* vulkanLoadNeededQueues(gnPhysicalDevice physicalDevice, uint32_t* neededQueueCount) {
// VkPhysicalDevice device = (VkPhysicalDevice)physicalDevice; VkPhysicalDevice device = (VkPhysicalDevice)physicalDevice;
uint32_t queueFamilyCount = 0;
vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyCount, NULL);
VkQueueFamilyProperties* queueFamilies = malloc(sizeof(VkQueueFamilyProperties) * queueFamilyCount);
vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyCount, queueFamilies);
vulkanNeededQueue* neededQueues = malloc(sizeof(vulkanNeededQueue) * queueFamilyCount);
for (uint32_t c = 0; c < queueFamilyCount; c++) {
gnBool hasNeededQueue = GN_FALSE;
if ((queueFamilies[c].queueFlags & VK_QUEUE_GRAPHICS_BIT) == VK_QUEUE_GRAPHICS_BIT)
hasNeededQueue = GN_TRUE;
if ((queueFamilies[c].queueFlags & VK_QUEUE_TRANSFER_BIT) == VK_QUEUE_TRANSFER_BIT)
hasNeededQueue = GN_TRUE;
// uint32_t queueFamilyCount = 0; if (hasNeededQueue) {
// vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyCount, NULL); vulkanNeededQueue neededQueue = {
// VkQueueFamilyProperties* queueFamilies = malloc(sizeof(VkQueueFamilyProperties) * queueFamilyCount); .queueIndex = c,
// vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyCount, queueFamilies); .createFlags = 0,
.usedForPresent = GN_FALSE
};
if ((queueFamilies[c].queueFlags & VK_QUEUE_GRAPHICS_BIT)) neededQueue.createFlags |= VK_QUEUE_GRAPHICS_BIT;
if ((queueFamilies[c].queueFlags & VK_QUEUE_TRANSFER_BIT)) neededQueue.createFlags |= VK_QUEUE_TRANSFER_BIT;
// device->neededQueues = malloc(sizeof(vulkanNeededQueue) * queueFamilyCount); neededQueues[*neededQueueCount] = neededQueue;
// for (uint32_t c = 0; c < queueFamilyCount; c++) { (*neededQueueCount)++;
// gnBool hasNeededQueue = GN_FALSE; }
}
// if ((queueFamilies[c].queueFlags & VK_QUEUE_GRAPHICS_BIT) == VK_QUEUE_GRAPHICS_BIT) free(queueFamilies);
// hasNeededQueue = GN_TRUE; return neededQueues;
// if ((queueFamilies[c].queueFlags & VK_QUEUE_TRANSFER_BIT) == VK_QUEUE_TRANSFER_BIT) }
// hasNeededQueue = GN_TRUE;
// if (hasNeededQueue) {
// vulkanNeededQueue neededQueue = {
// .queueIndex = c,
// .createFlags = 0,
// .usedForPresent = GN_FALSE
// };
// if ((queueFamilies[c].queueFlags & VK_QUEUE_GRAPHICS_BIT)) neededQueue.createFlags |= VK_QUEUE_GRAPHICS_BIT;
// if ((queueFamilies[c].queueFlags & VK_QUEUE_TRANSFER_BIT)) neededQueue.createFlags |= VK_QUEUE_TRANSFER_BIT;
// device->neededQueues[device->neededQueueCount] = neededQueue;
// device->neededQueueCount++;
// }
// }
// free(queueFamilies);
// }
// gnBool deviceCanPresentToSurface(gnPhysicalDevice physicalDevice, gnWindowSurface surface) { // gnBool deviceCanPresentToSurface(gnPhysicalDevice physicalDevice, gnWindowSurface surface) {

1
projects/apis/vulkan/src/output_device/vulkan_physical_device.h
View File

@@ -8,6 +8,7 @@ typedef struct vulkanNeededQueue {
gnBool usedForPresent; gnBool usedForPresent;
uint32_t queueIndex; uint32_t queueIndex;
} vulkanNeededQueue; } vulkanNeededQueue;
vulkanNeededQueue* vulkanLoadNeededQueues(gnPhysicalDevice physicalDevice, uint32_t* neededQueueCount);
gnPhysicalDeviceProperties vulkanQueryPhysicalDeviceProperties(gnInstance instance, gnPhysicalDeviceHandle device, gryphnInstanceFunctionLayers* layers); gnPhysicalDeviceProperties vulkanQueryPhysicalDeviceProperties(gnInstance instance, gnPhysicalDeviceHandle device, gryphnInstanceFunctionLayers* layers);
gnPhysicalDeviceFeatures vulkanQueryPhysicalDeviceFeatures(gnInstance instance, gnPhysicalDeviceHandle device, gryphnInstanceFunctionLayers* layers); gnPhysicalDeviceFeatures vulkanQueryPhysicalDeviceFeatures(gnInstance instance, gnPhysicalDeviceHandle device, gryphnInstanceFunctionLayers* layers);