From 4d6c970a7160ee865737a72c7eb84f14ec93478b Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Mon, 11 Dec 2023 20:28:58 +0100 Subject: [PATCH] moving profile to API scope --- includes/mlx.h | 20 ++++----- src/core/profile.h => includes/mlx_profile.h | 45 +++++++++++++------ src/core/application.cpp | 4 +- src/core/application.h | 4 +- src/core/errors.h | 4 +- src/core/graphics.h | 4 +- src/core/memory.h | 4 +- src/platform/inputs.h | 4 +- src/platform/window.h | 4 +- src/renderer/buffers/vk_buffer.h | 4 +- src/renderer/buffers/vk_ibo.h | 4 +- src/renderer/buffers/vk_ubo.h | 2 +- src/renderer/buffers/vk_vbo.h | 2 +- src/renderer/command/cmd_manager.h | 2 +- src/renderer/command/vk_cmd_buffer.h | 2 +- src/renderer/command/vk_cmd_pool.h | 2 +- src/renderer/core/memory.cpp | 2 +- src/renderer/core/memory.h | 2 +- src/renderer/core/render_core.h | 2 +- src/renderer/core/vk_device.h | 2 +- src/renderer/core/vk_fence.h | 2 +- src/renderer/core/vk_instance.h | 2 +- src/renderer/core/vk_queues.h | 2 +- src/renderer/core/vk_semaphore.h | 2 +- src/renderer/core/vk_surface.h | 2 +- src/renderer/core/vk_validation_layers.h | 2 +- src/renderer/descriptors/vk_descriptor_pool.h | 2 +- src/renderer/descriptors/vk_descriptor_set.h | 2 +- .../descriptors/vk_descriptor_set_layout.h | 2 +- src/renderer/images/texture.h | 2 +- src/renderer/images/texture_atlas.h | 2 +- src/renderer/images/vk_image.h | 2 +- src/renderer/pipeline/pipeline.h | 2 +- src/renderer/pixel_put.h | 2 +- src/renderer/renderer.h | 2 +- src/renderer/renderpass/vk_framebuffer.h | 2 +- src/renderer/renderpass/vk_render_pass.h | 2 +- src/renderer/swapchain/vk_swapchain.h | 2 +- src/renderer/text_library.h | 2 +- src/renderer/text_pipeline.h | 2 +- 40 files changed, 87 insertions(+), 72 deletions(-) rename src/core/profile.h => includes/mlx_profile.h (52%) diff --git a/includes/mlx.h b/includes/mlx.h index 57dc761..7225f6a 100644 --- a/includes/mlx.h +++ b/includes/mlx.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 16:56:35 by maldavid #+# #+# */ -/* Updated: 2023/12/08 18:07:40 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/11 19:45:15 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,18 +15,16 @@ #ifndef __MACRO_LIB_X_H__ #define __MACRO_LIB_X_H__ -#if defined(_WIN32) || defined(_WIN64) - #define MLX_EXPORT __declspec(dllexport) - #define MLX_IMPORT __declspec(dllimport) -#else - #define MLX_EXPORT - #define MLX_IMPORT -#endif +#include "mlx_profile.h" -#ifdef MLX_BUILD - #define MLX_API MLX_EXPORT +#ifdef MLX_COMPILER_MSVC + #ifdef MLX_BUILD + #define MLX_API __declspec(dllexport) + #else + #define MLX_IMPORT __declspec(dllimport) + #endif #else - #define MLX_API MLX_IMPORT + #define MLX_API #endif #ifdef __cplusplus diff --git a/src/core/profile.h b/includes/mlx_profile.h similarity index 52% rename from src/core/profile.h rename to includes/mlx_profile.h index 45d6ed7..107a45c 100644 --- a/src/core/profile.h +++ b/includes/mlx_profile.h @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* profile.h :+: :+: :+: */ +/* mlx_profile.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/10 08:49:17 by maldavid #+# #+# */ -/* Updated: 2023/12/08 18:49:38 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/11 20:25:51 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -53,21 +53,38 @@ #error "Unknown environment!" #endif - // Checking common assumptions -#include -#include +#ifdef __cplusplus + #include + #include -static_assert(CHAR_BIT == 8, "CHAR_BIT is expected to be 8"); + static_assert(CHAR_BIT == 8, "CHAR_BIT is expected to be 8"); -static_assert(sizeof(int8_t) == 1, "int8_t is not of the correct size" ); -static_assert(sizeof(int16_t) == 2, "int16_t is not of the correct size"); -static_assert(sizeof(int32_t) == 4, "int32_t is not of the correct size"); -static_assert(sizeof(int64_t) == 8, "int64_t is not of the correct size"); + static_assert(sizeof(int8_t) == 1, "int8_t is not of the correct size" ); + static_assert(sizeof(int16_t) == 2, "int16_t is not of the correct size"); + static_assert(sizeof(int32_t) == 4, "int32_t is not of the correct size"); + static_assert(sizeof(int64_t) == 8, "int64_t is not of the correct size"); -static_assert(sizeof(uint8_t) == 1, "uint8_t is not of the correct size" ); -static_assert(sizeof(uint16_t) == 2, "uint16_t is not of the correct size"); -static_assert(sizeof(uint32_t) == 4, "uint32_t is not of the correct size"); -static_assert(sizeof(uint64_t) == 8, "uint64_t is not of the correct size"); + static_assert(sizeof(uint8_t) == 1, "uint8_t is not of the correct size" ); + static_assert(sizeof(uint16_t) == 2, "uint16_t is not of the correct size"); + static_assert(sizeof(uint32_t) == 4, "uint32_t is not of the correct size"); + static_assert(sizeof(uint64_t) == 8, "uint64_t is not of the correct size"); +#else + #define STATIC_ASSERT(COND, MSG) typedef char static_assertion___##MSG[(COND)?1:-1] + #include + #include + + STATIC_ASSERT(CHAR_BIT == 8, CHAR_BIT_is_expected_to_be_8); + + STATIC_ASSERT(sizeof(int8_t) == 1, int8_t_is_not_of_the_correct_size); + STATIC_ASSERT(sizeof(int16_t) == 2, int16_t_is_not_of_the_correct_size); + STATIC_ASSERT(sizeof(int32_t) == 4, int32_t_is_not_of_the_correct_size); + STATIC_ASSERT(sizeof(int64_t) == 8, int64_t_is_not_of_the_correct_size); + + STATIC_ASSERT(sizeof(uint8_t) == 1, uint8_t_is_not_of_the_correct_size); + STATIC_ASSERT(sizeof(uint16_t) == 2, uint16_t_is_not_of_the_correct_size); + STATIC_ASSERT(sizeof(uint32_t) == 4, uint32_t_is_not_of_the_correct_size); + STATIC_ASSERT(sizeof(uint64_t) == 8, uint64_t_is_not_of_the_correct_size); +#endif #endif diff --git a/src/core/application.cpp b/src/core/application.cpp index 2136d81..5072560 100644 --- a/src/core/application.cpp +++ b/src/core/application.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 22:10:52 by maldavid #+# #+# */ -/* Updated: 2023/12/11 15:12:39 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/11 19:46:13 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include namespace mlx::core diff --git a/src/core/application.h b/src/core/application.h index 80e7aac..272bda1 100644 --- a/src/core/application.h +++ b/src/core/application.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 21:49:46 by maldavid #+# #+# */ -/* Updated: 2023/12/10 22:19:59 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/11 19:46:49 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,7 +24,7 @@ #include #include -#include +#include namespace mlx::core { diff --git a/src/core/errors.h b/src/core/errors.h index d8f5ba1..d5aa359 100644 --- a/src/core/errors.h +++ b/src/core/errors.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 17:42:32 by maldavid #+# #+# */ -/* Updated: 2023/12/08 18:53:11 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/11 19:46:57 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ #define __MLX_ERRORS__ #include -#include +#include enum class e_kind { diff --git a/src/core/graphics.h b/src/core/graphics.h index 2680162..ffd8e56 100644 --- a/src/core/graphics.h +++ b/src/core/graphics.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/02 14:49:49 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:04:59 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/11 19:47:03 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -26,7 +26,7 @@ #include #include #include -#include +#include namespace mlx { diff --git a/src/core/memory.h b/src/core/memory.h index e669a07..6d61b88 100644 --- a/src/core/memory.h +++ b/src/core/memory.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/07 16:31:51 by kbz_8 #+# #+# */ -/* Updated: 2023/12/11 15:13:46 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/11 19:47:13 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ #define __MLX_MEMORY__ #include -#include +#include #include namespace mlx diff --git a/src/platform/inputs.h b/src/platform/inputs.h index 8ebb428..9e68289 100644 --- a/src/platform/inputs.h +++ b/src/platform/inputs.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/05 16:27:35 by maldavid #+# #+# */ -/* Updated: 2023/12/11 19:06:13 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/11 19:47:20 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,7 +18,7 @@ #include #include -#include +#include #include "window.h" diff --git a/src/platform/window.h b/src/platform/window.h index f1c7f16..b362b90 100644 --- a/src/platform/window.h +++ b/src/platform/window.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 21:53:12 by maldavid #+# #+# */ -/* Updated: 2023/12/09 16:35:57 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/11 19:47:26 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ #include #include -#include +#include namespace mlx { diff --git a/src/renderer/buffers/vk_buffer.h b/src/renderer/buffers/vk_buffer.h index 783c486..08b4344 100644 --- a/src/renderer/buffers/vk_buffer.h +++ b/src/renderer/buffers/vk_buffer.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 23:18:52 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:05:50 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/11 19:47:39 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ #include #include -#include +#include namespace mlx { diff --git a/src/renderer/buffers/vk_ibo.h b/src/renderer/buffers/vk_ibo.h index ecaa21f..f320b94 100644 --- a/src/renderer/buffers/vk_ibo.h +++ b/src/renderer/buffers/vk_ibo.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/25 15:05:05 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:06:07 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/11 19:47:47 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,7 +16,7 @@ #include #include "vk_buffer.h" #include -#include +#include namespace mlx { diff --git a/src/renderer/buffers/vk_ubo.h b/src/renderer/buffers/vk_ubo.h index 057e24e..6dcdc21 100644 --- a/src/renderer/buffers/vk_ubo.h +++ b/src/renderer/buffers/vk_ubo.h @@ -16,7 +16,7 @@ #include "vk_buffer.h" #include #include -#include +#include namespace mlx { diff --git a/src/renderer/buffers/vk_vbo.h b/src/renderer/buffers/vk_vbo.h index 7b52c76..6c67332 100644 --- a/src/renderer/buffers/vk_vbo.h +++ b/src/renderer/buffers/vk_vbo.h @@ -15,7 +15,7 @@ #include "vk_buffer.h" #include -#include +#include namespace mlx { diff --git a/src/renderer/command/cmd_manager.h b/src/renderer/command/cmd_manager.h index e6a13be..4d5e7c5 100644 --- a/src/renderer/command/cmd_manager.h +++ b/src/renderer/command/cmd_manager.h @@ -16,7 +16,7 @@ #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 0b4e742..eca0520 100644 --- a/src/renderer/command/vk_cmd_buffer.h +++ b/src/renderer/command/vk_cmd_buffer.h @@ -15,7 +15,7 @@ #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 cacc651..142e05e 100644 --- a/src/renderer/command/vk_cmd_pool.h +++ b/src/renderer/command/vk_cmd_pool.h @@ -14,7 +14,7 @@ #define __MLX_VK_CMD_POOL__ #include -#include +#include namespace mlx { diff --git a/src/renderer/core/memory.cpp b/src/renderer/core/memory.cpp index 7a07d28..9e2d9b7 100644 --- a/src/renderer/core/memory.cpp +++ b/src/renderer/core/memory.cpp @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include +#include #include #include diff --git a/src/renderer/core/memory.h b/src/renderer/core/memory.h index 671a90b..71e5974 100644 --- a/src/renderer/core/memory.h +++ b/src/renderer/core/memory.h @@ -15,7 +15,7 @@ #include #include -#include +#include namespace mlx { diff --git a/src/renderer/core/render_core.h b/src/renderer/core/render_core.h index 8319cca..e3fde08 100644 --- a/src/renderer/core/render_core.h +++ b/src/renderer/core/render_core.h @@ -24,7 +24,7 @@ #include #include -#include +#include namespace mlx { diff --git a/src/renderer/core/vk_device.h b/src/renderer/core/vk_device.h index c2353af..24aa329 100644 --- a/src/renderer/core/vk_device.h +++ b/src/renderer/core/vk_device.h @@ -15,7 +15,7 @@ #include #include "vk_queues.h" -#include +#include namespace mlx { diff --git a/src/renderer/core/vk_fence.h b/src/renderer/core/vk_fence.h index 342ce78..f50e223 100644 --- a/src/renderer/core/vk_fence.h +++ b/src/renderer/core/vk_fence.h @@ -14,7 +14,7 @@ #define __MLX_VK_FENCE__ #include -#include +#include #include namespace mlx diff --git a/src/renderer/core/vk_instance.h b/src/renderer/core/vk_instance.h index d5de82d..213c19a 100644 --- a/src/renderer/core/vk_instance.h +++ b/src/renderer/core/vk_instance.h @@ -15,7 +15,7 @@ #include #include -#include +#include namespace mlx { diff --git a/src/renderer/core/vk_queues.h b/src/renderer/core/vk_queues.h index 1716999..3649591 100644 --- a/src/renderer/core/vk_queues.h +++ b/src/renderer/core/vk_queues.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include namespace mlx { diff --git a/src/renderer/core/vk_semaphore.h b/src/renderer/core/vk_semaphore.h index 9ae964f..1472b61 100644 --- a/src/renderer/core/vk_semaphore.h +++ b/src/renderer/core/vk_semaphore.h @@ -15,7 +15,7 @@ #include #include -#include +#include namespace mlx { diff --git a/src/renderer/core/vk_surface.h b/src/renderer/core/vk_surface.h index 24dd3ec..c8542f4 100644 --- a/src/renderer/core/vk_surface.h +++ b/src/renderer/core/vk_surface.h @@ -15,7 +15,7 @@ #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 a956674..41a0909 100644 --- a/src/renderer/core/vk_validation_layers.h +++ b/src/renderer/core/vk_validation_layers.h @@ -14,7 +14,7 @@ #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 7a97760..617ec3e 100644 --- a/src/renderer/descriptors/vk_descriptor_pool.h +++ b/src/renderer/descriptors/vk_descriptor_pool.h @@ -15,7 +15,7 @@ #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 d9c51d3..270b46e 100644 --- a/src/renderer/descriptors/vk_descriptor_set.h +++ b/src/renderer/descriptors/vk_descriptor_set.h @@ -15,7 +15,7 @@ #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 23d2ef2..21c4abf 100644 --- a/src/renderer/descriptors/vk_descriptor_set_layout.h +++ b/src/renderer/descriptors/vk_descriptor_set_layout.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include namespace mlx { diff --git a/src/renderer/images/texture.h b/src/renderer/images/texture.h index e15b5fc..695e580 100644 --- a/src/renderer/images/texture.h +++ b/src/renderer/images/texture.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include namespace mlx { diff --git a/src/renderer/images/texture_atlas.h b/src/renderer/images/texture_atlas.h index 59a0edc..c571e27 100644 --- a/src/renderer/images/texture_atlas.h +++ b/src/renderer/images/texture_atlas.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include namespace mlx { diff --git a/src/renderer/images/vk_image.h b/src/renderer/images/vk_image.h index 7e0e865..2498c90 100644 --- a/src/renderer/images/vk_image.h +++ b/src/renderer/images/vk_image.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include namespace mlx { diff --git a/src/renderer/pipeline/pipeline.h b/src/renderer/pipeline/pipeline.h index 6dbfe7a..78e4213 100644 --- a/src/renderer/pipeline/pipeline.h +++ b/src/renderer/pipeline/pipeline.h @@ -14,7 +14,7 @@ #define __PIPELINE__ #include -#include +#include #include namespace mlx diff --git a/src/renderer/pixel_put.h b/src/renderer/pixel_put.h index 503bf62..bd51d41 100644 --- a/src/renderer/pixel_put.h +++ b/src/renderer/pixel_put.h @@ -13,7 +13,7 @@ #ifndef __MLX_PIXEL_PUT__ #define __MLX_PIXEL_PUT__ -#include +#include #include #include diff --git a/src/renderer/renderer.h b/src/renderer/renderer.h index d00a00d..1dedc61 100644 --- a/src/renderer/renderer.h +++ b/src/renderer/renderer.h @@ -31,7 +31,7 @@ #include #include -#include +#include #include diff --git a/src/renderer/renderpass/vk_framebuffer.h b/src/renderer/renderpass/vk_framebuffer.h index d8c92ed..436e82e 100644 --- a/src/renderer/renderpass/vk_framebuffer.h +++ b/src/renderer/renderpass/vk_framebuffer.h @@ -14,7 +14,7 @@ #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 c955800..bc2171b 100644 --- a/src/renderer/renderpass/vk_render_pass.h +++ b/src/renderer/renderpass/vk_render_pass.h @@ -14,7 +14,7 @@ #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 b6b8374..8db2155 100644 --- a/src/renderer/swapchain/vk_swapchain.h +++ b/src/renderer/swapchain/vk_swapchain.h @@ -15,7 +15,7 @@ #include #include -#include +#include #include namespace mlx diff --git a/src/renderer/text_library.h b/src/renderer/text_library.h index aa124c3..b889224 100644 --- a/src/renderer/text_library.h +++ b/src/renderer/text_library.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include namespace mlx { diff --git a/src/renderer/text_pipeline.h b/src/renderer/text_pipeline.h index e1e29ec..b6ca962 100644 --- a/src/renderer/text_pipeline.h +++ b/src/renderer/text_pipeline.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include namespace mlx {