From 988ccf32db01eb3bf41b224796f089350c11c3b3 Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Wed, 3 Jan 2024 15:30:26 +0100 Subject: [PATCH] fixing windows compilation issue --- includes/mlx_profile.h | 16 +++++++++++++++- src/renderer/buffers/vk_buffer.h | 4 ++-- src/renderer/buffers/vk_ibo.h | 4 ++-- src/renderer/command/cmd_manager.h | 4 ++-- src/renderer/command/vk_cmd_buffer.h | 4 ++-- src/renderer/command/vk_cmd_pool.h | 4 ++-- src/renderer/core/memory.h | 4 ++-- src/renderer/core/render_core.cpp | 15 +-------------- src/renderer/core/render_core.h | 4 ++-- src/renderer/core/vk_device.h | 4 ++-- src/renderer/core/vk_fence.h | 4 ++-- src/renderer/core/vk_instance.h | 4 ++-- src/renderer/core/vk_queues.h | 4 ++-- src/renderer/core/vk_semaphore.h | 4 ++-- src/renderer/core/vk_surface.h | 4 ++-- src/renderer/core/vk_validation_layers.h | 4 ++-- src/renderer/descriptors/vk_descriptor_pool.h | 4 ++-- src/renderer/descriptors/vk_descriptor_set.h | 4 ++-- .../descriptors/vk_descriptor_set_layout.h | 4 ++-- src/renderer/images/vk_image.h | 4 ++-- src/renderer/pipeline/pipeline.h | 4 ++-- src/renderer/renderpass/vk_framebuffer.h | 4 ++-- src/renderer/renderpass/vk_render_pass.h | 4 ++-- src/renderer/swapchain/vk_swapchain.h | 4 ++-- 24 files changed, 60 insertions(+), 59 deletions(-) diff --git a/includes/mlx_profile.h b/includes/mlx_profile.h index ddd9dec..2257ea9 100644 --- a/includes/mlx_profile.h +++ b/includes/mlx_profile.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/10 08:49:17 by maldavid #+# #+# */ -/* Updated: 2024/01/03 14:39:23 by maldavid ### ########.fr */ +/* Updated: 2024/01/03 15:25:44 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -119,6 +119,20 @@ #define MLX_C_VERSION 0 #endif +#if defined(MLX_PLAT_WINDOWS) + #define VK_USE_PLATFORM_WIN32_KHR + constexpr const char* VULKAN_LIB_NAME = "vulkan-1.dll"; +#elif defined(MLX_PLAT_MACOS) + #define VK_USE_PLATFORM_MACOS_MVK + #define VK_USE_PLATFORM_METAL_EXT + constexpr const char* VULKAN_LIB_NAME = "libvulkan.dylib / libvulkan.1.dylib / libMoltenVK.dylib"; +#else + #define VK_USE_PLATFORM_XLIB_KHR + #define VK_USE_PLATFORM_WAYLAND_KHR + constexpr const char* VULKAN_LIB_NAME = "libvulkan.so / libvulkan.so.1"; +#endif + + // Checking common assumptions #ifdef __cplusplus #include diff --git a/src/renderer/buffers/vk_buffer.h b/src/renderer/buffers/vk_buffer.h index f3f1669..203b1ce 100644 --- a/src/renderer/buffers/vk_buffer.h +++ b/src/renderer/buffers/vk_buffer.h @@ -6,16 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 23:18:52 by maldavid #+# #+# */ -/* Updated: 2023/12/12 21:12:44 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:26:56 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_BUFFER__ #define __MLX_VK_BUFFER__ +#include #include #include -#include namespace mlx { diff --git a/src/renderer/buffers/vk_ibo.h b/src/renderer/buffers/vk_ibo.h index f320b94..ad49eed 100644 --- a/src/renderer/buffers/vk_ibo.h +++ b/src/renderer/buffers/vk_ibo.h @@ -6,17 +6,17 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/25 15:05:05 by maldavid #+# #+# */ -/* Updated: 2023/12/11 19:47:47 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:27:02 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __VK_IBO__ #define __VK_IBO__ +#include #include #include "vk_buffer.h" #include -#include namespace mlx { diff --git a/src/renderer/command/cmd_manager.h b/src/renderer/command/cmd_manager.h index 4d5e7c5..ac69876 100644 --- a/src/renderer/command/cmd_manager.h +++ b/src/renderer/command/cmd_manager.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/02 17:48:52 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:07:00 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:27:35 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,8 +15,8 @@ #include -#include #include +#include #include #include #include diff --git a/src/renderer/command/vk_cmd_buffer.h b/src/renderer/command/vk_cmd_buffer.h index 8cc1afb..1e7bccf 100644 --- a/src/renderer/command/vk_cmd_buffer.h +++ b/src/renderer/command/vk_cmd_buffer.h @@ -6,16 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:25:42 by maldavid #+# #+# */ -/* Updated: 2023/12/23 01:24:34 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:27:20 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_CMD_BUFFER__ #define __MLX_VK_CMD_BUFFER__ +#include #include #include -#include namespace mlx { diff --git a/src/renderer/command/vk_cmd_pool.h b/src/renderer/command/vk_cmd_pool.h index 142e05e..8d97157 100644 --- a/src/renderer/command/vk_cmd_pool.h +++ b/src/renderer/command/vk_cmd_pool.h @@ -6,15 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:24:12 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:07:22 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:27:26 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_CMD_POOL__ #define __MLX_VK_CMD_POOL__ -#include #include +#include namespace mlx { diff --git a/src/renderer/core/memory.h b/src/renderer/core/memory.h index 363056d..f977ace 100644 --- a/src/renderer/core/memory.h +++ b/src/renderer/core/memory.h @@ -6,16 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/10/20 02:13:03 by maldavid #+# #+# */ -/* Updated: 2023/12/16 18:53:51 by maldavid ### ########.fr */ +/* Updated: 2024/01/03 15:25:56 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_MEMORY__ #define __MLX_VK_MEMORY__ +#include #include #include -#include namespace mlx { diff --git a/src/renderer/core/render_core.cpp b/src/renderer/core/render_core.cpp index 6ff4a0a..aa3268d 100644 --- a/src/renderer/core/render_core.cpp +++ b/src/renderer/core/render_core.cpp @@ -6,25 +6,12 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/17 23:33:34 by maldavid #+# #+# */ -/* Updated: 2024/01/03 13:47:13 by maldavid ### ########.fr */ +/* Updated: 2024/01/03 15:22:38 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #define VOLK_IMPLEMENTATION -#if defined(MLX_PLAT_WINDOWS) - #define VK_USE_PLATFORM_WIN32_KHR - constexpr const char* VULKAN_LIB_NAME = "vulkan-1.dll"; -#elif defined(MLX_PLAT_MACOS) - #define VK_USE_PLATFORM_MACOS_MVK - #define VK_USE_PLATFORM_METAL_EXT - constexpr const char* VULKAN_LIB_NAME = "libvulkan.dylib / libvulkan.1.dylib / libMoltenVK.dylib"; -#else - #define VK_USE_PLATFORM_XLIB_KHR - #define VK_USE_PLATFORM_WAYLAND_KHR - constexpr const char* VULKAN_LIB_NAME = "libvulkan.so / libvulkan.so.1"; -#endif - #include #include #include diff --git a/src/renderer/core/render_core.h b/src/renderer/core/render_core.h index a4cd398..07e5840 100644 --- a/src/renderer/core/render_core.h +++ b/src/renderer/core/render_core.h @@ -6,13 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 19:16:32 by maldavid #+# #+# */ -/* Updated: 2023/12/31 00:42:42 by maldavid ### ########.fr */ +/* Updated: 2024/01/03 15:26:08 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_RENDER_CORE__ #define __MLX_RENDER_CORE__ +#include #include #include @@ -25,7 +26,6 @@ #include #include -#include namespace mlx { diff --git a/src/renderer/core/vk_device.h b/src/renderer/core/vk_device.h index 24aa329..ecfd47e 100644 --- a/src/renderer/core/vk_device.h +++ b/src/renderer/core/vk_device.h @@ -6,16 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 19:13:42 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:07:49 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:26:14 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_DEVICE__ #define __MLX_VK_DEVICE__ +#include #include #include "vk_queues.h" -#include namespace mlx { diff --git a/src/renderer/core/vk_fence.h b/src/renderer/core/vk_fence.h index aa7c685..d8bd364 100644 --- a/src/renderer/core/vk_fence.h +++ b/src/renderer/core/vk_fence.h @@ -6,15 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/02 17:52:09 by maldavid #+# #+# */ -/* Updated: 2023/12/16 17:27:28 by maldavid ### ########.fr */ +/* Updated: 2024/01/03 15:26:21 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_FENCE__ #define __MLX_VK_FENCE__ -#include #include +#include namespace mlx { diff --git a/src/renderer/core/vk_instance.h b/src/renderer/core/vk_instance.h index 213c19a..e827665 100644 --- a/src/renderer/core/vk_instance.h +++ b/src/renderer/core/vk_instance.h @@ -6,16 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 19:03:04 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:08:14 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:26:26 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_INSTANCE__ #define __MLX_VK_INSTANCE__ +#include #include #include -#include namespace mlx { diff --git a/src/renderer/core/vk_queues.h b/src/renderer/core/vk_queues.h index 3649591..268f4fe 100644 --- a/src/renderer/core/vk_queues.h +++ b/src/renderer/core/vk_queues.h @@ -6,17 +6,17 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 19:01:49 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:08:25 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:26:31 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_QUEUES__ #define __MLX_VK_QUEUES__ +#include #include #include #include -#include namespace mlx { diff --git a/src/renderer/core/vk_semaphore.h b/src/renderer/core/vk_semaphore.h index 1472b61..cdcb72d 100644 --- a/src/renderer/core/vk_semaphore.h +++ b/src/renderer/core/vk_semaphore.h @@ -6,16 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 18:59:38 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:08:36 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:26:39 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_SEMAPHORE__ #define __MLX_VK_SEMAPHORE__ +#include #include #include -#include namespace mlx { diff --git a/src/renderer/core/vk_surface.h b/src/renderer/core/vk_surface.h index c8542f4..c700f8f 100644 --- a/src/renderer/core/vk_surface.h +++ b/src/renderer/core/vk_surface.h @@ -6,16 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 18:57:55 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:08:49 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:26:43 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_SURFACE__ #define __MLX_VK_SURFACE__ +#include #include #include -#include namespace mlx { diff --git a/src/renderer/core/vk_validation_layers.h b/src/renderer/core/vk_validation_layers.h index 1d3a586..85eb48b 100644 --- a/src/renderer/core/vk_validation_layers.h +++ b/src/renderer/core/vk_validation_layers.h @@ -6,15 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/19 14:04:25 by maldavid #+# #+# */ -/* Updated: 2023/12/31 00:38:25 by maldavid ### ########.fr */ +/* Updated: 2024/01/03 15:26:49 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __VK_VALIDATION_LAYERS__ #define __VK_VALIDATION_LAYERS__ -#include #include +#include namespace mlx { diff --git a/src/renderer/descriptors/vk_descriptor_pool.h b/src/renderer/descriptors/vk_descriptor_pool.h index 617ec3e..82cf9c4 100644 --- a/src/renderer/descriptors/vk_descriptor_pool.h +++ b/src/renderer/descriptors/vk_descriptor_pool.h @@ -6,16 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/23 18:32:43 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:09:20 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:27:45 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __VK_DESCRIPTOR_POOL__ #define __VK_DESCRIPTOR_POOL__ +#include #include #include -#include namespace mlx { diff --git a/src/renderer/descriptors/vk_descriptor_set.h b/src/renderer/descriptors/vk_descriptor_set.h index f1e627d..d555d5c 100644 --- a/src/renderer/descriptors/vk_descriptor_set.h +++ b/src/renderer/descriptors/vk_descriptor_set.h @@ -6,16 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/23 18:39:36 by maldavid #+# #+# */ -/* Updated: 2023/12/23 18:47:49 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:27:50 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __VK_DESCRIPTOR_SET__ #define __VK_DESCRIPTOR_SET__ +#include #include #include -#include #include namespace mlx diff --git a/src/renderer/descriptors/vk_descriptor_set_layout.h b/src/renderer/descriptors/vk_descriptor_set_layout.h index 21c4abf..dd9495b 100644 --- a/src/renderer/descriptors/vk_descriptor_set_layout.h +++ b/src/renderer/descriptors/vk_descriptor_set_layout.h @@ -6,18 +6,18 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/23 18:36:22 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:09:44 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:27:55 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __VK_DESCRIPTOR_SET_LAYOUT__ #define __VK_DESCRIPTOR_SET_LAYOUT__ +#include #include #include #include #include -#include namespace mlx { diff --git a/src/renderer/images/vk_image.h b/src/renderer/images/vk_image.h index 958df86..f552fee 100644 --- a/src/renderer/images/vk_image.h +++ b/src/renderer/images/vk_image.h @@ -6,20 +6,20 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/25 11:54:21 by maldavid #+# #+# */ -/* Updated: 2023/12/22 23:31:02 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:28:07 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_IMAGE__ #define __MLX_VK_IMAGE__ +#include #include #include #include #include #include #include -#include namespace mlx { diff --git a/src/renderer/pipeline/pipeline.h b/src/renderer/pipeline/pipeline.h index 78e4213..517ccb9 100644 --- a/src/renderer/pipeline/pipeline.h +++ b/src/renderer/pipeline/pipeline.h @@ -6,15 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/18 21:23:52 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:10:51 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:28:13 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __PIPELINE__ #define __PIPELINE__ -#include #include +#include #include namespace mlx diff --git a/src/renderer/renderpass/vk_framebuffer.h b/src/renderer/renderpass/vk_framebuffer.h index 436e82e..b4db929 100644 --- a/src/renderer/renderpass/vk_framebuffer.h +++ b/src/renderer/renderpass/vk_framebuffer.h @@ -6,15 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:19:44 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:11:04 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:28:19 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_FRAMEBUFFER__ #define __MLX_VK_FRAMEBUFFER__ -#include #include +#include namespace mlx { diff --git a/src/renderer/renderpass/vk_render_pass.h b/src/renderer/renderpass/vk_render_pass.h index 3d57b4d..68d190e 100644 --- a/src/renderer/renderpass/vk_render_pass.h +++ b/src/renderer/renderpass/vk_render_pass.h @@ -6,15 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:22:00 by maldavid #+# #+# */ -/* Updated: 2023/12/24 13:01:56 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:28:25 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_RENDER_PASS__ #define __MLX_VK_RENDER_PASS__ -#include #include +#include namespace mlx { diff --git a/src/renderer/swapchain/vk_swapchain.h b/src/renderer/swapchain/vk_swapchain.h index 8db2155..5fd8827 100644 --- a/src/renderer/swapchain/vk_swapchain.h +++ b/src/renderer/swapchain/vk_swapchain.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:23:27 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:11:30 by kbz_8 ### ########.fr */ +/* Updated: 2024/01/03 15:28:39 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,8 +14,8 @@ #define __MLX_VK_SWAPCHAIN__ #include -#include #include +#include #include namespace mlx