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

redo vulkan extensions

Browse Source
This commit is contained in:
Gregory Wells
2025-06-24 15:55:51 -04:00
parent 4ac82bf587
commit 17a9495a0a
2 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
projects/apis/vulkan/src/instance/vulkan_instance.c
View File

@@ -44,36 +44,19 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL vk_debuggerDebugCallback(
gnReturnCode createInstance(gnInstanceHandle instance, gnInstanceInfo instanceInfo) { gnReturnCode createInstance(gnInstanceHandle instance, gnInstanceInfo instanceInfo) {
instance->instance = malloc(sizeof(gnPlatformInstance)); instance->instance = malloc(sizeof(gnPlatformInstance));
#ifdef GN_PLATFORM_LINUX vkStringArrayList extensions = vkStringArrayListCreate();
gnBool isX11 = gnTrue; vkStringArrayListAdd(&extensions, "VK_KHR_surface");
uint32_t extensionCount = 3; vkStringArrayListReserve(&extensions, 5);
const char* extensions[3];
if (isX11) {
extensions[0] = "VK_KHR_xlib_surface";
extensions[1] = "VK_KHR_surface";
extensions[2] = VK_EXT_DEBUG_UTILS_EXTENSION_NAME;
} else {
extensions[0] = "VK_KHR_wayland_surface";
extensions[1] = "VK_KHR_surface";
extensions[2] = VK_EXT_DEBUG_UTILS_EXTENSION_NAME;
}
#endif
#ifdef GN_PLATFORM_WINDOWS
uint32_t extensionCount = 3;
const char* extensions[] = {
"VK_KHR_win32_surface",
"VK_KHR_surface",
VK_EXT_DEBUG_UTILS_EXTENSION_NAME
};
#endif
#ifdef GN_PLATFORM_MACOS #ifdef GN_PLATFORM_MACOS
uint32_t extensionCount = 4; vkStringArrayListAdd(&extensions, "VK_EXT_metal_surface");
const char* extensions[] = { vkStringArrayListAdd(&extensions, "VK_KHR_portability_enumeration");
"VK_KHR_portability_enumeration", #elif GN_PLATFORM_WINDOWS
"VK_EXT_metal_surface", vkStringArrayListAdd(&extensions, "VK_KHR_win32_surface");
"VK_KHR_surface", #elif GN_PLATFORM_LINUX
VK_EXT_DEBUG_UTILS_EXTENSION_NAME #ifdef GN_WINDOW_X11
}; vkStringArrayListAdd(&extensions, "VK_KHR_xlib_surface");
#endif
#endif #endif
@@ -86,19 +69,21 @@ gnReturnCode createInstance(gnInstanceHandle instance, gnInstanceInfo instanceIn
.apiVersion = VK_API_VERSION_1_3, .apiVersion = VK_API_VERSION_1_3,
}; };
VkInstanceCreateInfo createInfo = {}; VkInstanceCreateInfo createInfo = {
createInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
createInfo.pApplicationInfo = &appInfo; .flags = 0,
VkInstanceCreateFlags createFlags = 0; .pApplicationInfo = &appInfo
#ifdef GN_PLATFORM_MACOS };
createFlags |= VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
#endif
createInfo.flags = createFlags; #ifdef GN_PLATFORM_MACOS
createInfo.createFlags |= VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
#endif
if (instanceInfo.debugger != NULL) { if (instanceInfo.debugger != NULL) {
for (int i = 0; i < instanceInfo.debugger->info.layerCount; i++) { for (int i = 0; i < instanceInfo.debugger->info.layerCount; i++) {
if (instanceInfo.debugger->info.layers[i] == GN_DEBUGGER_LAYER_PLATFORM) { if (instanceInfo.debugger->info.layers[i] == GN_DEBUGGER_LAYER_PLATFORM) {
vkStringArrayListAdd(&extensions, VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
const char* validation_layers[1] = { "VK_LAYER_KHRONOS_validation" }; const char* validation_layers[1] = { "VK_LAYER_KHRONOS_validation" };
createInfo.enabledLayerCount = 1; createInfo.enabledLayerCount = 1;
createInfo.ppEnabledLayerNames = (const char*[]){ "VK_LAYER_KHRONOS_validation" }; createInfo.ppEnabledLayerNames = (const char*[]){ "VK_LAYER_KHRONOS_validation" };
@@ -118,8 +103,8 @@ gnReturnCode createInstance(gnInstanceHandle instance, gnInstanceInfo instanceIn
} }
createInfo.enabledExtensionCount = extensionCount; createInfo.enabledExtensionCount = extensions.count;
createInfo.ppEnabledExtensionNames = extensions; createInfo.ppEnabledExtensionNames = extensions.data;
VkResult result = vkCreateInstance(&createInfo, NULL, &instance->instance->vk_instance); VkResult result = vkCreateInstance(&createInfo, NULL, &instance->instance->vk_instance);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)

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

@@ -1,6 +1,7 @@
#pragma once #pragma once
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#include "instance/gryphn_instance.h" #include "instance/gryphn_instance.h"
#include "utils/lists/gryphn_array_list.h"
typedef struct gnPlatformInstance_t { typedef struct gnPlatformInstance_t {
VkInstance vk_instance; VkInstance vk_instance;
@@ -9,3 +10,7 @@ typedef struct gnPlatformInstance_t {
gnReturnCode createInstance(gnInstanceHandle instance, gnInstanceInfo instanceInfo); gnReturnCode createInstance(gnInstanceHandle instance, gnInstanceInfo instanceInfo);
void destroyInstance(gnInstanceHandle instance); void destroyInstance(gnInstanceHandle instance);
typedef const char* vkString;
GN_ARRAY_LIST(vkString);