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

C instance creation

Browse Source
This commit is contained in:
Greg Wells
2025-05-20 22:35:51 -04:00
parent a4166ae5c2
commit fa58a2f2d6
12 changed files with 150 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/gryphn/gryphn.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include <platform/gryphn_platform_include.h>
#include <core/init/gryphn_init.h>
#include <core/instance/init/gryphn_init.h>
#include <core/instance/gryphn_instance.h>
// #pragma once

2
include/gryphn/gryphn_utils.h
View File

@@ -17,4 +17,4 @@
// typedef float gnFloat;
// typedef size_t gnSize;
// #define GN_EXPORT extern "C"
#define GN_EXPORT extern "C"

1
rendering_api/metal/CMakeLists.txt
View File

@@ -1,4 +1,5 @@
set(CMAKE_EXPORT_COMPILE_COMMANDS on)
set(CMAKE_CXX_STANDARD 17)
project(GryphnMetalImpl)
file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS

19
rendering_api/metal/src/core/instance/metal_instance.cpp Normal file
View File

@@ -0,0 +1,19 @@
#include <gryphn/gryphn.h>
#include <gryphn/gryphn_utils.h>
// #include "bridge/metal_bridge.h"
#include "metal_instance.h"
GN_EXPORT gnReturnCode gnCreateInstanceFn(gnInstance* instance) {
if (instance->instance == nullptr) instance->instance = new gnPlatformInstance();
return GN_SUCCESS;
}
GN_EXPORT void gnDestroyInstanceFn(gnInstance& instance) {
}
GN_EXPORT gnReturnCode gnCreateMacOSWindowSurfaceFn(gnInstance& instance, NS::Window* window, NS::View* view) {
if (instance.instance == nullptr) instance.instance = new gnPlatformInstance();
instance.instance->metalContentView = view;
return GN_SUCCESS;
}

10
rendering_api/metal/src/core/instance/metal_instance.h Normal file
View File

@@ -0,0 +1,10 @@
#pragma once
#include <Metal/Metal.hpp>
#include <AppKit/AppKit.hpp>
struct GLFWwindow;
struct gnPlatformInstance {
NS::View* metalContentView;
MTL::RenderPipelineState* framebufferRenderer, *testSquareRenderer;
};

1
rendering_api/metal/src/core/metal_supports.cpp
View File

@@ -1,3 +1,4 @@
#include "utils/gryphn_bool.h"
#include <core/gryphn_support.h>
GN_EXPORT gnBool gnAPISupportsFn(gnFeature feature) {

95
rendering_api/vulkan/src/instance/vulkan_instance.cpp
View File

@@ -1,25 +1,24 @@
#include "gryphn/gryphn_utils.h"
#include "vector"
#include <cstring>
#include "debugger/vulkan_debugger.h"
// #include "debugger/vulkan_debugger.h"
#include "vulkan_instance.h"
// now I gotta do some shit to setup debug layers
bool checkValidationLayerSupport(gnList<gnString> layers_to_validate) {
bool checkValidationLayerSupport(std::vector<std::string> layers_to_validate) {
uint32_t layerCount;
vkEnumerateInstanceLayerProperties(&layerCount, nullptr);
std::vector<VkLayerProperties> availableLayers(layerCount);
vkEnumerateInstanceLayerProperties(&layerCount, availableLayers.data());
for (int i = 0; i < gnListLength(layers_to_validate); i++) {
gnString layerName = layers_to_validate[i];
for (int i = 0; i < layers_to_validate.size(); i++) {
bool layerFound = false;
for (const auto& layerProperties : availableLayers) {
if (strcmp(gnToCString(layerName), layerProperties.layerName) == 0) {
if (strcmp(layers_to_validate[i].c_str(), layerProperties.layerName) == 0) {
layerFound = true;
break;
}
@@ -32,24 +31,26 @@ bool checkValidationLayerSupport(gnList<gnString> layers_to_validate) {
return true;
}
void gnInstanceSetAppInfoFn(gnInstance& instance, gnAppInfo& info) {
if (instance.instance == nullptr) instance.instance = new gnPlatformInstanceData();
// void gnInstanceSetAppInfoFn(gnInstance& instance, gnInstanceInfo& info) {
// if (instance.instance == nullptr) instance.instance = new gnPlatformInstanceData();
instance.AppInfo = info;
instance.instance->appInfo = {};
instance.instance->appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
instance.instance->appInfo.pApplicationName = "Hello Triangle";
instance.instance->appInfo.applicationVersion = VK_MAKE_VERSION(1, 0, 0);
instance.instance->appInfo.pEngineName = "No Engine";
instance.instance->appInfo.engineVersion = VK_MAKE_VERSION(1, 0, 0);
instance.instance->appInfo.apiVersion = VK_API_VERSION_1_3;
}
// instance.AppInfo = info;
// instance.instance->appInfo = {};
// instance.instance->appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
// instance.instance->appInfo.pApplicationName = "Hello Triangle";
// instance.instance->appInfo.applicationVersion = VK_MAKE_VERSION(1, 0, 0);
// instance.instance->appInfo.pEngineName = "No Engine";
// instance.instance->appInfo.engineVersion = VK_MAKE_VERSION(1, 0, 0);
// instance.instance->appInfo.apiVersion = VK_API_VERSION_1_3;
// }
GN_EXPORT gnReturnCode gnCreateInstanceFn(gnInstance* instance) {
if (instance->debugger != nullptr && !checkValidationLayerSupport(instance->debugger->debug_layers)) {
return gnReturnError(GN_FAILED_CREATE_INSTANCE, "validation layers requested, but not available!");
}
gnInstanceSetAppInfoFn(*instance, instance->AppInfo);
GN_EXPORT gnReturnCode gnCreateInstanceFn(gnInstance* instance, gnInstanceInfo instanceInfo) {
instance->instance = new gnPlatformInstance();
// if (instance->debugger != nullptr && !checkValidationLayerSupport(instance->debugger->debug_layers)) {
// return gnReturnError(GN_FAILED_CREATE_INSTANCE, "validation layers requested, but not available!");
// }
// gnInstanceSetAppInfoFn(*instance, instance->AppInfo);
instance->valid = true;
@@ -72,46 +73,50 @@ GN_EXPORT gnReturnCode gnCreateInstanceFn(gnInstance* instance) {
instance->instance->extensions.push_back("VK_KHR_surface");
if (instance->debugger)
instance->instance->extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
// if (instance->debugger)
// instance->instance->extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
VkInstanceCreateInfo createInfo{};
VkApplicationInfo appInfo = {
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
.pApplicationName = gnToCString(instanceInfo.applicationName),
.applicationVersion = instanceInfo.applicationVersion,
.pEngineName = gnToCString(instanceInfo.engineName),
.engineVersion = instanceInfo.engineVersion,
.apiVersion = VK_API_VERSION_1_3,
};
VkInstanceCreateInfo createInfo = {};
createInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
createInfo.pApplicationInfo = &instance->instance->appInfo;
createInfo.pApplicationInfo = &appInfo;
createInfo.flags = VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
// auto extensions = getRequiredExtensions(instance->debugger);
createInfo.enabledExtensionCount = static_cast<uint32_t>(instance->instance->extensions.size());;
createInfo.ppEnabledExtensionNames = instance->instance->extensions.data();
VkDebugUtilsMessengerCreateInfoEXT debugCreateInfo{};
if (instance->debugger != nullptr) {
auto validation_layers = instance->debugger->debug_layers;
// VkDebugUtilsMessengerCreateInfoEXT debugCreateInfo{};
// if (instance->debugger != nullptr) {
// auto validation_layers = instance->debugger->debug_layers;
gnList<const char*> validation_layers_c = gnCreateList<const char*>();
for (int i = 0; i < gnListLength(validation_layers); i++)
gnListAdd(validation_layers_c, gnToCString(validation_layers[i]));
// gnList<const char*> validation_layers_c = gnCreateList<const char*>();
// for (int i = 0; i < gnListLength(validation_layers); i++)
// gnListAdd(validation_layers_c, gnToCString(validation_layers[i]));
createInfo.enabledLayerCount = static_cast<uint32_t>(gnListLength(validation_layers_c));
createInfo.ppEnabledLayerNames = gnListData(validation_layers_c);
// createInfo.enabledLayerCount = static_cast<uint32_t>(gnListLength(validation_layers_c));
// createInfo.ppEnabledLayerNames = gnListData(validation_layers_c);
populateDebugMessengerCreateInfo(debugCreateInfo);
createInfo.pNext = (VkDebugUtilsMessengerCreateInfoEXT*) &debugCreateInfo;
} else {
// populateDebugMessengerCreateInfo(debugCreateInfo);
// createInfo.pNext = (VkDebugUtilsMessengerCreateInfoEXT*) &debugCreateInfo;
// } else {
createInfo.enabledLayerCount = 0;
}
// }
if (vkCreateInstance(&createInfo, nullptr, &instance->instance->vk_instance) != VK_SUCCESS) {
return gnReturnError(GN_FAILED_CREATE_INSTANCE, "im to lazy to query vulkan why");
return GN_FAILED_CREATE_INSTANCE;
}
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;
// if (instance->debugger->debugger == nullptr) instance->debugger->debugger = new gnPlatformDebugger();
// instance->debugger->debugger->instance = &instance->instance->vk_instance;
return GN_SUCCESS;
}

3
rendering_api/vulkan/src/instance/vulkan_instance.h
View File

@@ -4,8 +4,9 @@
#ifdef GN_PLATFORM_MACOS
#include "vulkan_macos_bridge.h"
#endif
#include "vector"
struct gnPlatformInstanceData {
struct gnPlatformInstance {
VkInstance vk_instance;
VkApplicationInfo appInfo;
VkSurfaceKHR window_surface;

122
rendering_api/vulkan/src/instance/vulkan_surfance.cpp
View File

@@ -1,70 +1,70 @@
#include "vulkan_instance.h"
// #include "vulkan_instance.h"
#ifdef GN_PLATFORM_LINUX
#ifdef GN_WINDOW_X11
#include <vulkan/vulkan_xlib.h>
#include <X11/Xlib.h>
// #ifdef GN_PLATFORM_LINUX
// #ifdef GN_WINDOW_X11
// #include <vulkan/vulkan_xlib.h>
// #include <X11/Xlib.h>
GN_EXPORT gnReturnCode gnCreateX11WindowSurfaceFn(gnInstance& instance, Display* display, Window* window) {
VkXlibSurfaceCreateInfoKHR info{};
info.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
info.dpy = display;
info.window = window;
// GN_EXPORT gnReturnCode gnCreateX11WindowSurfaceFn(gnInstance& instance, Display* display, Window* window) {
// VkXlibSurfaceCreateInfoKHR info{};
// info.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
// info.dpy = display;
// info.window = window;
VkResult result = vkCreateXlibSurfaceKHR(instance.instance->vk_instance, &info, nullptr, &instance.instance->window_surface);
if (result != VK_SUCCESS)
return gnReturnError(GN_FAILED_TO_ATTACH_WINDOW, result);
return GN_SUCCESS;
}
#endif
// VkResult result = vkCreateXlibSurfaceKHR(instance.instance->vk_instance, &info, nullptr, &instance.instance->window_surface);
// if (result != VK_SUCCESS)
// return gnReturnError(GN_FAILED_TO_ATTACH_WINDOW, result);
// return GN_SUCCESS;
// }
// #endif
#ifdef GN_WINFDOW_WAYLAND
#include <vulkan/vulkan_wayland.h>
#include <wayland-client.h>
GN_EXPORT gnReturnCode gnCreateWaylandWindowSurfaceFn(gnInstance& instance, wl_display* display, wl_surface* surface) {
VkWaylandSurfaceCreateInfoKHR info{};
info.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR;
info.display = display;
info.surface = surface;
// #ifdef GN_WINFDOW_WAYLAND
// #include <vulkan/vulkan_wayland.h>
// #include <wayland-client.h>
// GN_EXPORT gnReturnCode gnCreateWaylandWindowSurfaceFn(gnInstance& instance, wl_display* display, wl_surface* surface) {
// VkWaylandSurfaceCreateInfoKHR info{};
// info.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR;
// info.display = display;
// info.surface = surface;
VkSurfaceKHR surface;
VkResult result = vkCreateWaylandSurfaceKHR(instance.instance->vk_instance, &info, nullptr, &instance.instance->window_surface);
if (result != VK_SUCCESS)
return gnReturnError(GN_FAILED_TO_ATTACH_WINDOW, result);
return GN_SUCCESS;
}
#endif
#endif
// VkSurfaceKHR surface;
// VkResult result = vkCreateWaylandSurfaceKHR(instance.instance->vk_instance, &info, nullptr, &instance.instance->window_surface);
// if (result != VK_SUCCESS)
// return gnReturnError(GN_FAILED_TO_ATTACH_WINDOW, result);
// return GN_SUCCESS;
// }
// #endif
// #endif
#ifdef GN_PLATFORM_WINDOWS
#include "vulkan/vulkan_win32.h"
GN_EXPORT gnReturnCode gnCreateWindowsWindowSurfaceFn(gnInstance& instance, HWND* window, HINSTANCE* instance) {
VkWin32SurfaceCreateInfoKHR info{};
info.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
info.hwnd = window;
info.hinstance = instance;
// #ifdef GN_PLATFORM_WINDOWS
// #include "vulkan/vulkan_win32.h"
// GN_EXPORT gnReturnCode gnCreateWindowsWindowSurfaceFn(gnInstance& instance, HWND* window, HINSTANCE* instance) {
// VkWin32SurfaceCreateInfoKHR info{};
// info.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
// info.hwnd = window;
// info.hinstance = instance;
VkSurfaceKHR surface;
VkResult result = vkCreateWin32SurfaceKHR(instance.instance->vk_instance, &info, nullptr, &instance.instance->window_surface);
if (result != VK_SUCCESS)
return gnReturnError(GN_FAILED_TO_ATTACH_WINDOW, result);
return GN_SUCCESS;
}
#endif
#include "vulkan/vulkan_metal.h"
// VkSurfaceKHR surface;
// VkResult result = vkCreateWin32SurfaceKHR(instance.instance->vk_instance, &info, nullptr, &instance.instance->window_surface);
// if (result != VK_SUCCESS)
// return gnReturnError(GN_FAILED_TO_ATTACH_WINDOW, result);
// return GN_SUCCESS;
// }
// #endif
// #include "vulkan/vulkan_metal.h"
#ifdef GN_PLATFORM_MACOS
GN_EXPORT gnReturnCode gnCreateMacOSWindowSurfaceFn(gnInstance& instance, NS::Window* window, NS::View* view) {
VkMetalSurfaceCreateInfoEXT surfaceCreateInfo = {};
surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT;
surfaceCreateInfo.pNext = nullptr;
surfaceCreateInfo.flags = 0;
surfaceCreateInfo.pLayer = macosBridge(window, view);
// #ifdef GN_PLATFORM_MACOS
// GN_EXPORT gnReturnCode gnCreateMacOSWindowSurfaceFn(gnInstance& instance, NS::Window* window, NS::View* view) {
// VkMetalSurfaceCreateInfoEXT surfaceCreateInfo = {};
// surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT;
// surfaceCreateInfo.pNext = nullptr;
// surfaceCreateInfo.flags = 0;
// surfaceCreateInfo.pLayer = macosBridge(window, view);
VkSurfaceKHR surface;
VkResult result = vkCreateMetalSurfaceEXT(instance.instance->vk_instance, &surfaceCreateInfo, nullptr, &instance.instance->window_surface);
if (result != VK_SUCCESS)
return gnReturnError(GN_FAILED_TO_ATTACH_WINDOW, result);
return GN_SUCCESS;
}
#endif
// VkSurfaceKHR surface;
// VkResult result = vkCreateMetalSurfaceEXT(instance.instance->vk_instance, &surfaceCreateInfo, nullptr, &instance.instance->window_surface);
// if (result != VK_SUCCESS)
// return gnReturnError(GN_FAILED_TO_ATTACH_WINDOW, result);
// return GN_SUCCESS;
// }
// #endif

1
src/core/instance/gryphn_instance.c
View File

@@ -6,6 +6,7 @@ gnReturnCode gnCreateInstance(gnInstance* instance, struct gnInstanceInfo_t info
if (!gnIsAPISupported(info.renderingAPI)) return GN_UNSUPPORTED_RENDERING_API;
instance->dynamicLib = gnLoadRenderingDLL(info.renderingAPI);
if (instance->dynamicLib == NULL) return GN_UNABLE_TO_LOAD_DYNAMIC_LIBARRY;
instance->functions = malloc(sizeof(struct gnFunctions_t));
gnLoadFunctions(instance->dynamicLib, instance->functions);
return instance->functions->_gnCreateInstance(instance, info);

2
src/platform/platform_macos/gryphn_platform_macos.c
View File

@@ -18,7 +18,7 @@ gnRenderingAPI* gnGetSupportedRenderingAPIs(int* count) {
struct gnDynamicLibrary_t* gnLoadDynamicLibrary(const gnString path) {
struct gnDynamicLibrary_t* dll = malloc(sizeof(struct gnDynamicLibrary_t));
dll->dllPtr = dlopen(gnToCString(gnCombineStrings(path, ".dylib")), RTLD_LAZY),
dll->isValid = true
dll->isValid = true;
if (dll->dllPtr == NULL) dll->isValid = false;
return dll;
}

4
src/utils/gryphn_error_code.h
View File

@@ -4,7 +4,8 @@ typedef enum gnReturnCode_t {
GN_SUCCESS,
GN_UNKNOWN_RENDERINGAPI,
GN_UNSUPPORTED_RENDERING_API,
GN_UNABLE_TO_LOAD_DYNAMIC_LIBARRY
GN_UNABLE_TO_LOAD_DYNAMIC_LIBARRY,
GN_FAILED_CREATE_INSTANCE
// GN_UNKNOWN_ERROR,
// GN_UNKNOWN_FRAMEBUFFER_ATTACHMENT,
@@ -19,7 +20,6 @@ typedef enum gnReturnCode_t {
// GN_FAILED_CREATE_PRESENTATION_QUEUE,
// GN_FAILED_TO_CREATE_FRAMEBUFFER,
// GN_FAILED_CREATE_RENDERPASS,
// GN_FAILED_CREATE_INSTANCE,
// GN_FAILED_TO_ATTACH_WINDOW,
// GN_FAILED_TO_CREATE_IMAGE
} gnReturnCode;