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

surface handles

Browse Source
This commit is contained in:
Greg Wells
2025-06-03 14:14:49 -04:00
parent d39f598d3c
commit fbc30509c4
21 changed files with 83 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/gryphn/utils/gryphn_glfw_util.h
View File

@@ -14,7 +14,7 @@
#error "Must define GLFW_EXPOSE_NATIVE_COCOA on macos" #error "Must define GLFW_EXPOSE_NATIVE_COCOA on macos"
#endif #endif
static gnReturnCode gnCreateGLFWWindowSurface(struct gnWindowSurface_t* windowSurface, struct gnInstance_t* instance, GLFWwindow* window) { static gnReturnCode gnCreateGLFWWindowSurface(gnWindowSurfaceHandle* windowSurface, struct gnInstance_t* instance, GLFWwindow* window) {
gnMacOSWindowSurfaceInfo surfaceCreateInfo = { gnMacOSWindowSurfaceInfo surfaceCreateInfo = {
.layer = gnCreateCAMetalLayer(glfwGetCocoaWindow(window)) .layer = gnCreateCAMetalLayer(glfwGetCocoaWindow(window))
}; };

8
rendering_api/metal/src/core/present/metal_present.m
View File

@@ -13,8 +13,8 @@ gnReturnCode gnPresentFn(struct gnOutputDevice_t* device, struct gnPresentInfo_t
while (!info.waitSemaphores[i].semaphore->eventTriggered) {} while (!info.waitSemaphores[i].semaphore->eventTriggered) {}
} }
info.presentationQueues->info.surface.windowSurface->layer.device = device->outputDevice->device; info.presentationQueues->info.surface->windowSurface->layer.device = device->outputDevice->device;
id<CAMetalDrawable> drawable = [info.presentationQueues->info.surface.windowSurface->layer nextDrawable]; id<CAMetalDrawable> drawable = [info.presentationQueues->info.surface->windowSurface->layer nextDrawable];
if (drawable == nil) { if (drawable == nil) {
return GN_FAILED_TO_CREATE_FRAMEBUFFER; return GN_FAILED_TO_CREATE_FRAMEBUFFER;
} }
@@ -51,8 +51,8 @@ gnReturnCode gnPresentFn(struct gnOutputDevice_t* device, struct gnPresentInfo_t
device->outputDevice->executingCommandBuffer = commandBuffer; device->outputDevice->executingCommandBuffer = commandBuffer;
for (int i = 0; i < info.presentationQueueCount; i++) { for (int i = 0; i < info.presentationQueueCount; i++) {
if (info.presentationQueues[i].info.imageSize.x != info.presentationQueues[i].info.surface.windowSurface->layer.drawableSize.width || if (info.presentationQueues[i].info.imageSize.x != info.presentationQueues[i].info.surface->windowSurface->layer.drawableSize.width ||
info.presentationQueues[i].info.imageSize.y != info.presentationQueues[i].info.surface.windowSurface->layer.drawableSize.height) { info.presentationQueues[i].info.imageSize.y != info.presentationQueues[i].info.surface->windowSurface->layer.drawableSize.height) {
return GN_SUBOPTIMAL_PRESENTATION_QUEUE; return GN_SUBOPTIMAL_PRESENTATION_QUEUE;
} }
} }

1
rendering_api/vulkan/src/output_device/vulkan_output_device.c
View File

@@ -2,6 +2,7 @@
#include <output_device/vulkan_physical_device.h> #include <output_device/vulkan_physical_device.h>
#include <output_device/vulkan_output_devices.h> #include <output_device/vulkan_output_devices.h>
#include "vulkan_device_extensions.h" #include "vulkan_device_extensions.h"
#include "core/instance/gryphn_instance.h"
#include <stdio.h> #include <stdio.h>

4
rendering_api/vulkan/src/output_device/vulkan_physical_device.c
View File

@@ -49,9 +49,9 @@ gnPhysicalDevice* gnGetPhysicalDevicesFn(gnInstanceHandle instance, uint32_t* de
return outputDevices; return outputDevices;
} }
gnBool gnQueueCanPresentToSurfaceFn(const struct gnPhysicalDevice_t device, uint32_t queueIndex, const struct gnWindowSurface_t windowSurface) { gnBool gnQueueCanPresentToSurfaceFn(const struct gnPhysicalDevice_t device, uint32_t queueIndex, gnWindowSurfaceHandle windowSurface) {
VkBool32 supportsPresent = false; VkBool32 supportsPresent = false;
vkGetPhysicalDeviceSurfaceSupportKHR(device.physicalDevice->device, queueIndex, windowSurface.windowSurface->surface, &supportsPresent); vkGetPhysicalDeviceSurfaceSupportKHR(device.physicalDevice->device, queueIndex, windowSurface->windowSurface->surface, &supportsPresent);
if (supportsPresent) if (supportsPresent)
return gnTrue; return gnTrue;
return gnFalse; return gnFalse;

4
rendering_api/vulkan/src/presentation_queue/vulkan_presentation_queue.c
View File

@@ -9,7 +9,7 @@
gnReturnCode gnCreatePresentationQueueFn(gnPresentationQueue* presentationQueue, const gnOutputDeviceHandle device, struct gnPresentationQueueInfo_t presentationInfo) { gnReturnCode gnCreatePresentationQueueFn(gnPresentationQueue* presentationQueue, const gnOutputDeviceHandle device, struct gnPresentationQueueInfo_t presentationInfo) {
presentationQueue->presentationQueue = malloc(sizeof(struct gnPlatformPresentationQueue_t)); presentationQueue->presentationQueue = malloc(sizeof(struct gnPlatformPresentationQueue_t));
vkSwapchainSupportDetails details = vkGetSwapchainSupport(device->physicalDevice.physicalDevice->device, presentationInfo.surface.windowSurface->surface); vkSwapchainSupportDetails details = vkGetSwapchainSupport(device->physicalDevice.physicalDevice->device, presentationInfo.surface->windowSurface->surface);
if (details.formatCount == 0) { if (details.formatCount == 0) {
gnDebuggerSetErrorMessage(device->instance->debugger, gnDebuggerSetErrorMessage(device->instance->debugger,
(gnMessageData){ (gnMessageData){
@@ -51,7 +51,7 @@ gnReturnCode gnCreatePresentationQueueFn(gnPresentationQueue* presentationQueue,
VkSwapchainCreateInfoKHR createInfo = {}; VkSwapchainCreateInfoKHR createInfo = {};
createInfo.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; createInfo.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
createInfo.surface = presentationInfo.surface.windowSurface->surface; createInfo.surface = presentationInfo.surface->windowSurface->surface;
createInfo.minImageCount = presentationInfo.minImageCount; createInfo.minImageCount = presentationInfo.minImageCount;
createInfo.imageFormat = details.formats[index].format; createInfo.imageFormat = details.formats[index].format;

2
rendering_api/vulkan/src/vulkan_surface/vulkan_surface.m
View File

@@ -11,7 +11,7 @@
#include "vulkan/vulkan_metal.h" #include "vulkan/vulkan_metal.h"
gnReturnCode gnCreateMacOSWindowSurfaceFn(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnMacOSWindowSurfaceInfo_t createInfo) { gnReturnCode gnCreateMacOSWindowSurfaceFn(gnWindowSurfaceHandle windowSurface, gnInstanceHandle instance, struct gnMacOSWindowSurfaceInfo_t createInfo) {
windowSurface->windowSurface = malloc(sizeof(gnPlatformWindowSurface)); windowSurface->windowSurface = malloc(sizeof(gnPlatformWindowSurface));
VkMetalSurfaceCreateInfoEXT surfaceCreateInfo = {}; VkMetalSurfaceCreateInfoEXT surfaceCreateInfo = {};
surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT; surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT;

1
src/core/command/command_pool/gryphn_command_pool.h
View File

@@ -1,6 +1,7 @@
#pragma once #pragma once
#include "stdint.h" #include "stdint.h"
#include <core/output_device/gryphn_output_device.h> #include <core/output_device/gryphn_output_device.h>
#include <utils/gryphn_error_code.h>
typedef struct gnCommandPoolInfo_t { typedef struct gnCommandPoolInfo_t {
uint32_t queueIndex; uint32_t queueIndex;

2
src/core/debugger/gryphn_debugger.h
View File

@@ -51,8 +51,6 @@ struct gnDebugger_t {
gnInstanceHandle instance; gnInstanceHandle instance;
}; };
#endif #endif
typedef struct gnDebugger_t* gnDebuggerHandle;
typedef gnDebuggerHandle gnDebugger;
gnReturnCode gnCreateDebugger(gnDebuggerHandle* debugger, const struct gnDebuggerInfo_t info); gnReturnCode gnCreateDebugger(gnDebuggerHandle* debugger, const struct gnDebuggerInfo_t info);
void gnDestroyDebugger(gnDebuggerHandle debugger); void gnDestroyDebugger(gnDebuggerHandle debugger);

1
src/core/framebuffer/gryphn_framebuffer.h
View File

@@ -1,6 +1,7 @@
#pragma once #pragma once
#include "core/renderpass/gryphn_render_pass_descriptor.h" #include "core/renderpass/gryphn_render_pass_descriptor.h"
#include "core/textures/gryphn_texture.h" #include "core/textures/gryphn_texture.h"
#include "utils/math/gryphn_vec2.h"
typedef struct gnFramebufferInfo_t { typedef struct gnFramebufferInfo_t {
struct gnRenderPassDescriptor_t* renderPassDescriptor; struct gnRenderPassDescriptor_t* renderPassDescriptor;

9
src/core/gryphn_handles.h Normal file
View File

@@ -0,0 +1,9 @@
#pragma once
#define GN_HANDLE(type) \
typedef struct type##_t* type##Handle; \
typedef struct type##_t* type
GN_HANDLE(gnInstance);
GN_HANDLE(gnDebugger);
GN_HANDLE(gnWindowSurface);

14
src/core/gryphn_platform_functions.h
View File

@@ -27,7 +27,7 @@ typedef struct gnFunctions_t {
void (*_gnDestroyDebugger)(gnDebuggerHandle debugger); void (*_gnDestroyDebugger)(gnDebuggerHandle debugger);
gnPhysicalDevice* (*_gnGetPhysicalDevices)(gnInstanceHandle instance, uint32_t* count); gnPhysicalDevice* (*_gnGetPhysicalDevices)(gnInstanceHandle instance, uint32_t* count);
gnBool (*_gnQueueCanPresentToSurface)(const struct gnPhysicalDevice_t device, uint32_t queueIndex, const struct gnWindowSurface_t windowSurface); gnBool (*_gnQueueCanPresentToSurface)(const struct gnPhysicalDevice_t device, uint32_t queueIndex, const gnWindowSurfaceHandle windowSurface);
gnReturnCode (*_gnCreateOutputDevoce)(gnOutputDeviceHandle device, gnInstanceHandle instance, struct gnOutputDeviceInfo_t deviceInfo); gnReturnCode (*_gnCreateOutputDevoce)(gnOutputDeviceHandle device, gnInstanceHandle instance, struct gnOutputDeviceInfo_t deviceInfo);
@@ -37,24 +37,24 @@ typedef struct gnFunctions_t {
#ifdef GN_PLATFORM_LINUX #ifdef GN_PLATFORM_LINUX
#ifdef GN_WINDOW_X11 #ifdef GN_WINDOW_X11
gnReturnCode (*_gnCreateX11WindowSurface)(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnX11WindowSurfaceInfo_t createInfo); gnReturnCode (*_gnCreateX11WindowSurface)(gnWindowSurfaceHandle windowSurface, gnInstanceHandle instance, struct gnX11WindowSurfaceInfo_t createInfo);
#endif #endif
#ifdef GN_WINDOW_WAYLAND #ifdef GN_WINDOW_WAYLAND
gnReturnCode (*_gnCreateWaylandWindowSurface)(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnWaylandWindowSurfaceInfo_t createInfo); gnReturnCode (*_gnCreateWaylandWindowSurface)(gnWindowSurfaceHandle windowSurface, gnInstanceHandle instance, struct gnWaylandWindowSurfaceInfo_t createInfo);
#endif #endif
#endif #endif
#ifdef GN_PLATFORM_WIN32 #ifdef GN_PLATFORM_WIN32
gnReturnCode (*_gnCreateWin32WindowSurface)(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnWin32WindowSurfaceInfo_t createInfo); gnReturnCode (*_gnCreateWin32WindowSurface)(gnWindowSurfaceHandle windowSurface, gnInstanceHandle instance, struct gnWin32WindowSurfaceInfo_t createInfo);
#endif #endif
#ifdef GN_PLATFORM_MACOS #ifdef GN_PLATFORM_MACOS
gnReturnCode (*_gnCreateMacOSWindowSurface)(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnMacOSWindowSurfaceInfo_t createInfo); gnReturnCode (*_gnCreateMacOSWindowSurface)(gnWindowSurfaceHandle windowSurface, gnInstanceHandle instance, struct gnMacOSWindowSurfaceInfo_t createInfo);
#endif #endif
void (*_gnDestroyWindowSurface)(struct gnWindowSurface_t* windowSurface); void (*_gnDestroyWindowSurface)(gnWindowSurfaceHandle windowSurface);
struct gnSurfaceDetails_t (*_gnGetSurfaceDetails)(struct gnWindowSurface_t* windowSurface, struct gnPhysicalDevice_t device); struct gnSurfaceDetails_t (*_gnGetSurfaceDetails)(gnWindowSurfaceHandle windowSurface, struct gnPhysicalDevice_t device);
} gnFunctions; } gnFunctions;
#include "core/presentation_queue/gryphn_presentation_queue.h" #include "core/presentation_queue/gryphn_presentation_queue.h"

4
src/core/instance/gryphn_instance.h
View File

@@ -1,11 +1,11 @@
#pragma once #pragma once
#include <gryphn/gryphn_utils.h> #include <gryphn/gryphn_utils.h>
#include "core/gryphn_rendering_api.h" #include "core/gryphn_rendering_api.h"
#include "core/gryphn_handles.h"
struct gnPlatformInstance_t; struct gnPlatformInstance_t;
struct gnFunctions_t; struct gnFunctions_t;
struct gnDynamicLibrary_t; struct gnDynamicLibrary_t;
typedef struct gnDebugger_t* gnDebuggerHandle;
typedef struct gnInstanceInfo_t { typedef struct gnInstanceInfo_t {
gnString applicationName; gnString applicationName;
@@ -33,8 +33,6 @@ struct gnInstance_t {
gnDebuggerHandle debugger; gnDebuggerHandle debugger;
}; };
#endif #endif
typedef struct gnInstance_t* gnInstanceHandle;
typedef struct gnInstance_t* gnInstance;
gnReturnCode gnCreateInstance(gnInstanceHandle* instance, struct gnInstanceInfo_t info); gnReturnCode gnCreateInstance(gnInstanceHandle* instance, struct gnInstanceInfo_t info);
void gnInstanceAttachDebugger(gnInstanceHandle istance, gnDebuggerHandle debugger); void gnInstanceAttachDebugger(gnInstanceHandle istance, gnDebuggerHandle debugger);

1
src/core/output_device/gryphn_output_device.h
View File

@@ -1,5 +1,6 @@
#pragma once #pragma once
#include <core/output_device/gryphn_physical_output_device.h> #include <core/output_device/gryphn_physical_output_device.h>
#include <utils/gryphn_error_code.h>
struct gnPlatformOutputDevice_t; struct gnPlatformOutputDevice_t;
struct gnDeviceFunctions_t; struct gnDeviceFunctions_t;

7
src/core/output_device/gryphn_physical_output_device.c
View File

@@ -1,6 +1,5 @@
#include "gryphn_physical_output_device.h" #include "gryphn_physical_output_device.h"
#include "core/gryphn_platform_functions.h" #include "core/gryphn_platform_functions.h"
#include "core/window_surface/gryphn_surface.h"
#include "stdio.h" #include "stdio.h"
gnPhysicalDevice* gnGetPhyscialDevices(gnInstanceHandle instance, uint32_t* count) { gnPhysicalDevice* gnGetPhyscialDevices(gnInstanceHandle instance, uint32_t* count) {
@@ -11,7 +10,7 @@ gnPhysicalDevice* gnGetPhyscialDevices(gnInstanceHandle instance, uint32_t* coun
return devices; return devices;
} }
gnBool gnQueueCanPresentToSurface(const struct gnPhysicalDevice_t device, uint32_t queueIndex, const struct gnWindowSurface_t windowSurface) { gnBool gnQueueCanPresentToSurface(const struct gnPhysicalDevice_t device, uint32_t queueIndex, gnWindowSurfaceHandle windowSurface) {
if (queueIndex >= device.queueProperties.queueCount) { if (queueIndex >= device.queueProperties.queueCount) {
gnDebuggerSetErrorMessage(device.instance->debugger, gnDebuggerSetErrorMessage(device.instance->debugger,
(gnMessageData){ (gnMessageData){
@@ -31,7 +30,7 @@ gnBool gnHasGraphicsQueue(const struct gnPhysicalDevice_t device) {
} }
return gnFalse; return gnFalse;
} }
gnBool gnHasPresentQueue(const struct gnPhysicalDevice_t device, struct gnWindowSurface_t windowSurface) { gnBool gnHasPresentQueue(const struct gnPhysicalDevice_t device, gnWindowSurfaceHandle windowSurface) {
for (int i = 0; i < device.queueProperties.queueCount; i++) { for (int i = 0; i < device.queueProperties.queueCount; i++) {
if (gnQueueCanPresentToSurface(device, i, windowSurface)) { if (gnQueueCanPresentToSurface(device, i, windowSurface)) {
return gnTrue; return gnTrue;
@@ -54,7 +53,7 @@ int gnGetGraphicsQueueIndex(const struct gnPhysicalDevice_t device) {
); );
return -1; return -1;
} }
int gnGetPresentQueueIndex(const struct gnPhysicalDevice_t device, struct gnWindowSurface_t windowSurface) { int gnGetPresentQueueIndex(const struct gnPhysicalDevice_t device, gnWindowSurfaceHandle windowSurface) {
for (int i = 0; i < device.queueProperties.queueCount; i++) { for (int i = 0; i < device.queueProperties.queueCount; i++) {
if (gnQueueCanPresentToSurface(device, i, windowSurface)) { if (gnQueueCanPresentToSurface(device, i, windowSurface)) {
return i; return i;

10
src/core/output_device/gryphn_physical_output_device.h
View File

@@ -1,8 +1,8 @@
#pragma once #pragma once
#include "core/instance/gryphn_instance.h" #include "utils/strings/gryphn_string.h"
#include "core/gryphn_handles.h"
struct gnPlatformPhysicalDevice_t; struct gnPlatformPhysicalDevice_t;
struct gnWindowSurface_t;
typedef enum gnDeviceType_e { typedef enum gnDeviceType_e {
GN_DEDICATED_DEVICE, GN_INTEGRATED_DEVICE, GN_EXTERNAL_DEVICE GN_DEDICATED_DEVICE, GN_INTEGRATED_DEVICE, GN_EXTERNAL_DEVICE
@@ -44,10 +44,10 @@ typedef struct gnPhysicalDevice_t {
} gnPhysicalDevice; } gnPhysicalDevice;
gnPhysicalDevice* gnGetPhyscialDevices(gnInstanceHandle instance, uint32_t* count); gnPhysicalDevice* gnGetPhyscialDevices(gnInstanceHandle instance, uint32_t* count);
gnBool gnQueueCanPresentToSurface(const struct gnPhysicalDevice_t device, uint32_t queueIndex, const struct gnWindowSurface_t windowSurface); gnBool gnQueueCanPresentToSurface(const struct gnPhysicalDevice_t device, uint32_t queueIndex, gnWindowSurfaceHandle windowSurface);
gnBool gnHasGraphicsQueue(const struct gnPhysicalDevice_t device); gnBool gnHasGraphicsQueue(const struct gnPhysicalDevice_t device);
gnBool gnHasPresentQueue(const struct gnPhysicalDevice_t device, struct gnWindowSurface_t windowSurface); gnBool gnHasPresentQueue(const struct gnPhysicalDevice_t device, gnWindowSurfaceHandle windowSurface);
int gnGetGraphicsQueueIndex(const struct gnPhysicalDevice_t device); int gnGetGraphicsQueueIndex(const struct gnPhysicalDevice_t device);
int gnGetPresentQueueIndex(const struct gnPhysicalDevice_t device, struct gnWindowSurface_t windowSurface); int gnGetPresentQueueIndex(const struct gnPhysicalDevice_t device, gnWindowSurfaceHandle windowSurface);

1
src/core/pipelines/graphics_pipeline/gryphn_graphics_pipeline.h
View File

@@ -3,6 +3,7 @@
#include <core/pipelines/gryphn_uniform_layout.h> #include <core/pipelines/gryphn_uniform_layout.h>
#include <core/renderpass/gryphn_render_pass_descriptor.h> #include <core/renderpass/gryphn_render_pass_descriptor.h>
#include <core/shader_module/gryphn_shader_module.h> #include <core/shader_module/gryphn_shader_module.h>
#include "utils/math/gryphn_vec2.h"
typedef enum gnDynamicState_e { typedef enum gnDynamicState_e {
GN_DYNAMIC_VIEWPORT, GN_DYNAMIC_VIEWPORT,

2
src/core/presentation_queue/gryphn_presentation_queue.h
View File

@@ -8,7 +8,7 @@
typedef struct gnPresentationQueueInfo_t { typedef struct gnPresentationQueueInfo_t {
uint32_t minImageCount; uint32_t minImageCount;
struct gnUInt2_t imageSize; struct gnUInt2_t imageSize;
struct gnWindowSurface_t surface; gnWindowSurfaceHandle surface;
struct gnSurfaceFormat_t format; struct gnSurfaceFormat_t format;
enum gnImageSharingMode_e imageSharingMode; enum gnImageSharingMode_e imageSharingMode;
uint32_t queueFamilyCount; uint32_t queueFamilyCount;

22
src/core/window_surface/gryphn_surface.c
View File

@@ -1,22 +1,22 @@
#include "gryphn_surface.h" #include "gryphn_surface.h"
#include "core/gryphn_platform_functions.h" #include "core/gryphn_platform_functions.h"
void gnDestroyWindowSurface(struct gnWindowSurface_t *windowSurface) { void gnDestroyWindowSurface(gnWindowSurfaceHandle windowSurface) {
windowSurface->instance->functions->_gnDestroyWindowSurface(windowSurface); windowSurface->instance->functions->_gnDestroyWindowSurface(windowSurface);
} }
struct gnSurfaceFormat_t* gnGetSupportedSurfaceFormats( struct gnSurfaceFormat_t* gnGetSupportedSurfaceFormats(
struct gnWindowSurface_t windowSurface, gnWindowSurfaceHandle windowSurface,
struct gnPhysicalDevice_t device, struct gnPhysicalDevice_t device,
uint32_t* formatCount uint32_t* formatCount
) { ) {
struct gnSurfaceDetails_t surfaceDetails = windowSurface.instance->functions->_gnGetSurfaceDetails(&windowSurface, device); struct gnSurfaceDetails_t surfaceDetails = windowSurface->instance->functions->_gnGetSurfaceDetails(windowSurface, device);
*formatCount = surfaceDetails.formatCount; *formatCount = surfaceDetails.formatCount;
return surfaceDetails.formats; return surfaceDetails.formats;
} }
gnBool gnIsSurfaceFormatSupported( gnBool gnIsSurfaceFormatSupported(
struct gnWindowSurface_t windowSurface, gnWindowSurfaceHandle windowSurface,
struct gnPhysicalDevice_t device, struct gnPhysicalDevice_t device,
struct gnSurfaceFormat_t format struct gnSurfaceFormat_t format
) { ) {
@@ -31,7 +31,7 @@ gnBool gnIsSurfaceFormatSupported(
} }
struct gnSurfaceFormat_t gnGetPreferredSurfaceFormat( struct gnSurfaceFormat_t gnGetPreferredSurfaceFormat(
struct gnWindowSurface_t windowSurface, gnWindowSurfaceHandle windowSurface,
struct gnPhysicalDevice_t device, struct gnPhysicalDevice_t device,
struct gnSurfaceFormat_t format struct gnSurfaceFormat_t format
) { ) {
@@ -53,17 +53,17 @@ struct gnSurfaceFormat_t gnGetPreferredSurfaceFormat(
return formats[0]; return formats[0];
} }
uint32_t gnGetMinImageCount(struct gnWindowSurface_t surface, struct gnPhysicalDevice_t device) { uint32_t gnGetMinImageCount(gnWindowSurfaceHandle surface, struct gnPhysicalDevice_t device) {
struct gnSurfaceDetails_t surfaceDetails = surface.instance->functions->_gnGetSurfaceDetails(&surface, device); struct gnSurfaceDetails_t surfaceDetails = surface->instance->functions->_gnGetSurfaceDetails(surface, device);
return surfaceDetails.minImageCount; return surfaceDetails.minImageCount;
} }
uint32_t gnGetMaxImageCount(struct gnWindowSurface_t surface, struct gnPhysicalDevice_t device) { uint32_t gnGetMaxImageCount(gnWindowSurfaceHandle surface, struct gnPhysicalDevice_t device) {
struct gnSurfaceDetails_t surfaceDetails = surface.instance->functions->_gnGetSurfaceDetails(&surface, device); struct gnSurfaceDetails_t surfaceDetails = surface->instance->functions->_gnGetSurfaceDetails(surface, device);
return surfaceDetails.maxImageCount; return surfaceDetails.maxImageCount;
} }
uint32_t gnGetPreferredImageCount(struct gnWindowSurface_t surface, struct gnPhysicalDevice_t device) { uint32_t gnGetPreferredImageCount(gnWindowSurfaceHandle surface, struct gnPhysicalDevice_t device) {
struct gnSurfaceDetails_t surfaceDetails = surface.instance->functions->_gnGetSurfaceDetails(&surface, device); struct gnSurfaceDetails_t surfaceDetails = surface->instance->functions->_gnGetSurfaceDetails(surface, device);
uint32_t imageCount = surfaceDetails.minImageCount + 1; uint32_t imageCount = surfaceDetails.minImageCount + 1;
if (surfaceDetails.maxImageCount > 0 && imageCount > surfaceDetails.maxImageCount) { if (surfaceDetails.maxImageCount > 0 && imageCount > surfaceDetails.maxImageCount) {

25
src/core/window_surface/gryphn_surface.h
View File

@@ -4,8 +4,6 @@
#include <utils/types/gryphn_image_format.h> #include <utils/types/gryphn_image_format.h>
#include "core/output_device/gryphn_physical_output_device.h" #include "core/output_device/gryphn_physical_output_device.h"
struct gnPlatformWindowSurface_t;
typedef struct gnSurfaceFormat_t { typedef struct gnSurfaceFormat_t {
gnImageFormat format; gnImageFormat format;
gnColorSpace colorSpace; gnColorSpace colorSpace;
@@ -18,18 +16,23 @@ typedef struct gnSurfaceDetails_t {
uint32_t minImageCount, maxImageCount; uint32_t minImageCount, maxImageCount;
} gnSufaceDetails; } gnSufaceDetails;
typedef struct gnWindowSurface_t { #ifdef GN_REVEAL_IMPL
struct gnWindowSurface_t {
struct gnPlatformWindowSurface_t* windowSurface; struct gnPlatformWindowSurface_t* windowSurface;
gnInstanceHandle instance; gnInstanceHandle instance;
} gnWindowSurface; };
void gnDestroyWindowSurface(struct gnWindowSurface_t* windowSurface); #endif
// typedef struct gnWindowSurface_t* gnWindowSurfaceHandle;
void gnDestroyWindowSurface(gnWindowSurfaceHandle windowSurface);
struct gnSurfaceFormat_t* gnGetSupportedSurfaceFormats( struct gnSurfaceFormat_t* gnGetSupportedSurfaceFormats(
struct gnWindowSurface_t windowSurface, gnWindowSurfaceHandle windowSurface,
struct gnPhysicalDevice_t device, struct gnPhysicalDevice_t device,
uint32_t* formatCount uint32_t* formatCount
); );
gnBool gnIsSurfaceFormatSupported( gnBool gnIsSurfaceFormatSupported(
struct gnWindowSurface_t windowSurface, gnWindowSurfaceHandle windowSurface,
struct gnPhysicalDevice_t device, struct gnPhysicalDevice_t device,
struct gnSurfaceFormat_t format struct gnSurfaceFormat_t format
); );
@@ -37,10 +40,10 @@ gnBool gnIsSurfaceFormatSupported(
// unless its not supported then it will give you the first supported surface format // unless its not supported then it will give you the first supported surface format
// at some point this function will attempt to give you the most simmilar surface format // at some point this function will attempt to give you the most simmilar surface format
struct gnSurfaceFormat_t gnGetPreferredSurfaceFormat( struct gnSurfaceFormat_t gnGetPreferredSurfaceFormat(
struct gnWindowSurface_t windowSurface, gnWindowSurfaceHandle windowSurface,
struct gnPhysicalDevice_t device, struct gnPhysicalDevice_t device,
struct gnSurfaceFormat_t format struct gnSurfaceFormat_t format
); );
uint32_t gnGetMinImageCount(struct gnWindowSurface_t surface, struct gnPhysicalDevice_t device); uint32_t gnGetMinImageCount(gnWindowSurfaceHandle surface, struct gnPhysicalDevice_t device);
uint32_t gnGetMaxImageCount(struct gnWindowSurface_t surface, struct gnPhysicalDevice_t device); uint32_t gnGetMaxImageCount(gnWindowSurfaceHandle surface, struct gnPhysicalDevice_t device);
uint32_t gnGetPreferredImageCount(struct gnWindowSurface_t surface, struct gnPhysicalDevice_t device); uint32_t gnGetPreferredImageCount(gnWindowSurfaceHandle surface, struct gnPhysicalDevice_t device);

16
src/core/window_surface/gryphn_surface_create_functions.c
View File

@@ -4,12 +4,14 @@
#ifdef GN_PLATFORM_LINUX #ifdef GN_PLATFORM_LINUX
#ifdef GN_WINDOW_X11 #ifdef GN_WINDOW_X11
gnReturnCode gnCreateX11WindowSurface(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnX11WindowSurfaceInfo_t createInfo) { gnReturnCode gnCreateX11WindowSurface(gnWindowSurfaceHandle* windowSurface, gnInstanceHandle instance, struct gnX11WindowSurfaceInfo_t createInfo) {
*windowSurface = malloc(sizeof(struct gnWindowSurface_t));
return instance->functions->_gnCreateX11WindowSurface(windowSurface, instance, createInfo); return instance->functions->_gnCreateX11WindowSurface(windowSurface, instance, createInfo);
} }
#endif #endif
#ifdef GN_WINDOW_WAYLAND #ifdef GN_WINDOW_WAYLAND
gnReturnCode gnCreateWaylandWindowSurface(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnWaylandWindowSurfaceInfo_t createInfo) { gnReturnCode gnCreateWaylandWindowSurface(gnWindowSurfaceHandle* windowSurface, gnInstanceHandle instance, struct gnWaylandWindowSurfaceInfo_t createInfo) {
*windowSurface = malloc(sizeof(struct gnWindowSurface_t));
return instance->functions->_gnCreateWaylandWindowSurface(windowSurface, instance, createInfo); return instance->functions->_gnCreateWaylandWindowSurface(windowSurface, instance, createInfo);
} }
#endif #endif
@@ -17,14 +19,16 @@
#ifdef GN_PLATFORM_WIN32 #ifdef GN_PLATFORM_WIN32
gnReturnCode gnCreateWin32WindowSurface(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnWin32WindowSurfaceInfo_t createInfo) { gnReturnCode gnCreateWin32WindowSurface(gnWindowSurfaceHandle* windowSurface, gnInstanceHandle instance, struct gnWin32WindowSurfaceInfo_t createInfo) {
*windowSurface = malloc(sizeof(struct gnWindowSurface_t));
return instance->functions->_gnCreateWin32WindowSurface(windowSurface, instance, createInfo); return instance->functions->_gnCreateWin32WindowSurface(windowSurface, instance, createInfo);
} }
#endif #endif
#ifdef GN_PLATFORM_MACOS #ifdef GN_PLATFORM_MACOS
gnReturnCode gnCreateMacOSWindowSurface(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnMacOSWindowSurfaceInfo_t createInfo) { gnReturnCode gnCreateMacOSWindowSurface(gnWindowSurfaceHandle* windowSurface, gnInstanceHandle instance, struct gnMacOSWindowSurfaceInfo_t createInfo) {
windowSurface->instance = instance; *windowSurface = malloc(sizeof(struct gnWindowSurface_t));
return instance->functions->_gnCreateMacOSWindowSurface(windowSurface, instance, createInfo); (*windowSurface)->instance = instance;
return instance->functions->_gnCreateMacOSWindowSurface(*windowSurface, instance, createInfo);
} }
#endif #endif

12
src/core/window_surface/gryphn_surface_create_functions.h
View File

@@ -1,5 +1,7 @@
#pragma once #pragma once
#include "gryphn_surface.h" #include <platform/gryphn_platform_include.h>
#include "core/gryphn_handles.h"
#include "utils/gryphn_error_code.h"
#ifdef GN_PLATFORM_LINUX #ifdef GN_PLATFORM_LINUX
#ifdef GN_WINDOW_X11 #ifdef GN_WINDOW_X11
@@ -8,7 +10,7 @@
Window* window; Window* window;
} gnX11WindowSurfaceCreateInfo; } gnX11WindowSurfaceCreateInfo;
gnReturnCode gnCreateX11WindowSurface(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnX11WindowSurfaceInfo_t createInfo); gnReturnCode gnCreateX11WindowSurface(gnWindowSurfaceHandle* windowSurface, gnInstanceHandle instance, struct gnX11WindowSurfaceInfo_t createInfo);
#endif #endif
#ifdef GN_WINDOW_WAYLAND #ifdef GN_WINDOW_WAYLAND
typedef struct gnWaylandWindowSurfaceInfo_t { typedef struct gnWaylandWindowSurfaceInfo_t {
@@ -16,7 +18,7 @@
wl_surface* surface; wl_surface* surface;
} gnWaylandWindowSurfaceInfo; } gnWaylandWindowSurfaceInfo;
gnReturnCode gnCreateWaylandWindowSurface(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnWaylandWindowSurfaceInfo_t createInfo); gnReturnCode gnCreateWaylandWindowSurface(gnWindowSurfaceHandle* windowSurface, gnInstanceHandle instance, struct gnWaylandWindowSurfaceInfo_t createInfo);
#endif #endif
#endif #endif
@@ -27,7 +29,7 @@
HINSTANCE* instance; HINSTANCE* instance;
} gnWin32WindowSurfaceInfo; } gnWin32WindowSurfaceInfo;
gnReturnCode gnCreateWin32WindowSurface(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnWin32WindowSurfaceInfo_t createInfo); gnReturnCode gnCreateWin32WindowSurface(gnWindowSurfaceHandle* windowSurface, gnInstanceHandle instance, struct gnWin32WindowSurfaceInfo_t createInfo);
#endif #endif
#ifdef GN_PLATFORM_MACOS #ifdef GN_PLATFORM_MACOS
@@ -35,5 +37,5 @@
CAMetalLayer* layer; CAMetalLayer* layer;
} gnMacOSWindowSurfaceInfo; } gnMacOSWindowSurfaceInfo;
gnReturnCode gnCreateMacOSWindowSurface(struct gnWindowSurface_t* windowSurface, gnInstanceHandle instance, struct gnMacOSWindowSurfaceInfo_t createInfo); gnReturnCode gnCreateMacOSWindowSurface(gnWindowSurfaceHandle* windowSurface, gnInstanceHandle instance, struct gnMacOSWindowSurfaceInfo_t createInfo);
#endif #endif