Compare commits

..

9 Commits

Author SHA1 Message Date
Gregory Wells eaf3bcb290 create vulkan swapchain 2026-05-25 18:14:40 -04:00
Gregory Wells 629036542a make gryphn create all queue familes 2026-05-25 18:03:38 -04:00
Gregory Wells fb2aa8504f create graphics queue for vulkan 2026-05-25 14:09:02 -04:00
Gregory Wells 0eff3c62ee get vulkan functions up and running 2026-05-25 12:52:56 -04:00
Gregory Wells 587f3cd224 make vulkan enable swapchain extension 2026-05-25 12:37:52 -04:00
Gregory Wells dd3c50be07 redo folder structure 2026-05-25 12:27:10 -04:00
Gregory Wells a252a9cf6b fix crash from junk data 2026-05-25 12:13:25 -04:00
Gregory Wells 96ddecda52 final vulkn functions 2026-05-25 11:45:21 -04:00
Gregory Wells f86d6b9a54 redo code and add xlib surface loader interface 2026-05-25 09:16:17 -04:00
26 changed files with 483 additions and 59 deletions
+2
View File
@@ -11,8 +11,10 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
# Add subdirectories # Add subdirectories
add_subdirectory(GryphnLoader) add_subdirectory(GryphnLoader)
if (APPLE) if (APPLE)
add_compile_definitions(GN_USE_SURFACE_COCOA)
add_subdirectory(apis/GryphnMetal) add_subdirectory(apis/GryphnMetal)
endif() endif()
if (UNIX) if (UNIX)
add_compile_definitions(GN_USE_SURFACE_XLIB)
add_subdirectory(apis/GryphnVulkan) add_subdirectory(apis/GryphnVulkan)
endif() endif()
@@ -21,6 +21,7 @@ typedef enum gnFormat {
typedef enum gnColorSpace { typedef enum gnColorSpace {
GN_COLOR_SPACE_SRGB_NONLINEAR = 0, GN_COLOR_SPACE_SRGB_NONLINEAR = 0,
GN_COLOR_SPACE_UNKNOWN = 1
} gnColorSpace; } gnColorSpace;
typedef struct gnSurfaceFormat { typedef struct gnSurfaceFormat {
@@ -5,4 +5,5 @@ typedef enum gnPresentMode {
GN_PRESENT_MODE_MAILBOX = 1, GN_PRESENT_MODE_MAILBOX = 1,
GN_PRESENT_MODE_FIFO = 2, GN_PRESENT_MODE_FIFO = 2,
GN_PRESENT_MODE_FIFO_RELAXED = 3, GN_PRESENT_MODE_FIFO_RELAXED = 3,
GN_PRESENT_MODE_UNKNOWN = 4
} gnPresentMode; } gnPresentMode;
@@ -1,6 +1,5 @@
#include "gryphn_device.h" #include "gryphn_device.h"
#include "instance/gryphn_instance.h" #include "instance/gryphn_instance.h"
#include "stdio.h"
#include "stdlib.h" #include "stdlib.h"
gnReturnCode gnCreateDevice(gnInstance instance, gnDeviceCreateInfo* createInfo, gnDevice* device) { gnReturnCode gnCreateDevice(gnInstance instance, gnDeviceCreateInfo* createInfo, gnDevice* device) {
@@ -0,0 +1,10 @@
#include "gryphn_swapchain.h"
#include "gryphn_return_code.h"
#include <device/gryphn_device.h>
gnReturnCode gnCreateSwapchain(gnDevice device, gnSwapchainCreateInfo* createInfo, gnSwapchain* swapchain) {
return device->dispatchTable.createSwapchain(device, createInfo, swapchain);
}
gnReturnCode gnDestroySwapchain(gnDevice device, gnSwapchain* swapchain) {
return device->dispatchTable.destroySwapchain(device, swapchain);
}
@@ -0,0 +1,20 @@
#pragma once
#include <gryphn_handle.h>
#include "core/gryphn_format.h"
#include "core/gryphn_present_mode.h"
#include "core/gryphn_vec2d.h"
#include "gryphn_return_code.h"
#include "stdint.h"
typedef struct gnSwapchainCreateInfo {
gnSurface surface;
uint32_t minImageCount;
gnFormat imageFormat;
gnColorSpace imageColorSpace;
gnExtent2D imageExtent;
uint32_t imageArrayLayers;
gnPresentMode presentMode;
} gnSwapchainCreateInfo;
gnReturnCode gnCreateSwapchain(gnDevice device, gnSwapchainCreateInfo* createInfo, gnSwapchain* swapchain);
gnReturnCode gnDestroySwapchain(gnDevice device, gnSwapchain* swapchain);
@@ -1,11 +1,11 @@
#pragma once #pragma once
#ifdef GN_USE_SURFACE_COCOA
#include "gryphn_handle.h" #include "gryphn_handle.h"
#include "gryphn_return_code.h" #include "gryphn_return_code.h"
#ifndef GN_CA_METAL_LAYER #import <QuartzCore/CAMetalLayer.h>
typedef struct CAMetalLayer CAMetalLayer;
#endif
typedef struct gnMetalSurfaceCreateInfo { typedef struct gnMetalSurfaceCreateInfo {
CAMetalLayer* metalLayer; CAMetalLayer* metalLayer;
} gnMetalSurfaceCreateInfo; } gnMetalSurfaceCreateInfo;
gnReturnCode gnCreateMetalSurface(gnInstance instance, gnMetalSurfaceCreateInfo* createInfo, gnSurface* surface); gnReturnCode gnCreateMetalSurface(gnInstance instance, gnMetalSurfaceCreateInfo* createInfo, gnSurface* surface);
#endif
@@ -1,5 +1,8 @@
#pragma once #pragma once
#include "gryphn_metal_surface.h" #include "gryphn_metal_surface.h"
#include "gryphn_xlib_surface.h"
#include "gryphn_return_code.h"
#include "gryphn_handle.h"
#include "core/gryphn_vec2d.h" #include "core/gryphn_vec2d.h"
#include "core/gryphn_format.h" #include "core/gryphn_format.h"
#include "core/gryphn_present_mode.h" #include "core/gryphn_present_mode.h"
@@ -0,0 +1,6 @@
#include "gryphn_xlib_surface.h"
#include "instance/gryphn_instance.h"
gnReturnCode gnCreateXlibSurface(gnInstance instance, gnXlibSurfaceCreateInfo* createInfo, gnSurface* surface) {
return instance->dispatchTable.createXlibSurface(instance, createInfo, surface);
}
@@ -0,0 +1,13 @@
#pragma once
#ifdef GN_USE_SURFACE_XLIB
#include "gryphn_handle.h"
#include "gryphn_return_code.h"
#include "X11/Xlib.h"
typedef struct gnXlibSurfaceCreateInfo {
Display* dpy;
Window window;
} gnXlibSurfaceCreateInfo;
gnReturnCode gnCreateXlibSurface(gnInstance instance, gnXlibSurfaceCreateInfo* createInfo, gnSurface* surface);
#endif
+5 -3
View File
@@ -1,7 +1,9 @@
#pragma once #pragma once
typedef enum gnReturnCode { typedef enum gnReturnCode {
GN_SUCCESS, GN_SUCCESS = 0,
GN_FAILED_TO_FIND_LIBARY, GN_FAILED_TO_FIND_LIBARY = 1,
GN_UNSUPPORTED_BACKEND GN_UNSUPPORTED_BACKEND = 2,
GN_EXTENSION_NOT_PRESENT = 3,
GN_UNSUPPOTED_SURFACE
} gnReturnCode; } gnReturnCode;
@@ -1,8 +1,13 @@
#pragma once #pragma once
#include "gryphn_handle.h" #include "gryphn_handle.h"
typedef struct gnSwapchainCreateInfo gnSwapchainCreateInfo;
typedef gnReturnCode (*PFN_gnDestroyDevice)(gnDevice); typedef gnReturnCode (*PFN_gnDestroyDevice)(gnDevice);
typedef gnReturnCode (*PFN_gnCreateSwapchain)(gnDevice, gnSwapchainCreateInfo*, gnSwapchain*);
typedef gnReturnCode (*PFN_gnDestroySwapchain)(gnDevice, gnSwapchain*);
typedef struct gnDeviceDispatchTable { typedef struct gnDeviceDispatchTable {
PFN_gnDestroyDevice destroyDevice; PFN_gnDestroyDevice destroyDevice;
PFN_gnCreateSwapchain createSwapchain;
PFN_gnDestroySwapchain destroySwapchain;
} gnDeviceDispatchTable; } gnDeviceDispatchTable;
@@ -3,11 +3,13 @@
#include "core/gryphn_format.h" #include "core/gryphn_format.h"
#include "core/gryphn_present_mode.h" #include "core/gryphn_present_mode.h"
typedef struct gnMetalSurfaceCreateInfo gnMetalSurfaceCreateInfo; typedef struct gnMetalSurfaceCreateInfo gnMetalSurfaceCreateInfo;
typedef struct gnXlibSurfaceCreateInfo gnXlibSurfaceCreateInfo;
typedef struct gnSurfaceCapabilities gnSurfaceCapabilities; typedef struct gnSurfaceCapabilities gnSurfaceCapabilities;
typedef struct gnPhysicalDeviceProperties gnPhysicalDeviceProperties; typedef struct gnPhysicalDeviceProperties gnPhysicalDeviceProperties;
typedef struct gnDeviceCreateInfo gnDeviceCreateInfo; typedef struct gnDeviceCreateInfo gnDeviceCreateInfo;
typedef gnReturnCode (*PFN_gnCreateMetalSurface)(gnInstance, gnMetalSurfaceCreateInfo*, gnSurface*); typedef gnReturnCode (*PFN_gnCreateMetalSurface)(gnInstance, gnMetalSurfaceCreateInfo*, gnSurface*);
typedef gnReturnCode (*PFN_gnCreateXlibSurface)(gnInstance, gnXlibSurfaceCreateInfo*, gnSurface*);
typedef gnReturnCode (*PFN_enumeratePhysicalDevices)(gnInstance, uint32_t*, gnPhysicalDevice*); typedef gnReturnCode (*PFN_enumeratePhysicalDevices)(gnInstance, uint32_t*, gnPhysicalDevice*);
typedef gnReturnCode (*PFN_gnGetPhysicalDeviceProperties)(gnPhysicalDevice, gnPhysicalDeviceProperties*); typedef gnReturnCode (*PFN_gnGetPhysicalDeviceProperties)(gnPhysicalDevice, gnPhysicalDeviceProperties*);
typedef gnReturnCode (*PFN_gnCreateDevice)(gnInstance, gnDeviceCreateInfo*, gnDevice); typedef gnReturnCode (*PFN_gnCreateDevice)(gnInstance, gnDeviceCreateInfo*, gnDevice);
@@ -19,6 +21,7 @@ typedef gnReturnCode (*PFN_gnDestroyInstance)(gnInstance);
typedef struct gnInstanceDispatchTable { typedef struct gnInstanceDispatchTable {
PFN_gnCreateMetalSurface createMetalSurface; PFN_gnCreateMetalSurface createMetalSurface;
PFN_gnCreateXlibSurface createXlibSurface;
PFN_gnGetSurfaceCapabilities getSurfaceCapabilities; PFN_gnGetSurfaceCapabilities getSurfaceCapabilities;
PFN_gnGetSurfaceFormats getSurfaceFormats; PFN_gnGetSurfaceFormats getSurfaceFormats;
PFN_gnGetSurfacePresentModes getSurfacePresentModes; PFN_gnGetSurfacePresentModes getSurfacePresentModes;
@@ -6,7 +6,7 @@
#include "stdint.h" #include "stdint.h"
#include "device/gryphn_physical_device.h" #include "device/gryphn_physical_device.h"
#include "device/gryphn_device.h" #include "device/gryphn_device.h"
#include "surface/gryphn_surface.h" #include "ext/instance/surface/gryphn_surface.h"
gnReturnCode metalEnumeratePhysicalDevices(gnInstance instance, uint32_t* deviceCount, gnPhysicalDevice* devices); gnReturnCode metalEnumeratePhysicalDevices(gnInstance instance, uint32_t* deviceCount, gnPhysicalDevice* devices);
gnReturnCode metalGetPhysicalDeviceProperties(gnPhysicalDevice device, gnPhysicalDeviceProperties* properties); gnReturnCode metalGetPhysicalDeviceProperties(gnPhysicalDevice device, gnPhysicalDeviceProperties* properties);
@@ -0,0 +1,99 @@
#include "core/gryphn_format.h"
#include "core/gryphn_present_mode.h"
#include "gryphn_return_code.h"
#include "../vulkan_functions.h"
#include <vulkan/vulkan_core.h>
#include "instance/gryphn_instance.h"
#include "ext/instance/surface/gryphn_surface.h"
#include "../vulkan_helpers.h"
#include "stdlib.h"
#include <stdio.h>
#ifdef GN_USE_SURFACE_XLIB
#include <vulkan/vulkan_xlib.h>
#endif
gnReturnCode vulkanCreateXlibSurface(gnInstance instance, gnXlibSurfaceCreateInfo* info, gnSurface* surface) {
#ifdef GN_USE_SURFACE_XLIB
VkXlibSurfaceCreateInfoKHR createInfo = {
.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR,
.pNext = 0,
.flags = 0,
.dpy = info->dpy,
.window = info->window
};
return vulkanCodeToGryphnCode(vkCreateXlibSurfaceKHR(instance->internalData, &createInfo, NULL, (VkSurfaceKHR*)surface));
#else
return GN_SUCCESS;
#endif
}
gnReturnCode vulkanGetSurfaceCapabilities(gnPhysicalDevice device, gnSurface surface, gnSurfaceCapabilities* capabilities) {
VkSurfaceCapabilitiesKHR vulkanCapabilities;
VkResult result = vkGetPhysicalDeviceSurfaceCapabilitiesKHR(device->internalData, surface, &vulkanCapabilities);
*capabilities = (gnSurfaceCapabilities){
.minImageCount = vulkanCapabilities.minImageCount,
.maxImageCount = vulkanCapabilities.maxImageCount,
.currentExtent = { vulkanCapabilities.currentExtent.width, vulkanCapabilities.currentExtent.height },
.minImageExtent = { vulkanCapabilities.maxImageExtent.width, vulkanCapabilities.maxImageExtent.height },
.maxImageExtent = { vulkanCapabilities.maxImageExtent.width, vulkanCapabilities.maxImageExtent.height },
.maxImageArrayLayers = vulkanCapabilities.maxImageArrayLayers
};
return vulkanCodeToGryphnCode(result);
}
gnReturnCode vulkanGetSurfaceFormats(gnPhysicalDevice device, gnSurface surface, uint32_t* formatCount, gnSurfaceFormat* formats) {
*formatCount = 0;
uint32_t internal_formatCout;
gnReturnCode result = vulkanCodeToGryphnCode(vkGetPhysicalDeviceSurfaceFormatsKHR(device->internalData, surface, &internal_formatCout, NULL));
if (result != GN_SUCCESS) {
*formatCount = internal_formatCout;
return result;
}
VkSurfaceFormatKHR* internal_formats = malloc(sizeof(VkSurfaceFormatKHR) * internal_formatCout);
result = vulkanCodeToGryphnCode(vkGetPhysicalDeviceSurfaceFormatsKHR(device->internalData, surface, &internal_formatCout, internal_formats));
if (result != GN_SUCCESS) {
free(internal_formats);
*formatCount = internal_formatCout;
return result;
}
for (int i = 0; i < internal_formatCout; i++) {
gnSurfaceFormat format = {
.format = vulkanFormatToGryphnFormat(internal_formats[i].format),
.colorSpace = vulkanColorSpaceToGryphnColorSpace(internal_formats[i].colorSpace)
};
if ((format.format == GN_FORMAT_UNDEFINED && internal_formats[i].format != VK_FORMAT_UNDEFINED) || format.colorSpace == GN_COLOR_SPACE_UNKNOWN)
continue;
if (formats != NULL)
formats[*formatCount] = format;
(*formatCount)++;
}
free(internal_formats);
return GN_SUCCESS;
}
gnReturnCode vulkanGetSurfacePresentModes(gnPhysicalDevice device, gnSurface surface, uint32_t* presentModeCount, gnPresentMode* presentModes) {
*presentModeCount = 0;
uint32_t internal_presentModeCount;
gnReturnCode result = vulkanCodeToGryphnCode(vkGetPhysicalDeviceSurfacePresentModesKHR(device->internalData, surface, &internal_presentModeCount, NULL));
if (result != GN_SUCCESS) {
*presentModeCount = internal_presentModeCount;
return result;
}
VkPresentModeKHR* internal_presentModes = malloc(sizeof(VkPresentModeKHR) * internal_presentModeCount);
result = vulkanCodeToGryphnCode(vkGetPhysicalDeviceSurfacePresentModesKHR(device->internalData, surface, &internal_presentModeCount, NULL));
if (result != GN_SUCCESS) {
free(internal_presentModes);
*presentModeCount = internal_presentModeCount;
return result;
}
for (int i = 0; i < internal_presentModeCount; i++) {
gnPresentMode mode = vulkanPresentModeToGryphnPresentMode(internal_presentModes[i]);
if (mode == GN_PRESENT_MODE_UNKNOWN) continue;
if (presentModes != NULL)
presentModes[*presentModeCount] = mode;
(*presentModeCount)++;
}
free(internal_presentModes);
return GN_SUCCESS;
}
gnReturnCode vulkanDestroySurface(gnInstance instance, gnSurface* surface) {
vkDestroySurfaceKHR(instance->internalData, *surface, NULL);
return GN_SUCCESS;
}
@@ -0,0 +1,61 @@
#include "../vulkan_functions.h"
#include "gryphn_handle.h"
#include "gryphn_return_code.h"
#include "ext/device/swapchain/gryphn_swapchain.h"
#include "../vulkan_helpers.h"
#include "../vulkan_device.h"
#include <vulkan/vulkan_core.h>
typedef struct vulkanSwapchain {
uint32_t presentQueueIndex;
VkQueue presentQueue;
} vulkanSwapchain;
gnReturnCode vulkanCreateSwapchain(gnDevice device, gnSwapchainCreateInfo* info, gnSwapchain* swapchain) {
uint32_t presentQueueIndex;
VkBool32 presentSupport = VK_FALSE;
for (int i = 0; i < ((vulkanDevice*)device->internalData)->queueCount; i++) {
vkGetPhysicalDeviceSurfaceSupportKHR(((vulkanDevice*)device->internalData)->physicalDevice, i, info->surface, &presentSupport);
if (presentSupport == VK_TRUE) {
presentQueueIndex = i;
break;
}
}
if (presentSupport == VK_FALSE) return GN_UNSUPPOTED_SURFACE;
VkSurfaceCapabilitiesKHR capabilities;
vkGetPhysicalDeviceSurfaceCapabilitiesKHR(((vulkanDevice*)device->internalData)->physicalDevice, info->surface, &capabilities);
VkSwapchainCreateInfoKHR createInfo = {
.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR,
.pNext = NULL,
.flags = 0,
.surface = info->surface,
.minImageCount = info->minImageCount,
.imageFormat = gryphnFormatToVulkanFormat(info->imageFormat),
.imageColorSpace = gryphnColorSpaceToVulkanColorSpace(info->imageColorSpace),
.imageExtent = { info->imageExtent.width, info->imageExtent.height },
.imageArrayLayers = info->imageArrayLayers,
.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE,
.queueFamilyIndexCount = 0,
.pQueueFamilyIndices = NULL,
.preTransform = capabilities.currentTransform,
.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR,
.presentMode = gryphnPresentModeToVulkanPresentMode(info->presentMode),
.clipped = VK_TRUE,
.oldSwapchain = NULL,
};
if (((vulkanDevice*)device->internalData)->graphicsQueueIndex != presentQueueIndex) {
createInfo.imageSharingMode = VK_SHARING_MODE_CONCURRENT;
createInfo.queueFamilyIndexCount = 2;
createInfo.pQueueFamilyIndices = (uint32_t[]){((vulkanDevice*)device->internalData)->graphicsQueueIndex, presentQueueIndex};
}
return vulkanCodeToGryphnCode(vkCreateSwapchainKHR(((vulkanDevice*)device->internalData)->device, &createInfo, NULL, (VkSwapchainKHR*)swapchain));
}
gnReturnCode vulkanDestroySwapchain(gnDevice device, gnSwapchain* swapchain) {
vkDestroySwapchainKHR(((vulkanDevice*)device->internalData)->device, *((VkSwapchainKHR*)swapchain), NULL);
return GN_SUCCESS;
}
+15 -22
View File
@@ -1,17 +1,10 @@
#include "stdio.h"
#include "instance/gryphn_instance.h" #include "instance/gryphn_instance.h"
#include "gryphn_handle.h" #include "gryphn_handle.h"
#include "stdlib.h" #include "stdlib.h"
#include <vulkan/vulkan_core.h> #include <vulkan/vulkan_core.h>
#include "vulkan_functions.h" #include "vulkan_functions.h"
#include "vulkan_helpers.h"
gnReturnCode vulkanCodeToGryphnCode(VkResult result) { #include "string.h"
if (result != VK_SUCCESS) {
printf("Unknown instance fail mr gregory please diagnose this: %u", result);
return GN_FAILED_TO_FIND_LIBARY;
}
return GN_SUCCESS;
}
uint32_t gnInternalIsApiSupported(gnVersion gryphnVersion) { uint32_t gnInternalIsApiSupported(gnVersion gryphnVersion) {
if (gryphnVersion != gnCreateVersion(1, 0, 0)) return 0; if (gryphnVersion != gnCreateVersion(1, 0, 0)) return 0;
@@ -58,7 +51,19 @@ gnReturnCode initBackend(gnInstance instance, gnInstanceCreateInfo* info) {
const char** extensions = malloc(sizeof(const char*) * info->enabledExtensionCount); const char** extensions = malloc(sizeof(const char*) * info->enabledExtensionCount);
int realEnabledExtensionCount = 0; int realEnabledExtensionCount = 0;
for (int i = 0; i < info->enabledExtensionCount; i++) { for (int i = 0; i < info->enabledExtensionCount; i++) {
// zero supported vulkan extensions right now if (strcmp(info->enabledExtensions[i], "GN_EXT_surface") == 0) {
extensions[realEnabledExtensionCount] = "VK_KHR_surface";
realEnabledExtensionCount++;
instance->dispatchTable.destroySurface = vulkanDestroySurface;
instance->dispatchTable.getSurfaceCapabilities = vulkanGetSurfaceCapabilities;
instance->dispatchTable.getSurfaceFormats = vulkanGetSurfaceFormats;
instance->dispatchTable.getSurfacePresentModes = vulkanGetSurfacePresentModes;
}
if (strcmp(info->enabledExtensions[i], "GN_EXT_surface_xlib") == 0) {
extensions[realEnabledExtensionCount] = "VK_KHR_xlib_surface";
realEnabledExtensionCount++;
instance->dispatchTable.createXlibSurface = vulkanCreateXlibSurface;
}
} }
VkInstanceCreateInfo createInfo = { VkInstanceCreateInfo createInfo = {
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
@@ -76,18 +81,6 @@ gnReturnCode initBackend(gnInstance instance, gnInstanceCreateInfo* info) {
instance->dispatchTable.getPhysicalDeviceProperties = vulkanGetPhysicalDeviceProperties; instance->dispatchTable.getPhysicalDeviceProperties = vulkanGetPhysicalDeviceProperties;
instance->dispatchTable.createDevice = vulkanCreateDevice; instance->dispatchTable.createDevice = vulkanCreateDevice;
// for (int i = 0; i < info->enabledExtensionCount; i++) {
// if (strcmp(info->enabledExtensions[i], "GN_EXT_surface") == 0) {
// instance->dispatchTable.destroySurface = metalDestroySurface;
// instance->dispatchTable.getSurfaceCapabilities = metalGetSurfaceCapabilities;
// instance->dispatchTable.getSurfaceFormats = metalGetSurfaceFormats;
// instance->dispatchTable.getSurfacePresentModes = metalGetSurfacePresentModes;
// }
// if (strcmp(info->enabledExtensions[i], "GN_EXT_surface_cocoa") == 0) {
// instance->dispatchTable.createMetalSurface = metalCreateSurface;
// }
// }
VkInstance vulkanInstance; VkInstance vulkanInstance;
VkResult result = vkCreateInstance(&createInfo, NULL, &vulkanInstance); VkResult result = vkCreateInstance(&createInfo, NULL, &vulkanInstance);
instance->internalData = vulkanInstance; instance->internalData = vulkanInstance;
+45 -8
View File
@@ -5,7 +5,9 @@
#include "instance/gryphn_instance.h" #include "instance/gryphn_instance.h"
#include "device/gryphn_physical_device.h" #include "device/gryphn_physical_device.h"
#include <string.h> #include <string.h>
#include <stdio.h>
#include <vulkan/vulkan_core.h> #include <vulkan/vulkan_core.h>
#include "vulkan_device.h"
gnPhysicalDeviceType vulkanDeviceTypeToGryphnDeviceType(VkPhysicalDeviceType type) { gnPhysicalDeviceType vulkanDeviceTypeToGryphnDeviceType(VkPhysicalDeviceType type) {
switch (type) { switch (type) {
@@ -57,10 +59,33 @@ gnReturnCode vulkanGetPhysicalDeviceProperties(gnPhysicalDevice device, gnPhysic
} }
gnReturnCode vulkanCreateDevice(gnInstance instance, gnDeviceCreateInfo* info, gnDevice device) { gnReturnCode vulkanCreateDevice(gnInstance instance, gnDeviceCreateInfo* info, gnDevice device) {
// create a list of the vulkan extentions to enable from gryphn extententions
const char** extensions = malloc(sizeof(const char*) * info->enabledExtensionCount); const char** extensions = malloc(sizeof(const char*) * info->enabledExtensionCount);
int realEnabledExtensionCount = 0; int realEnabledExtensionCount = 0;
for (int i = 0; i < info->enabledExtensionCount; i++) { for (int i = 0; i < info->enabledExtensionCount; i++) {
// zero supported vulkan extensions right now if (strcmp(info->enabledExtensions[i], "GN_EXT_swapchain") == 0) {
extensions[realEnabledExtensionCount] = VK_KHR_SWAPCHAIN_EXTENSION_NAME;
realEnabledExtensionCount++;
device->dispatchTable.createSwapchain = vulkanCreateSwapchain;
device->dispatchTable.destroySwapchain = vulkanDestroySwapchain;
}
}
uint32_t queueFamilyCount = 0;
vkGetPhysicalDeviceQueueFamilyProperties(info->physicalDevice->internalData, &queueFamilyCount, NULL);
VkQueueFamilyProperties* queueFamilyProperties = malloc(sizeof(VkQueueFamilyProperties) * queueFamilyCount);
vkGetPhysicalDeviceQueueFamilyProperties(info->physicalDevice->internalData, &queueFamilyCount, queueFamilyProperties);
VkDeviceQueueCreateInfo* queueCreateInfos = malloc(sizeof(VkDeviceQueueCreateInfo) * queueFamilyCount);
for (int i = 0; i < queueFamilyCount; i++) {
queueCreateInfos[i] = (VkDeviceQueueCreateInfo){
.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
.pNext = NULL,
.flags = 0,
.queueFamilyIndex = i,
.queueCount = 1,
.pQueuePriorities = (float[]){ 1.0f }
};
} }
VkPhysicalDeviceFeatures deviceFeatures = { VkPhysicalDeviceFeatures deviceFeatures = {
@@ -71,22 +96,34 @@ gnReturnCode vulkanCreateDevice(gnInstance instance, gnDeviceCreateInfo* info, g
.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
.pNext = NULL, .pNext = NULL,
.flags = 0, .flags = 0,
.queueCreateInfoCount = 0, .queueCreateInfoCount = queueFamilyCount,
.pQueueCreateInfos = NULL, .pQueueCreateInfos = queueCreateInfos,
.enabledExtensionCount = realEnabledExtensionCount, .enabledExtensionCount = realEnabledExtensionCount,
.ppEnabledExtensionNames = extensions, .ppEnabledExtensionNames = extensions,
.pEnabledFeatures = &deviceFeatures, .pEnabledFeatures = &deviceFeatures,
}; };
VkDevice vulkanDevice; VkDevice vkDevice;
VkResult result = vkCreateDevice(info->physicalDevice->internalData, &createInfo, NULL, &vulkanDevice); VkResult result = vkCreateDevice(info->physicalDevice->internalData, &createInfo, NULL, &vkDevice);
device->internalData = vulkanDevice; device->internalData = malloc(sizeof(vulkanDevice));
((vulkanDevice*)device->internalData)->device = vkDevice;
((vulkanDevice*)device->internalData)->physicalDevice = info->physicalDevice->internalData;
((vulkanDevice*)device->internalData)->queueCount = queueFamilyCount;
for (int i = 0; i < queueFamilyCount; i++) {
if ((queueFamilyProperties[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) == VK_QUEUE_GRAPHICS_BIT) {
((vulkanDevice*)device->internalData)->graphicsQueueIndex = i;
vkGetDeviceQueue(vkDevice, i, 0, &((vulkanDevice*)device->internalData)->graphicsQueue);
break;
}
}
device->dispatchTable.destroyDevice = vulkanDestroyDevice; device->dispatchTable.destroyDevice = vulkanDestroyDevice;
free(extensions);
return vulkanCodeToGryphnCode(result); return vulkanCodeToGryphnCode(result);
} }
gnReturnCode vulkanDestroyDevice(gnDevice device) { gnReturnCode vulkanDestroyDevice(gnDevice device) {
vkDestroyDevice(device->internalData, NULL); vkDestroyDevice(((vulkanDevice*)device->internalData)->device, NULL);
free(device->internalData);
return GN_SUCCESS; return GN_SUCCESS;
} }
@@ -0,0 +1,11 @@
#pragma once
#include <vulkan/vulkan_core.h>
typedef struct vulkanDevice {
VkDevice device;
VkPhysicalDevice physicalDevice;
uint32_t queueCount;
uint32_t graphicsQueueIndex;
VkQueue graphicsQueue;
} vulkanDevice;
@@ -4,8 +4,16 @@
#include "gryphn_return_code.h" #include "gryphn_return_code.h"
#include "device/gryphn_physical_device.h" #include "device/gryphn_physical_device.h"
#include "device/gryphn_device.h" #include "device/gryphn_device.h"
#include "dispatch/gryphn_instance_dispatch_table.h"
gnReturnCode vulkanEnumeratePhysicalDevices(gnInstance instance, uint32_t* deviceCount, gnPhysicalDevice* devices); gnReturnCode vulkanEnumeratePhysicalDevices(gnInstance instance, uint32_t* deviceCount, gnPhysicalDevice* devices);
gnReturnCode vulkanGetPhysicalDeviceProperties(gnPhysicalDevice device, gnPhysicalDeviceProperties* properties); gnReturnCode vulkanGetPhysicalDeviceProperties(gnPhysicalDevice device, gnPhysicalDeviceProperties* properties);
gnReturnCode vulkanCreateDevice(gnInstance instance, gnDeviceCreateInfo* createInfo, gnDevice device); gnReturnCode vulkanCreateDevice(gnInstance instance, gnDeviceCreateInfo* createInfo, gnDevice device);
gnReturnCode vulkanDestroyDevice(gnDevice device); gnReturnCode vulkanDestroyDevice(gnDevice device);
gnReturnCode vulkanCreateXlibSurface(gnInstance instance, gnXlibSurfaceCreateInfo* createInfo, gnSurface* surface);
gnReturnCode vulkanGetSurfaceCapabilities(gnPhysicalDevice device, gnSurface surface, gnSurfaceCapabilities* capabilities);
gnReturnCode vulkanGetSurfaceFormats(gnPhysicalDevice device, gnSurface surface, uint32_t* formatCount, gnSurfaceFormat* formats);
gnReturnCode vulkanGetSurfacePresentModes(gnPhysicalDevice device, gnSurface surface, uint32_t* presentModeCount, gnPresentMode* presentModes);
gnReturnCode vulkanDestroySurface(gnInstance instance, gnSurface* surface);
gnReturnCode vulkanCreateSwapchain(gnDevice device, gnSwapchainCreateInfo* createInfo, gnSwapchain* swapchain);
gnReturnCode vulkanDestroySwapchain(gnDevice device, gnSwapchain* swapchain);
@@ -0,0 +1,89 @@
#include "vulkan_helpers.h"
#include "core/gryphn_format.h"
#include "core/gryphn_present_mode.h"
#include "gryphn_return_code.h"
#include "stdio.h"
#include <vulkan/vulkan_core.h>
gnReturnCode vulkanCodeToGryphnCode(VkResult result) {
switch(result) {
default: {
printf("Unknown instance fail mr gregory please diagnose this: %d\n", result);
return GN_UNSUPPORTED_BACKEND;
}
case VK_SUCCESS: return GN_SUCCESS;
case VK_ERROR_EXTENSION_NOT_PRESENT: return GN_EXTENSION_NOT_PRESENT;
}
}
gnFormat vulkanFormatToGryphnFormat(VkFormat format) {
switch (format) {
case VK_FORMAT_UNDEFINED: return GN_FORMAT_UNDEFINED;
case VK_FORMAT_R8G8B8A8_UNORM: return GN_FORMAT_RGBA8_UNORM;
case VK_FORMAT_R8G8B8A8_SNORM: return GN_FORMAT_RGBA8_SNORM;
case VK_FORMAT_R8G8B8A8_USCALED: return GN_FORMAT_RGBA8_USCALED;
case VK_FORMAT_R8G8B8A8_SSCALED: return GN_FORMAT_RGBA8_SSCALED;
case VK_FORMAT_R8G8B8A8_UINT: return GN_FORMAT_RGBA8_UINT;
case VK_FORMAT_R8G8B8A8_SINT: return GN_FORMAT_RGBA8_SINT;
case VK_FORMAT_R8G8B8A8_SRGB: return GN_FORMAT_RGBA8_SRGB;
case VK_FORMAT_B8G8R8A8_UNORM: return GN_FORMAT_BGRA8_UNORM;
case VK_FORMAT_B8G8R8A8_SNORM: return GN_FORMAT_BGRA8_SNORM;
case VK_FORMAT_B8G8R8A8_USCALED: return GN_FORMAT_BGRA8_USCALED;
case VK_FORMAT_B8G8R8A8_SSCALED: return GN_FORMAT_BGRA8_SSCALED;
case VK_FORMAT_B8G8R8A8_UINT: return GN_FORMAT_BGRA8_UINT;
case VK_FORMAT_B8G8R8A8_SINT: return GN_FORMAT_BGRA8_SINT;
case VK_FORMAT_B8G8R8A8_SRGB: return GN_FORMAT_BGRA8_SRGB;
default: return GN_FORMAT_UNDEFINED;
}
}
gnColorSpace vulkanColorSpaceToGryphnColorSpace(VkColorSpaceKHR colorSpace) {
switch (colorSpace) {
case VK_COLOR_SPACE_SRGB_NONLINEAR_KHR: return GN_COLOR_SPACE_SRGB_NONLINEAR;
default: return GN_COLOR_SPACE_UNKNOWN;
}
}
gnPresentMode vulkanPresentModeToGryphnPresentMode(VkPresentModeKHR presentMode) {
switch (presentMode) {
case VK_PRESENT_MODE_IMMEDIATE_KHR: return GN_PRESENT_MODE_IMMEDIATE;
case VK_PRESENT_MODE_MAILBOX_KHR: return GN_PRESENT_MODE_MAILBOX;
case VK_PRESENT_MODE_FIFO_KHR: return GN_PRESENT_MODE_FIFO;
case VK_PRESENT_MODE_FIFO_RELAXED_KHR: return GN_PRESENT_MODE_FIFO_RELAXED;
default: return GN_PRESENT_MODE_UNKNOWN;
}
}
VkFormat gryphnFormatToVulkanFormat(gnFormat format) {
switch (format) {
case GN_FORMAT_UNDEFINED: return VK_FORMAT_UNDEFINED;
case GN_FORMAT_RGBA8_UNORM: return VK_FORMAT_R8G8B8A8_UNORM;
case GN_FORMAT_RGBA8_SNORM: return VK_FORMAT_R8G8B8A8_SNORM;
case GN_FORMAT_RGBA8_USCALED: return VK_FORMAT_R8G8B8A8_USCALED;
case GN_FORMAT_RGBA8_SSCALED: return VK_FORMAT_R8G8B8A8_SSCALED;
case GN_FORMAT_RGBA8_UINT: return VK_FORMAT_R8G8B8A8_UINT;
case GN_FORMAT_RGBA8_SINT: return VK_FORMAT_R8G8B8A8_SINT;
case GN_FORMAT_RGBA8_SRGB: return VK_FORMAT_R8G8B8A8_SRGB;
case GN_FORMAT_BGRA8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM;
case GN_FORMAT_BGRA8_SNORM: return VK_FORMAT_B8G8R8A8_SNORM;
case GN_FORMAT_BGRA8_USCALED: return VK_FORMAT_B8G8R8A8_USCALED;
case GN_FORMAT_BGRA8_SSCALED: return VK_FORMAT_B8G8R8A8_SSCALED;
case GN_FORMAT_BGRA8_UINT: return VK_FORMAT_B8G8R8A8_UINT;
case GN_FORMAT_BGRA8_SINT: return VK_FORMAT_B8G8R8A8_SINT;
case GN_FORMAT_BGRA8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB;
}
}
VkColorSpaceKHR gryphnColorSpaceToVulkanColorSpace(gnColorSpace colorSpace) {
switch (colorSpace) {
case GN_COLOR_SPACE_SRGB_NONLINEAR: return VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
case GN_COLOR_SPACE_UNKNOWN: return VK_COLOR_SPACE_MAX_ENUM_KHR;
}
}
VkPresentModeKHR gryphnPresentModeToVulkanPresentMode(gnPresentMode presentMode) {
switch (presentMode) {
case GN_PRESENT_MODE_IMMEDIATE: return VK_PRESENT_MODE_IMMEDIATE_KHR;
case GN_PRESENT_MODE_MAILBOX: return VK_PRESENT_MODE_MAILBOX_KHR;
case GN_PRESENT_MODE_FIFO: return VK_PRESENT_MODE_FIFO_KHR;
case GN_PRESENT_MODE_FIFO_RELAXED: return VK_PRESENT_MODE_FIFO_RELAXED_KHR;
case GN_PRESENT_MODE_UNKNOWN: return VK_PRESENT_MODE_MAX_ENUM_KHR;
}
}
@@ -1,5 +1,14 @@
#pragma once #pragma once
#include "gryphn_return_code.h" #include "gryphn_return_code.h"
#include "core/gryphn_format.h"
#include "core/gryphn_present_mode.h"
#include <vulkan/vulkan_core.h> #include <vulkan/vulkan_core.h>
gnReturnCode vulkanCodeToGryphnCode(VkResult result); gnReturnCode vulkanCodeToGryphnCode(VkResult result);
gnFormat vulkanFormatToGryphnFormat(VkFormat format);
gnColorSpace vulkanColorSpaceToGryphnColorSpace(VkColorSpaceKHR colorSpace);
gnPresentMode vulkanPresentModeToGryphnPresentMode(VkPresentModeKHR presentMode);
VkFormat gryphnFormatToVulkanFormat(gnFormat format);
VkColorSpaceKHR gryphnColorSpaceToVulkanColorSpace(gnColorSpace colorSpace);
VkPresentModeKHR gryphnPresentModeToVulkanPresentMode(gnPresentMode presentMode);
+2 -1
View File
@@ -6,7 +6,8 @@ extern "C" {
#include "GryphnLoader/src/instance/gryphn_instance.h" #include "GryphnLoader/src/instance/gryphn_instance.h"
#include "GryphnLoader/src/device/gryphn_physical_device.h" #include "GryphnLoader/src/device/gryphn_physical_device.h"
#include "GryphnLoader/src/device/gryphn_device.h" #include "GryphnLoader/src/device/gryphn_device.h"
#include "GryphnLoader/src/surface/gryphn_surface.h" #include "GryphnLoader/src/ext/instance/surface/gryphn_surface.h"
#include "GryphnLoader/src/ext/device/swapchain/gryphn_swapchain.h"
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
+71 -20
View File
@@ -1,6 +1,7 @@
#include "Gryphn/gryphn.h" #define GN_USE_SURFACE_XLIB
#include <iostream> #include <Gryphn/gryphn.h>
#include "stdlib.h" #include "stdlib.h"
#include "iostream"
#define GLFW_EXPOSE_NATIVE_X11 #define GLFW_EXPOSE_NATIVE_X11
#include "glfw/include/GLFW/glfw3.h" #include "glfw/include/GLFW/glfw3.h"
#include "glfw/include/GLFW/glfw3native.h" #include "glfw/include/GLFW/glfw3native.h"
@@ -15,12 +16,17 @@
} }
GLFWwindow* window; GLFWwindow* window;
CAMetalLayer* layer;
gnVersion version = gnCreateVersion(1, 0, 0); gnVersion version = gnCreateVersion(1, 0, 0);
gnInstance instance; gnInstance instance;
gnPhysicalDevice pysicalDevice; gnPhysicalDevice pysicalDevice;
gnDevice device; gnDevice device;
gnSurface surface; gnSurface surface;
gnSwapchain swapchain;
uint32_t min(uint32_t a, uint32_t b) {
if (a < b) return a;
return b;
}
void createInstance() { void createInstance() {
uint32_t backendCount = 0; uint32_t backendCount = 0;
@@ -79,24 +85,69 @@ void createDevice() {
} }
void createSurface() { void createSurface() {
// NSWindow* nswin = glfwGetCocoaWindow((GLFWwindow*)window); gnXlibSurfaceCreateInfo createInfo = {
// NSView* view = [nswin contentView]; .dpy = glfwGetX11Display(),
// layer = [CAMetalLayer layer]; .window = glfwGetX11Window(window)
// [view setWantsLayer:YES]; };
// [view setLayer:layer];
// layer.contentsScale = [nswin backingScaleFactor];
// gnMetalSurfaceCreateInfo createInfo = { CHECK(gnCreateXlibSurface(instance, &createInfo, &surface));
// .metalLayer = layer
// };
// CHECK(gnCreateMetalSurface(instance, &createInfo, &surface));
// gnSurfaceCapabilities capabilites;
// gnGetSurfaceCapabilities(pysicalDevice, surface, &capabilites);
} }
void createSwapchain() { gnSurfaceFormat getSurfaceFormat() {
uint32_t surfaceFormatCount = 0;
CHECK(gnGetSurfaceFormats(pysicalDevice, surface, &surfaceFormatCount, NULL));
if (surfaceFormatCount == 0)
throw std::runtime_error("Gryphn returned 0 avaliable surface formats");
gnSurfaceFormat* formats = (gnSurfaceFormat*)malloc(sizeof(gnSurfaceFormat) * surfaceFormatCount);
CHECK(gnGetSurfaceFormats(pysicalDevice, surface, &surfaceFormatCount, formats));
for (int i = 0; i < surfaceFormatCount; i++)
if (formats[i].format == GN_FORMAT_BGRA8_SRGB && formats[i].colorSpace == GN_COLOR_SPACE_SRGB_NONLINEAR) return formats[i];
return formats[0];
return (gnSurfaceFormat){
.format = GN_FORMAT_UNDEFINED,
.colorSpace = GN_COLOR_SPACE_UNKNOWN
};
}
gnPresentMode getPresentMode() {
uint32_t presentModeCount = 0;
CHECK(gnGetSurfacePresentModes(pysicalDevice, surface, &presentModeCount, NULL));
if (presentModeCount == 0)
throw std::runtime_error("Gryphn returned 0 avaliable presentMode");
gnPresentMode* presentModes = (gnPresentMode*)malloc(sizeof(gnPresentMode) * presentModeCount);
CHECK(gnGetSurfacePresentModes(pysicalDevice, surface, &presentModeCount, presentModes));
for (int i = 0; i < presentModeCount; i++)
if (presentModes[i] == GN_PRESENT_MODE_MAILBOX) return presentModes[i];
return presentModes[0];
}
void createSwapchain() {
gnSurfaceCapabilities capabilites;
gnGetSurfaceCapabilities(pysicalDevice, surface, &capabilites);
gnSurfaceFormat chosenFormat = getSurfaceFormat();
gnPresentMode chosenMode = getPresentMode();
int width, height;
glfwGetWindowSize(window, &width, &height);
gnSwapchainCreateInfo createInfo = {
.surface = surface,
.minImageCount = min(capabilites.minImageCount + 1, capabilites.maxImageCount),
.imageFormat = chosenFormat.format,
.imageColorSpace = chosenFormat.colorSpace,
.imageExtent = { (uint32_t)width, (uint32_t)height },
.imageArrayLayers = 1,
.presentMode = chosenMode,
};
CHECK(gnCreateSwapchain(device, &createInfo, &swapchain));
} }
int main() { int main() {
@@ -115,8 +166,8 @@ int main() {
try { try {
createInstance(); createInstance();
createDevice(); createDevice();
// createSurface(); createSurface();
// createSwapchain(); createSwapchain();
while (!glfwWindowShouldClose(window)) { while (!glfwWindowShouldClose(window)) {
glfwPollEvents(); glfwPollEvents();
} }
@@ -125,7 +176,7 @@ int main() {
return 0; return 0;
} }
glfwDestroyWindow(window); glfwDestroyWindow(window);
// gnDestroySurface(instance, &surface); gnDestroySurface(instance, &surface);
gnDestroyDevice(&device); gnDestroyDevice(&device);
gnDestroyInstance(&instance); gnDestroyInstance(&instance);
} }