diff --git a/projects/apis/vulkan/CMakeLists.txt b/projects/apis/vulkan/CMakeLists.txt index f61e53d..13b2d05 100644 --- a/projects/apis/vulkan/CMakeLists.txt +++ b/projects/apis/vulkan/CMakeLists.txt @@ -2,7 +2,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS on) project(GryphnVulkanImpl) set(CMAKE_CXX_STANDARD 17) -add_compile_definitions(GN_REVEAL_IMPL) +add_compile_definitions(GN_REVEAL_IMPL GN_IMPLEMENTATION) file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS "src/*.c" "src/*.h") file(GLOB_RECURSE LOADER_FILES CONFIGURE_DEPENDS "loader/*.c") diff --git a/projects/apis/vulkan/loader/vulkan_instance_loader.c b/projects/apis/vulkan/loader/vulkan_instance_loader.c index 542148c..7242eb9 100644 --- a/projects/apis/vulkan/loader/vulkan_instance_loader.c +++ b/projects/apis/vulkan/loader/vulkan_instance_loader.c @@ -8,14 +8,13 @@ gryphnInstanceFunctionLayers loadVulkanAPILayer(void) { return (gryphnInstanceFunctionLayers) { .createInstance = vulkanCreateInstance, .destroyInstance = vulkanDestroyInstance, + .queryDevices = vulkanQueryDevices, .next = NULL }; } gnInstanceFunctions loadVulkanInstanceFunctions(void) { return (gnInstanceFunctions){ - - ._gnGetPhysicalDevices = getPhysicalDevices, ._gnPhysicalDeviceCanPresentToSurface = deviceCanPresentToSurface, ._gnCreateOutputDevice = createVulkanOutputDevice, diff --git a/projects/core/src/output_device/gryphn_physical_device.c b/projects/core/src/output_device/gryphn_physical_device.c index c1c7549..9f3638e 100644 --- a/projects/core/src/output_device/gryphn_physical_device.c +++ b/projects/core/src/output_device/gryphn_physical_device.c @@ -2,11 +2,6 @@ #include "instance/gryphn_instance.h" #include "loader/src/gryphn_instance_functions.h" -gnPhysicalDeviceHandle* gnGetPhyscialDevices(gnInstanceHandle instance, uint32_t* count) {; - gnPhysicalDeviceHandle* devices = instance->callingLayer->instanceFunctions._gnGetPhysicalDevices(instance, count); - return devices; -} - gnBool gnPhysicalDeviceCanPresentToSurface(gnInstanceHandle instance, gnPhysicalDeviceHandle device, gnWindowSurfaceHandle windowSurface) { return instance->callingLayer->instanceFunctions._gnPhysicalDeviceCanPresentToSurface(device, windowSurface); } diff --git a/projects/core/src/output_device/gryphn_physical_device.h b/projects/core/src/output_device/gryphn_physical_device.h index 59a76f0..d24512c 100644 --- a/projects/core/src/output_device/gryphn_physical_device.h +++ b/projects/core/src/output_device/gryphn_physical_device.h @@ -38,7 +38,6 @@ typedef struct gnPhysicalDeviceFeatures { // } gnPhysicalOutputDevice_t; // #endif -gnPhysicalDeviceHandle* gnGetPhyscialDevices(gnInstanceHandle instance, uint32_t* count); gnBool gnPhysicalDeviceCanPresentToSurface(gnInstance instance, gnPhysicalDeviceHandle device, gnWindowSurfaceHandle windowSurface); gnPhysicalDeviceProperties gnGetPhysicalDeviceProperties(gnPhysicalDeviceHandle device);