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

fix output devices

Browse Source
This commit is contained in:
Gregory Wells
2025-08-03 13:33:49 -04:00
parent 38a154e4c6
commit 50b285e824
9 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
projects/apis/metal/src/devices/metal_output_device.m
View File

@@ -15,10 +15,7 @@ void waitForMetalDevice(gnOutputDeviceHandle device) {
[device->outputDevice->executingCommandBuffer waitUntilCompleted];
}
void destroyMetalOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device) {
// for (int i = 0; i < device->outputDevice->queueCount; i++) {
// [device->outputDevice->queues[i] release];
// }
void destroyMetalOutputDevice(gnOutputDeviceHandle device) {
[device->outputDevice->transferQueue release];
[device->outputDevice->device release];
free(device->outputDevice);

2
projects/apis/metal/src/devices/metal_output_devices.h
View File

@@ -21,4 +21,4 @@ gnBool metalCanDevicePresent(gnPhysicalDevice device, gnWindowSurface windowSurf
gnReturnCode createMetalOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle outputDevice, gnOutputDeviceInfo deviceInfo);
void waitForMetalDevice(gnOutputDeviceHandle device);
void destroyMetalOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device);
void destroyMetalOutputDevice(gnOutputDeviceHandle device);

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

@@ -5,6 +5,7 @@
#include "instance/gryphn_instance.h"
#include "commands/command_buffer/vulkan_command_buffer.h"
#include "vulkan_result_converter.h"
#include "string.h"
gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device, gnOutputDeviceInfo deviceInfo) {
device->outputDevice = malloc(sizeof(gnPlatformOutputDevice));
@@ -17,7 +18,7 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
queueCreateInfos = malloc(sizeof(VkDeviceQueueCreateInfo) * deviceInfo.physicalDevice->physicalDevice->neededQueueCount);
createQueueCount = deviceInfo.physicalDevice->physicalDevice->neededQueueCount;
float queuePriority = 1.0f;
for (int i = 0; i < deviceInfo.physicalDevice->physicalDevice->neededQueueCount; i++) {
for (uint32_t i = 0; i < deviceInfo.physicalDevice->physicalDevice->neededQueueCount; i++) {
queueCreateInfos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queueCreateInfos[i].flags = 0;
queueCreateInfos[i].queueCount = 1;
@@ -27,7 +28,7 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
} else {
createQueueCount = deviceInfo.queueInfoCount;
queueCreateInfos = malloc(sizeof(VkDeviceQueueCreateInfo) * deviceInfo.queueInfoCount);
for (int i = 0; i < deviceInfo.queueInfoCount; i++) {
for (uint32_t i = 0; i < deviceInfo.queueInfoCount; i++) {
queueCreateInfos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queueCreateInfos[i].flags = 0;
queueCreateInfos[i].queueCount = deviceInfo.queueInfos[i].queueCount;
@@ -49,7 +50,7 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
deviceCreateInfo.ppEnabledExtensionNames = vkGetGryphnDeviceExtensions(&deviceCreateInfo.enabledExtensionCount, deviceInfo.physicalDevice->physicalDevice->device);
device->outputDevice->enabledOversizedDescriptorPools = GN_FALSE;
for (int i = 0; i < deviceCreateInfo.enabledExtensionCount; i++)
for (uint32_t i = 0; i < deviceCreateInfo.enabledExtensionCount; i++)
if (strcmp(deviceCreateInfo.ppEnabledExtensionNames[i], VK_NV_DESCRIPTOR_POOL_OVERALLOCATION_EXTENSION_NAME) == 0) device->outputDevice->enabledOversizedDescriptorPools = GN_TRUE;
if (instance->hasDebugger)
@@ -66,7 +67,7 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
device->outputDevice->queues = malloc(sizeof(vulkanQueue) * deviceInfo.physicalDevice->physicalDevice->neededQueueCount);
uint32_t transferQueue = 0;
for (int i = 0; i < deviceInfo.physicalDevice->physicalDevice->neededQueueCount; i++) {
for (uint32_t i = 0; i < deviceInfo.physicalDevice->physicalDevice->neededQueueCount; i++) {
device->outputDevice->queues[i].queueInfo = deviceInfo.physicalDevice->physicalDevice->neededQueues[i];
vkGetDeviceQueue(device->outputDevice->device, deviceInfo.physicalDevice->physicalDevice->neededQueues[i].queueIndex, 0, &device->outputDevice->queues[i].queue);
@@ -109,7 +110,7 @@ void waitForDevice(const gnOutputDeviceHandle device) {
vkDeviceWaitIdle(device->outputDevice->device);
}
void destroyVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device) {
void destroyVulkanOutputDevice(gnOutputDeviceHandle device) {
vkDestroyFence(device->outputDevice->device, device->outputDevice->barrierFence, NULL);
gnDestroyVulkanBuffer(&device->outputDevice->stagingBuffer, device->outputDevice->device);
vkDestroyCommandPool(device->outputDevice->device, device->outputDevice->transferCommandPool, NULL);

2
projects/apis/vulkan/src/output_device/vulkan_output_devices.h
View File

@@ -32,4 +32,4 @@ void gnEndVulkanTransferOperation(gnDevice device, VkCommandBuffer commandBuffer
gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device, gnOutputDeviceInfo deviceInfo);
void waitForDevice(gnOutputDeviceHandle device);
void destroyVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device);
void destroyVulkanOutputDevice(gnOutputDeviceHandle device);

4
projects/core/src/output_device/gryphn_output_device.c
View File

@@ -11,7 +11,7 @@ gnReturnCode gnCreateOutputDevice(gnOutputDeviceHandle* outputDevice, gnInstance
void gnWaitForDevice(gnOutputDeviceHandle device) {
device->instance->callingLayer->deviceFunctions._gnWaitForDevice(device);
}
void gnDestroyOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device) {
device->instance->callingLayer->instanceFunctions._gnDestroyOutputDevice(instance, device);
void gnDestroyOutputDevice(gnOutputDeviceHandle device) {
device->instance->callingLayer->instanceFunctions._gnDestroyOutputDevice(device);
free(device);
}

2
projects/core/src/output_device/gryphn_output_device.h
View File

@@ -31,4 +31,4 @@ struct gnOutputDevice_t {
gnReturnCode gnCreateOutputDevice(gnOutputDeviceHandle* outputDevice, gnInstanceHandle instance, gnOutputDeviceInfo deviceInfo);
void gnWaitForDevice(gnOutputDeviceHandle device);
void gnDestroyOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device);
void gnDestroyOutputDevice(gnOutputDeviceHandle device);

2
projects/loader/src/gryphn_instance_functions.h
View File

@@ -27,7 +27,7 @@ typedef struct gnInstanceFunctions {
gnBool (*_gnPhysicalDeviceCanPresentToSurface)(gnPhysicalDevice device, gnWindowSurfaceHandle windowSurface);
gnReturnCode (*_gnCreateOutputDevice)(gnInstanceHandle instance, gnOutputDeviceHandle device, gnOutputDeviceInfo deviceInfo);
void (*_gnDestroyOutputDevice)(gnInstanceHandle handle, gnOutputDeviceHandle device);
void (*_gnDestroyOutputDevice)(gnOutputDeviceHandle device);
#ifdef GN_PLATFORM_LINUX
#ifdef GN_WINDOW_X11

4
projects/validation_layers/function_loader/src/instance_functions.c
View File

@@ -34,8 +34,8 @@ gnBool checkCanDevicePresent(gnPhysicalDevice device, gnWindowSurfaceHandle wind
gnReturnCode checkCreateOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device, gnOutputDeviceInfo deviceInfo) {
CHECK_FUNCTION_WITH_RETURN_CODE(instance, _gnCreateOutputDevice, instanceFunctions, instance, device, deviceInfo);
}
void checkDestroyOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device) {
CHECK_VOID_FUNCTION(device->instance, _gnDestroyOutputDevice, instanceFunctions, instance, device);
void checkDestroyOutputDevice(gnOutputDeviceHandle device) {
CHECK_VOID_FUNCTION(device->instance, _gnDestroyOutputDevice, instanceFunctions, device);
}
#ifdef GN_PLATFORM_MACOS

2
projects/validation_layers/function_loader/src/instance_functions.h
View File

@@ -9,7 +9,7 @@ gnPhysicalDevice* checkGetPhysicalDevices(gnInstanceHandle instance, uint32_t* c
gnBool checkCanDevicePresent(gnPhysicalDevice device, gnWindowSurfaceHandle windowSurface);
gnReturnCode checkCreateOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device, gnOutputDeviceInfo deviceInfo);
void checkDestroyOutputDevice(gnInstanceHandle instance, gnOutputDeviceHandle device);
void checkDestroyOutputDevice(gnOutputDeviceHandle device);
#ifdef GN_PLATFORM_MACOS
gnReturnCode checkCreateSurfaceMacOS(gnWindowSurfaceHandle windowSurface, gnInstanceHandle instance, gnMacOSWindowSurfaceInfo createInfo);