start using C based classes

This commit is contained in:
Greg Wells
2025-05-20 12:02:44 -04:00
parent daef5e4858
commit 74689a86ef
10 changed files with 213 additions and 113 deletions

View File

@@ -105,6 +105,11 @@ GN_EXPORT gnReturnCode gnCreateInstanceFn(gnInstance* instance) {
return gnReturnError(GN_FAILED_CREATE_INSTANCE, "im to lazy to query vulkan why");
}
uint32_t deviceCount;
vkEnumeratePhysicalDevices(instance->instance->vk_instance, &deviceCount, nullptr);
if (deviceCount == 0)
return gnReturnError(GN_FAILED_CREATE_INSTANCE, "no devices support vulkan");
if (instance->debugger->debugger == nullptr) instance->debugger->debugger = new gnPlatformDebugger();
instance->debugger->debugger->instance = &instance->instance->vk_instance;
return GN_SUCCESS;

View File

@@ -13,7 +13,7 @@ GN_EXPORT gnReturnCode gnCreateX11WindowSurfaceFn(gnInstance& instance, Display*
VkResult result = vkCreateXlibSurfaceKHR(instance.instance->vk_instance, &info, nullptr, &instance.instance->window_surface);
if (result != VK_SUCCESS)
return gnReturnError(GN_FAILED_CREATE_WINDOW_SURFACE, result);
return gnReturnError(GN_FAILED_TO_ATTACH_WINDOW, result);
return GN_SUCCESS;
}
#endif
@@ -30,7 +30,7 @@ GN_EXPORT gnReturnCode gnCreateWaylandWindowSurfaceFn(gnInstance& instance, wl_d
VkSurfaceKHR surface;
VkResult result = vkCreateWaylandSurfaceKHR(instance.instance->vk_instance, &info, nullptr, &instance.instance->window_surface);
if (result != VK_SUCCESS)
return gnReturnError(GN_FAILED_CREATE_WINDOW_SURFACE, result);
return gnReturnError(GN_FAILED_TO_ATTACH_WINDOW, result);
return GN_SUCCESS;
}
#endif
@@ -47,7 +47,7 @@ GN_EXPORT gnReturnCode gnCreateWindowsWindowSurfaceFn(gnInstance& instance, HWND
VkSurfaceKHR surface;
VkResult result = vkCreateWin32SurfaceKHR(instance.instance->vk_instance, &info, nullptr, &instance.instance->window_surface);
if (result != VK_SUCCESS)
return gnReturnError(GN_FAILED_CREATE_WINDOW_SURFACE, result);
return gnReturnError(GN_FAILED_TO_ATTACH_WINDOW, result);
return GN_SUCCESS;
}
#endif
@@ -55,10 +55,6 @@ GN_EXPORT gnReturnCode gnCreateWindowsWindowSurfaceFn(gnInstance& instance, HWND
#ifdef GN_PLATFORM_MACOS
GN_EXPORT gnReturnCode gnCreateMacOSWindowSurfaceFn(gnInstance& instance, NS::Window* window, NS::View* view) {
// VkMacOSSurfaceCreateInfoMVK info{};
// info.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK;
// info.pView = (void*)view;
VkMetalSurfaceCreateInfoEXT surfaceCreateInfo = {};
surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT;
surfaceCreateInfo.pNext = nullptr;
@@ -68,7 +64,7 @@ GN_EXPORT gnReturnCode gnCreateMacOSWindowSurfaceFn(gnInstance& instance, NS::Wi
VkSurfaceKHR surface;
VkResult result = vkCreateMetalSurfaceEXT(instance.instance->vk_instance, &surfaceCreateInfo, nullptr, &instance.instance->window_surface);
if (result != VK_SUCCESS)
return gnReturnError(GN_FAILED_CREATE_WINDOW_SURFACE, result);
return gnReturnError(GN_FAILED_TO_ATTACH_WINDOW, result);
return GN_SUCCESS;
}
#endif

View File

@@ -5,37 +5,24 @@
#include "vulkan_output_devices.h"
#include "presentation_queue/vulkan_swapchain.h"
// gnPhysicalOutputDevice::gnPhysicalOutputDevice() {
// physicalOutputDevice = new gnPlatformPhysicalOutputDevice();
// }
GN_EXPORT gnPhysicalOutputDevice* gnGetPhysicalOutputDevicesFn(const gnInstance& instance, uint32_t* deviceCount) {
vkEnumeratePhysicalDevices(instance.instance->vk_instance, deviceCount, nullptr);
if (deviceCount == 0)
return nullptr;
GN_EXPORT gnList<gnPhysicalOutputDevice> gnGetPhysicalOutputDevicesFn(const gnInstance& instance) {
uint32_t deviceCount = 0;
vkEnumeratePhysicalDevices(instance.instance->vk_instance, &deviceCount, nullptr);
std::vector<VkPhysicalDevice> devices(*deviceCount);
vkEnumeratePhysicalDevices(instance.instance->vk_instance, deviceCount, devices.data());
if (deviceCount == 0) {
// throw std::runtime_error("failed to find any physical devices");
// TODO: why am I error checking for myself I can read the size of a list can't I
return gnCreateList<gnPhysicalOutputDevice>();
}
gnPhysicalOutputDevice* outputDevices = (gnPhysicalOutputDevice*)malloc(sizeof(gnPhysicalOutputDevice) * *deviceCount);
std::vector<VkPhysicalDevice> devices(deviceCount);
vkEnumeratePhysicalDevices(instance.instance->vk_instance, &deviceCount, devices.data());
gnList<gnPhysicalOutputDevice> outputDevices = gnCreateList<gnPhysicalOutputDevice>();
for (int i = 0; i < deviceCount; i++) {
gnPhysicalOutputDevice newOutputDevice = gnPhysicalOutputDevice();
newOutputDevice.physicalOutputDevice = new gnPlatformPhysicalOutputDevice();
newOutputDevice.physicalOutputDevice->device = devices[i];
newOutputDevice.physicalOutputDevice->instance = const_cast<gnInstance*>(&instance);
for (int i = 0; i < *deviceCount; i++) {
outputDevices[i].physicalOutputDevice = new gnPlatformPhysicalOutputDevice();
outputDevices[i].physicalOutputDevice->device = devices[i];
outputDevices[i].physicalOutputDevice->instance = const_cast<gnInstance*>(&instance);
VkPhysicalDeviceProperties deviceProperties;
vkGetPhysicalDeviceProperties(devices[i], &deviceProperties);
newOutputDevice.outputDeviceName = gnCreateString(deviceProperties.deviceName);
gnListAdd(outputDevices, newOutputDevice);
outputDevices[i].outputDeviceName = gnCreateString(deviceProperties.deviceName);
}
return outputDevices;