From 7f80671be8b14fe617ec596c5be7166745da772d Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Mon, 25 Mar 2024 18:58:48 +0100 Subject: [PATCH] adding pre compiled header --- Makefile | 55 +++++++------- example/main.c | 6 +- src/core/UUID.cpp | 4 +- src/core/UUID.h | 4 +- src/core/application.cpp | 3 +- src/core/application.h | 8 +-- src/core/bridge.cpp | 6 +- src/core/errors.cpp | 7 +- src/core/errors.h | 5 +- src/core/fps.cpp | 5 +- src/core/fps.h | 4 +- src/core/graphics.h | 9 +-- src/core/memory.cpp | 3 +- src/core/profiler.h | 13 +--- src/platform/inputs.h | 14 ++-- src/platform/window.h | 6 +- src/pre_compiled.h | 72 +++++++++++++++++++ src/renderer/buffers/vk_buffer.cpp | 4 +- src/renderer/buffers/vk_buffer.h | 6 +- src/renderer/buffers/vk_ibo.h | 6 +- src/renderer/buffers/vk_ubo.cpp | 5 +- src/renderer/buffers/vk_ubo.h | 7 +- src/renderer/buffers/vk_vbo.cpp | 3 +- src/renderer/command/cmd_manager.h | 6 +- .../command/single_time_cmd_manager.cpp | 3 +- .../command/single_time_cmd_manager.h | 5 +- src/renderer/command/vk_cmd_buffer.h | 7 +- src/renderer/command/vk_cmd_pool.h | 5 +- src/renderer/core/cmd_resource.h | 5 +- src/renderer/core/drawable_resource.h | 6 +- src/renderer/core/memory.cpp | 14 ++-- src/renderer/core/memory.h | 6 +- src/renderer/core/render_core.cpp | 5 +- src/renderer/core/render_core.h | 6 +- src/renderer/core/vk_device.cpp | 8 +-- src/renderer/core/vk_device.h | 5 +- src/renderer/core/vk_fence.h | 5 +- src/renderer/core/vk_instance.cpp | 3 +- src/renderer/core/vk_instance.h | 6 +- src/renderer/core/vk_queues.cpp | 4 +- src/renderer/core/vk_queues.h | 8 +-- src/renderer/core/vk_semaphore.h | 5 +- src/renderer/core/vk_surface.cpp | 5 +- src/renderer/core/vk_surface.h | 6 +- src/renderer/core/vk_validation_layers.cpp | 4 +- src/renderer/core/vk_validation_layers.h | 5 +- .../descriptors/descriptor_pool_manager.h | 5 +- src/renderer/descriptors/vk_descriptor_pool.h | 6 +- src/renderer/descriptors/vk_descriptor_set.h | 7 +- .../descriptors/vk_descriptor_set_layout.h | 6 +- src/renderer/images/texture.cpp | 3 +- src/renderer/images/texture.h | 10 +-- src/renderer/images/texture_atlas.h | 6 +- src/renderer/images/texture_manager.h | 6 +- src/renderer/images/vk_image.h | 7 +- src/renderer/pipeline/pipeline.h | 6 +- src/renderer/pixel_put.cpp | 3 +- src/renderer/pixel_put.h | 5 +- src/renderer/renderer.h | 5 +- src/renderer/renderpass/vk_framebuffer.cpp | 3 +- src/renderer/renderpass/vk_framebuffer.h | 5 +- src/renderer/renderpass/vk_render_pass.h | 5 +- src/renderer/swapchain/vk_swapchain.cpp | 4 +- src/renderer/swapchain/vk_swapchain.h | 7 +- src/renderer/texts/font.cpp | 3 +- src/renderer/texts/font.h | 7 +- src/renderer/texts/font_library.cpp | 3 +- src/renderer/texts/font_library.h | 9 +-- src/renderer/texts/text.h | 6 +- src/renderer/texts/text_descriptor.h | 8 +-- src/renderer/texts/text_library.cpp | 3 +- src/renderer/texts/text_library.h | 8 +-- src/renderer/texts/text_manager.h | 9 +-- src/utils/combine_hash.h | 5 +- src/utils/dogica_ttf.h | 4 +- src/utils/icon_mlx.h | 4 +- xmake.lua | 2 + 77 files changed, 266 insertions(+), 291 deletions(-) create mode 100644 src/pre_compiled.h diff --git a/Makefile b/Makefile index c621183..cf1ebdd 100644 --- a/Makefile +++ b/Makefile @@ -6,42 +6,42 @@ # By: maldavid +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/10/04 16:43:41 by maldavid #+# #+# # -# Updated: 2024/01/10 14:20:30 by maldavid ### ########.fr # +# Updated: 2024/03/25 18:57:44 by maldavid ### ########.fr # # # # **************************************************************************** # -NAME = libmlx.so +NAME = libmlx.so -SRCS = $(wildcard $(addsuffix /*.cpp, ./src/core)) -SRCS += $(wildcard $(addsuffix /*.cpp, ./src/platform)) -SRCS += $(wildcard $(addsuffix /*.cpp, ./src/renderer)) -SRCS += $(wildcard $(addsuffix /*.cpp, ./src/renderer/**)) +SRCS = $(wildcard $(addsuffix /*.cpp, ./src/core)) +SRCS += $(wildcard $(addsuffix /*.cpp, ./src/platform)) +SRCS += $(wildcard $(addsuffix /*.cpp, ./src/renderer)) +SRCS += $(wildcard $(addsuffix /*.cpp, ./src/renderer/**)) -OBJ_DIR = objs/makefile -OBJS = $(addprefix $(OBJ_DIR)/, $(SRCS:.cpp=.o)) +OBJ_DIR = objs/makefile +OBJS = $(addprefix $(OBJ_DIR)/, $(SRCS:.cpp=.o)) + +PCH = ./src/pre_compiled.h +GCH = ./src/pre_compiled.h.gch OS = $(shell uname -s) -DEBUG ?= false -TOOLCHAIN ?= clang -IMAGES_OPTIMIZED ?= true +DEBUG ?= false +TOOLCHAIN ?= clang +IMAGES_OPTIMIZED ?= true FORCE_INTEGRATED_GPU ?= false GRAPHICS_MEMORY_DUMP ?= false PROFILER ?= false -MODE = "release" +MODE = "release" -CXX = clang++ +CXX = clang++ -CXXFLAGS = -std=c++17 -O3 -fPIC -Wall -Wextra -Werror -DSDL_MAIN_HANDLED -INCLUDES = -I./includes -I./src -I./third_party +CXXFLAGS = -std=c++17 -O3 -fPIC -Wall -Wextra -Wno-deprecated -DSDL_MAIN_HANDLED +INCLUDES = -I./includes -I./src -I./third_party LDLIBS = ifeq ($(TOOLCHAIN), gcc) CXX = g++ - CXXFLAGS += -Wno-error=cpp -else - CXXFLAGS += -Wno-error=#warning endif ifeq ($(OS), Darwin) @@ -73,13 +73,17 @@ endif RM = rm -rf -$(OBJ_DIR)/%.o: %.cpp +$(OBJ_DIR)/%.o: %.cpp $(GCH) @printf "\033[1;32m[compiling... "$(MODE)" "$(CXX)"]\033[1;00m "$<"\n" @$(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@ -all: $(NAME) +all: $(NAME) -$(NAME): $(OBJ_DIR) $(OBJS) +$(GCH): + @printf "\033[1;32m[compiling "$(MODE)" "$(CXX)"]\033[1;00m PreCompiled header\n" + @$(CXX) $(CXXFLAGS) $(INCLUDES) -c $(PCH) -o $(GCH) + +$(NAME): $(GCH) $(OBJ_DIR) $(OBJS) @printf "\033[1;32m[linking ... "$(MODE)"]\033[1;00m "$@"\n" @$(CXX) -shared -o $(NAME) $(OBJS) $(LDLIBS) @printf "\033[1;32m[build finished]\033[1;00m\n" @@ -92,10 +96,11 @@ clean: @$(RM) $(OBJ_DIR) @printf "\033[1;32m[object files removed]\033[1;00m\n" -fclean: clean +fclean: clean @$(RM) $(NAME) - @printf "\033[1;32m["$(NAME)" removed]\033[1;00m\n" + @$(RM) $(GCH) + @printf "\033[1;32m["$(NAME)" and gch removed]\033[1;00m\n" -re: fclean all +re: fclean all -.PHONY: all clean fclean re +.PHONY: all clean fclean re pch diff --git a/example/main.c b/example/main.c index baa9faf..23c5b8e 100644 --- a/example/main.c +++ b/example/main.c @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 17:55:21 by maldavid #+# #+# */ -/* Updated: 2024/03/25 16:16:07 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 18:10:41 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -158,10 +158,6 @@ int main(void) mlx.img = create_image(&mlx); - - mlx_string_put(mlx.mlx, mlx.win, 0, 10, 0xFFFFFF00, "fps:"); - mlx_string_put(mlx.mlx, mlx.win, 0, 20, 0xFFFFFFFF, "fps:"); - mlx_set_font_scale(mlx.mlx, mlx.win, "font.ttf", 16.f); mlx_string_put(mlx.mlx, mlx.win, 20, 20, 0xFF0020FF, "that text will disappear"); diff --git a/src/core/UUID.cpp b/src/core/UUID.cpp index c7f2bb2..6b62b4d 100644 --- a/src/core/UUID.cpp +++ b/src/core/UUID.cpp @@ -6,13 +6,11 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/06 11:26:37 by maldavid #+# #+# */ -/* Updated: 2024/01/06 11:28:15 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:44:06 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include -#include -#include namespace mlx { diff --git a/src/core/UUID.h b/src/core/UUID.h index b26df3b..ac94c1a 100644 --- a/src/core/UUID.h +++ b/src/core/UUID.h @@ -6,14 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/06 11:13:23 by maldavid #+# #+# */ -/* Updated: 2024/01/07 01:44:21 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:43:58 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_UUID__ #define __MLX_UUID__ -#include +#include namespace mlx { diff --git a/src/core/application.cpp b/src/core/application.cpp index 237ab2c..bfb39a7 100644 --- a/src/core/application.cpp +++ b/src/core/application.cpp @@ -6,14 +6,13 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 22:10:52 by maldavid #+# #+# */ -/* Updated: 2024/03/24 14:39:23 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:44:37 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include "application.h" #include #include -#include #include #include #include diff --git a/src/core/application.h b/src/core/application.h index 48717dc..7532e05 100644 --- a/src/core/application.h +++ b/src/core/application.h @@ -6,23 +6,19 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 21:49:46 by maldavid #+# #+# */ -/* Updated: 2024/01/26 11:26:54 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:45:03 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_APPLICATION__ #define __MLX_APPLICATION__ -#include -#include -#include -#include +#include #include #include #include -#include #include #include diff --git a/src/core/bridge.cpp b/src/core/bridge.cpp index 9fb6b5a..ad3b8e2 100644 --- a/src/core/bridge.cpp +++ b/src/core/bridge.cpp @@ -6,18 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 17:35:20 by maldavid #+# #+# */ -/* Updated: 2024/02/23 22:37:24 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:44:56 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ -#include +#include #include "errors.h" #include "application.h" #include -#include #include #include -#include static void* __mlx_ptr = nullptr; diff --git a/src/core/errors.cpp b/src/core/errors.cpp index 63aa607..098abc8 100644 --- a/src/core/errors.cpp +++ b/src/core/errors.cpp @@ -6,14 +6,11 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 17:48:06 by maldavid #+# #+# */ -/* Updated: 2024/01/05 20:41:17 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:45:12 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ -#include -#include -#include -#include +#include #include "errors.h" diff --git a/src/core/errors.h b/src/core/errors.h index 9bfde94..40334e9 100644 --- a/src/core/errors.h +++ b/src/core/errors.h @@ -6,15 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 17:42:32 by maldavid #+# #+# */ -/* Updated: 2023/12/27 17:21:07 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:45:21 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_ERRORS__ #define __MLX_ERRORS__ -#include -#include +#include enum class e_kind { diff --git a/src/core/fps.cpp b/src/core/fps.cpp index eae6a8b..8da10a2 100644 --- a/src/core/fps.cpp +++ b/src/core/fps.cpp @@ -6,14 +6,11 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/18 14:56:17 by maldavid #+# #+# */ -/* Updated: 2024/03/25 16:44:15 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:45:33 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include -#include -#include -#include namespace mlx { diff --git a/src/core/fps.h b/src/core/fps.h index 4433f07..332e812 100644 --- a/src/core/fps.h +++ b/src/core/fps.h @@ -6,14 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/18 14:53:30 by maldavid #+# #+# */ -/* Updated: 2024/01/18 15:16:06 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:45:27 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_FPS__ #define __MLX_FPS__ -#include +#include namespace mlx { diff --git a/src/core/graphics.h b/src/core/graphics.h index 0966527..4ea3116 100644 --- a/src/core/graphics.h +++ b/src/core/graphics.h @@ -6,18 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/02 14:49:49 by maldavid #+# #+# */ -/* Updated: 2024/03/24 14:43:09 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:45:49 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_GRAPHICS__ #define __MLX_GRAPHICS__ -#include -#include - -#include -#include +#include #include #include @@ -27,7 +23,6 @@ #include #include #include -#include #include namespace mlx diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 2e2ee51..708ea73 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -6,13 +6,12 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/07 16:32:01 by kbz_8 #+# #+# */ -/* Updated: 2023/12/11 15:25:02 by kbz_8 ### ########.fr */ +/* Updated: 2024/03/25 17:46:03 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include #include -#include namespace mlx { diff --git a/src/core/profiler.h b/src/core/profiler.h index 4424238..dc75705 100644 --- a/src/core/profiler.h +++ b/src/core/profiler.h @@ -6,23 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/10 13:35:45 by maldavid #+# #+# */ -/* Updated: 2024/03/24 14:41:27 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:46:21 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_PROFILER__ #define __MLX_PROFILER__ +#include + #include -#include -#include -#include -#include -#include -#include -#include -#include -#include namespace mlx { diff --git a/src/platform/inputs.h b/src/platform/inputs.h index 6a575bb..fc12254 100644 --- a/src/platform/inputs.h +++ b/src/platform/inputs.h @@ -6,18 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/05 16:27:35 by maldavid #+# #+# */ -/* Updated: 2024/02/25 07:51:55 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:47:03 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ -#include -#include -#include -#include -#include -#include +#ifndef __MLX_INPUTS__ +#define __MLX_INPUTS__ -#include +#include #include "window.h" @@ -74,3 +70,5 @@ namespace mlx bool _end = false; }; } + +#endif diff --git a/src/platform/window.h b/src/platform/window.h index dfe0924..94f4f00 100644 --- a/src/platform/window.h +++ b/src/platform/window.h @@ -6,16 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 21:53:12 by maldavid #+# #+# */ -/* Updated: 2023/12/21 00:24:26 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:47:10 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_WINDOW__ #define __MLX_WINDOW__ -#include -#include -#include +#include namespace mlx { diff --git a/src/pre_compiled.h b/src/pre_compiled.h new file mode 100644 index 0000000..f795a4b --- /dev/null +++ b/src/pre_compiled.h @@ -0,0 +1,72 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* pre_compiled.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/03/25 17:37:23 by maldavid #+# #+# */ +/* Updated: 2024/03/25 18:06:01 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef __MLX_PRE_COMPILED_HEADER__ +#define __MLX_PRE_COMPILED_HEADER__ + +#define VK_NO_PROTOTYPES + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef MLX_COMPILER_CLANG + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Weverything" + #include + #pragma clang diagnostic pop +#elif defined(MLX_COMPILER_GCC) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" + #pragma GCC diagnostic ignored "-Wmissing-field-initializers" + #pragma GCC diagnostic ignored "-Wunused-parameter" + #pragma GCC diagnostic ignored "-Wunused-variable" + #pragma GCC diagnostic ignored "-Wparentheses" + #include + #pragma GCC diagnostic pop +#else + #include +#endif + +#endif diff --git a/src/renderer/buffers/vk_buffer.cpp b/src/renderer/buffers/vk_buffer.cpp index 71693cc..421543a 100644 --- a/src/renderer/buffers/vk_buffer.cpp +++ b/src/renderer/buffers/vk_buffer.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 18:55:57 by maldavid #+# #+# */ -/* Updated: 2024/03/14 17:28:35 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:47:35 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,8 +15,6 @@ #include #include #include -#include -#include namespace mlx { diff --git a/src/renderer/buffers/vk_buffer.h b/src/renderer/buffers/vk_buffer.h index f36b27f..12d9533 100644 --- a/src/renderer/buffers/vk_buffer.h +++ b/src/renderer/buffers/vk_buffer.h @@ -6,15 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 23:18:52 by maldavid #+# #+# */ -/* Updated: 2024/01/11 05:16:58 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:47:28 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_BUFFER__ #define __MLX_VK_BUFFER__ -#include -#include +#include + #include #include diff --git a/src/renderer/buffers/vk_ibo.h b/src/renderer/buffers/vk_ibo.h index 7acc988..e317b4e 100644 --- a/src/renderer/buffers/vk_ibo.h +++ b/src/renderer/buffers/vk_ibo.h @@ -6,15 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/25 15:05:05 by maldavid #+# #+# */ -/* Updated: 2024/01/10 23:05:15 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:47:55 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __VK_IBO__ #define __VK_IBO__ -#include -#include +#include + #include "vk_buffer.h" #include diff --git a/src/renderer/buffers/vk_ubo.cpp b/src/renderer/buffers/vk_ubo.cpp index 996516c..52cb3df 100644 --- a/src/renderer/buffers/vk_ubo.cpp +++ b/src/renderer/buffers/vk_ubo.cpp @@ -6,12 +6,13 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:45:52 by maldavid #+# #+# */ -/* Updated: 2024/01/10 18:30:57 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:48:07 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ +#include + #include "vk_ubo.h" -#include #include #include diff --git a/src/renderer/buffers/vk_ubo.h b/src/renderer/buffers/vk_ubo.h index 74a7fd9..0b8b53f 100644 --- a/src/renderer/buffers/vk_ubo.h +++ b/src/renderer/buffers/vk_ubo.h @@ -6,17 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:45:29 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:06:28 by kbz_8 ### ########.fr */ +/* Updated: 2024/03/25 17:48:14 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_UBO__ #define __MLX_VK_UBO__ +#include + #include "vk_buffer.h" -#include -#include -#include namespace mlx { diff --git a/src/renderer/buffers/vk_vbo.cpp b/src/renderer/buffers/vk_vbo.cpp index ec17a88..5dc857d 100644 --- a/src/renderer/buffers/vk_vbo.cpp +++ b/src/renderer/buffers/vk_vbo.cpp @@ -6,12 +6,11 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:28:08 by maldavid #+# #+# */ -/* Updated: 2023/12/12 22:17:14 by kbz_8 ### ########.fr */ +/* Updated: 2024/03/25 17:48:20 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include "vk_vbo.h" -#include namespace mlx { diff --git a/src/renderer/command/cmd_manager.h b/src/renderer/command/cmd_manager.h index ac69876..a623aa2 100644 --- a/src/renderer/command/cmd_manager.h +++ b/src/renderer/command/cmd_manager.h @@ -6,17 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/02 17:48:52 by maldavid #+# #+# */ -/* Updated: 2024/01/03 15:27:35 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:48:39 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_COMMAND_MANAGER__ #define __MLX_COMMAND_MANAGER__ -#include +#include -#include -#include #include #include #include diff --git a/src/renderer/command/single_time_cmd_manager.cpp b/src/renderer/command/single_time_cmd_manager.cpp index b4dcf7b..1ba8ad6 100644 --- a/src/renderer/command/single_time_cmd_manager.cpp +++ b/src/renderer/command/single_time_cmd_manager.cpp @@ -6,11 +6,10 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/15 19:57:49 by maldavid #+# #+# */ -/* Updated: 2024/01/11 03:13:21 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:48:44 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ -#include #include #include diff --git a/src/renderer/command/single_time_cmd_manager.h b/src/renderer/command/single_time_cmd_manager.h index 271fdf9..f95c8f8 100644 --- a/src/renderer/command/single_time_cmd_manager.h +++ b/src/renderer/command/single_time_cmd_manager.h @@ -6,14 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/15 18:25:57 by maldavid #+# #+# */ -/* Updated: 2024/01/07 01:30:19 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:48:51 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_SINGLE_TIME_CMD_MANAGER__ #define __MLX_SINGLE_TIME_CMD_MANAGER__ -#include +#include + #include #include diff --git a/src/renderer/command/vk_cmd_buffer.h b/src/renderer/command/vk_cmd_buffer.h index d8fd7aa..10755fc 100644 --- a/src/renderer/command/vk_cmd_buffer.h +++ b/src/renderer/command/vk_cmd_buffer.h @@ -6,17 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:25:42 by maldavid #+# #+# */ -/* Updated: 2024/01/07 01:25:50 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:49:10 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_CMD_BUFFER__ #define __MLX_VK_CMD_BUFFER__ -#include -#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 8d97157..04b4a93 100644 --- a/src/renderer/command/vk_cmd_pool.h +++ b/src/renderer/command/vk_cmd_pool.h @@ -6,15 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:24:12 by maldavid #+# #+# */ -/* Updated: 2024/01/03 15:27:26 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:49:19 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_CMD_POOL__ #define __MLX_VK_CMD_POOL__ -#include -#include +#include namespace mlx { diff --git a/src/renderer/core/cmd_resource.h b/src/renderer/core/cmd_resource.h index 0010333..8f0d4f7 100644 --- a/src/renderer/core/cmd_resource.h +++ b/src/renderer/core/cmd_resource.h @@ -6,14 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/16 20:44:29 by maldavid #+# #+# */ -/* Updated: 2024/03/14 17:28:08 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:49:25 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_COMMAND_RESOURCE__ #define __MLX_COMMAND_RESOURCE__ -#include +#include + #include namespace mlx diff --git a/src/renderer/core/drawable_resource.h b/src/renderer/core/drawable_resource.h index 8df2b98..a6ab54f 100644 --- a/src/renderer/core/drawable_resource.h +++ b/src/renderer/core/drawable_resource.h @@ -6,16 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/10 21:00:37 by maldavid #+# #+# */ -/* Updated: 2024/01/11 01:21:15 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:49:33 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_DRAWABLE_RESOURCE__ #define __MLX_DRAWABLE_RESOURCE__ -#include -#include -#include +#include namespace mlx { diff --git a/src/renderer/core/memory.cpp b/src/renderer/core/memory.cpp index e3cbe7c..c59d1f4 100644 --- a/src/renderer/core/memory.cpp +++ b/src/renderer/core/memory.cpp @@ -6,14 +6,13 @@ /* By: kbz_8 +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/10/20 22:02:37 by kbz_8 #+# #+# */ -/* Updated: 2024/03/14 16:34:53 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 18:10:10 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include -#include -#include +#define VK_NO_PROTOTYPES #define VMA_STATIC_VULKAN_FUNCTIONS 0 #define VMA_DYNAMIC_VULKAN_FUNCTIONS 0 #define VMA_VULKAN_VERSION 1002000 @@ -23,7 +22,7 @@ #ifdef MLX_COMPILER_CLANG #pragma clang diagnostic push #pragma clang diagnostic ignored "-Weverything" - #include + #include #pragma clang diagnostic pop #elif defined(MLX_COMPILER_GCC) #pragma GCC diagnostic push @@ -32,14 +31,15 @@ #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wparentheses" - #include + #include #pragma GCC diagnostic pop #else - #include + #include #endif +#include +#include #include -#include namespace mlx { diff --git a/src/renderer/core/memory.h b/src/renderer/core/memory.h index 46cd13f..b82063a 100644 --- a/src/renderer/core/memory.h +++ b/src/renderer/core/memory.h @@ -6,16 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/10/20 02:13:03 by maldavid #+# #+# */ -/* Updated: 2024/03/25 16:01:06 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:49:47 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 1de3720..4162cda 100644 --- a/src/renderer/core/render_core.cpp +++ b/src/renderer/core/render_core.cpp @@ -6,13 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/17 23:33:34 by maldavid #+# #+# */ -/* Updated: 2024/01/20 08:20:07 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 18:04:28 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ +#define VK_NO_PROTOTYPES #define VOLK_IMPLEMENTATION +#include -#include #include #include diff --git a/src/renderer/core/render_core.h b/src/renderer/core/render_core.h index cf4aae5..88a319e 100644 --- a/src/renderer/core/render_core.h +++ b/src/renderer/core/render_core.h @@ -6,16 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 19:16:32 by maldavid #+# #+# */ -/* Updated: 2024/01/20 08:17:58 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:49:59 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_RENDER_CORE__ #define __MLX_RENDER_CORE__ -#include -#include -#include +#include #include #include diff --git a/src/renderer/core/vk_device.cpp b/src/renderer/core/vk_device.cpp index f862772..1a7b602 100644 --- a/src/renderer/core/vk_device.cpp +++ b/src/renderer/core/vk_device.cpp @@ -6,17 +6,11 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 19:14:29 by maldavid #+# #+# */ -/* Updated: 2024/03/14 17:23:45 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:50:26 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include "render_core.h" -#include -#include -#include -#include -#include -#include namespace mlx { diff --git a/src/renderer/core/vk_device.h b/src/renderer/core/vk_device.h index ad7b5ca..7fb4525 100644 --- a/src/renderer/core/vk_device.h +++ b/src/renderer/core/vk_device.h @@ -6,15 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 19:13:42 by maldavid #+# #+# */ -/* Updated: 2024/03/14 16:59:54 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:50:32 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_DEVICE__ #define __MLX_VK_DEVICE__ -#include -#include +#include namespace mlx { diff --git a/src/renderer/core/vk_fence.h b/src/renderer/core/vk_fence.h index d8bd364..0237010 100644 --- a/src/renderer/core/vk_fence.h +++ b/src/renderer/core/vk_fence.h @@ -6,15 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/02 17:52:09 by maldavid #+# #+# */ -/* Updated: 2024/01/03 15:26:21 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:50:52 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_FENCE__ #define __MLX_VK_FENCE__ -#include -#include +#include namespace mlx { diff --git a/src/renderer/core/vk_instance.cpp b/src/renderer/core/vk_instance.cpp index 040f9d8..8b5b18a 100644 --- a/src/renderer/core/vk_instance.cpp +++ b/src/renderer/core/vk_instance.cpp @@ -6,14 +6,13 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 19:04:21 by maldavid #+# #+# */ -/* Updated: 2024/02/24 21:10:32 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:50:59 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include "vk_instance.h" #include "render_core.h" #include -#include namespace mlx { diff --git a/src/renderer/core/vk_instance.h b/src/renderer/core/vk_instance.h index e827665..e85e165 100644 --- a/src/renderer/core/vk_instance.h +++ b/src/renderer/core/vk_instance.h @@ -6,16 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 19:03:04 by maldavid #+# #+# */ -/* Updated: 2024/01/03 15:26:26 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:51:09 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.cpp b/src/renderer/core/vk_queues.cpp index b4f4ba3..8d712d5 100644 --- a/src/renderer/core/vk_queues.cpp +++ b/src/renderer/core/vk_queues.cpp @@ -6,13 +6,11 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 19:02:42 by maldavid #+# #+# */ -/* Updated: 2024/03/14 17:01:10 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:51:35 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include "render_core.h" -#include -#include namespace mlx { diff --git a/src/renderer/core/vk_queues.h b/src/renderer/core/vk_queues.h index 2a4a1ba..5dda2fd 100644 --- a/src/renderer/core/vk_queues.h +++ b/src/renderer/core/vk_queues.h @@ -6,17 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 19:01:49 by maldavid #+# #+# */ -/* Updated: 2024/03/14 17:00:48 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:51:31 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_QUEUES__ #define __MLX_VK_QUEUES__ -#include -#include -#include -#include +#include + #include namespace mlx diff --git a/src/renderer/core/vk_semaphore.h b/src/renderer/core/vk_semaphore.h index f17ff9e..8e568ba 100644 --- a/src/renderer/core/vk_semaphore.h +++ b/src/renderer/core/vk_semaphore.h @@ -6,15 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 18:59:38 by maldavid #+# #+# */ -/* Updated: 2024/03/14 17:01:57 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:51:47 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_SEMAPHORE__ #define __MLX_VK_SEMAPHORE__ -#include -#include +#include namespace mlx { diff --git a/src/renderer/core/vk_surface.cpp b/src/renderer/core/vk_surface.cpp index e2e2ac4..ebe2ed2 100644 --- a/src/renderer/core/vk_surface.cpp +++ b/src/renderer/core/vk_surface.cpp @@ -6,16 +6,13 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 18:58:49 by maldavid #+# #+# */ -/* Updated: 2024/01/10 21:55:21 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:51:54 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include "render_core.h" #include #include -#include -#include -#include namespace mlx { diff --git a/src/renderer/core/vk_surface.h b/src/renderer/core/vk_surface.h index c700f8f..4f8cb9f 100644 --- a/src/renderer/core/vk_surface.h +++ b/src/renderer/core/vk_surface.h @@ -6,16 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 18:57:55 by maldavid #+# #+# */ -/* Updated: 2024/01/03 15:26:43 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:52:02 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.cpp b/src/renderer/core/vk_validation_layers.cpp index a63b7fb..9c119fd 100644 --- a/src/renderer/core/vk_validation_layers.cpp +++ b/src/renderer/core/vk_validation_layers.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/19 14:05:25 by maldavid #+# #+# */ -/* Updated: 2024/03/14 17:03:24 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:52:08 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,8 +14,6 @@ #include "vulkan/vulkan_core.h" #include -#include -#include namespace mlx { diff --git a/src/renderer/core/vk_validation_layers.h b/src/renderer/core/vk_validation_layers.h index 0758669..2d0ff13 100644 --- a/src/renderer/core/vk_validation_layers.h +++ b/src/renderer/core/vk_validation_layers.h @@ -6,15 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/19 14:04:25 by maldavid #+# #+# */ -/* Updated: 2024/03/14 17:02:55 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:52:19 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __VK_VALIDATION_LAYERS__ #define __VK_VALIDATION_LAYERS__ -#include -#include +#include namespace mlx { diff --git a/src/renderer/descriptors/descriptor_pool_manager.h b/src/renderer/descriptors/descriptor_pool_manager.h index 228b0f3..d4ff428 100644 --- a/src/renderer/descriptors/descriptor_pool_manager.h +++ b/src/renderer/descriptors/descriptor_pool_manager.h @@ -6,15 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/20 06:26:26 by maldavid #+# #+# */ -/* Updated: 2024/01/20 08:23:04 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:52:32 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_DESCRIPTOR_POOL_MANAGER__ #define __MLX_DESCRIPTOR_POOL_MANAGER__ +#include + #include -#include namespace mlx { diff --git a/src/renderer/descriptors/vk_descriptor_pool.h b/src/renderer/descriptors/vk_descriptor_pool.h index 67acdb3..b303b1c 100644 --- a/src/renderer/descriptors/vk_descriptor_pool.h +++ b/src/renderer/descriptors/vk_descriptor_pool.h @@ -6,16 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/23 18:32:43 by maldavid #+# #+# */ -/* Updated: 2024/01/20 07:38:32 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:52:39 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 4eb7372..61fd7a4 100644 --- a/src/renderer/descriptors/vk_descriptor_set.h +++ b/src/renderer/descriptors/vk_descriptor_set.h @@ -6,16 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/23 18:39:36 by maldavid #+# #+# */ -/* Updated: 2024/01/20 07:17:39 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:52:57 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 b3a5c97..13cd5a0 100644 --- a/src/renderer/descriptors/vk_descriptor_set_layout.h +++ b/src/renderer/descriptors/vk_descriptor_set_layout.h @@ -6,16 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/23 18:36:22 by maldavid #+# #+# */ -/* Updated: 2024/01/20 06:25:54 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:53:05 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __VK_DESCRIPTOR_SET_LAYOUT__ #define __VK_DESCRIPTOR_SET_LAYOUT__ -#include -#include -#include +#include namespace mlx { diff --git a/src/renderer/images/texture.cpp b/src/renderer/images/texture.cpp index 9a48307..caa5118 100644 --- a/src/renderer/images/texture.cpp +++ b/src/renderer/images/texture.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/31 18:03:35 by maldavid #+# #+# */ -/* Updated: 2024/03/14 19:07:01 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:53:37 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,6 @@ #include #include #include -#include #define STB_IMAGE_IMPLEMENTATION #include diff --git a/src/renderer/images/texture.h b/src/renderer/images/texture.h index 77282cf..aaa91ff 100644 --- a/src/renderer/images/texture.h +++ b/src/renderer/images/texture.h @@ -6,23 +6,19 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/08 02:24:58 by maldavid #+# #+# */ -/* Updated: 2024/03/14 19:06:07 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:53:30 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_TEXTURE__ #define __MLX_TEXTURE__ -#include -#include +#include + #include #include #include #include -#include -#ifdef DEBUG - #include -#endif namespace mlx { diff --git a/src/renderer/images/texture_atlas.h b/src/renderer/images/texture_atlas.h index 4a33b1a..7717fdd 100644 --- a/src/renderer/images/texture_atlas.h +++ b/src/renderer/images/texture_atlas.h @@ -6,16 +6,16 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/07 16:36:33 by maldavid #+# #+# */ -/* Updated: 2024/03/14 19:57:55 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:53:50 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_TEXTURE_ATLAS__ #define __MLX_TEXTURE_ATLAS__ +#include + #include -#include -#include namespace mlx { diff --git a/src/renderer/images/texture_manager.h b/src/renderer/images/texture_manager.h index a0b37d5..098f5f4 100644 --- a/src/renderer/images/texture_manager.h +++ b/src/renderer/images/texture_manager.h @@ -6,17 +6,17 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/11 00:56:15 by maldavid #+# #+# */ -/* Updated: 2024/03/25 13:53:59 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:54:02 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_TEXTURE_MANAGER__ #define __MLX_TEXTURE_MANAGER__ -#include +#include + #include #include -#include namespace mlx { diff --git a/src/renderer/images/vk_image.h b/src/renderer/images/vk_image.h index 017ec41..d103173 100644 --- a/src/renderer/images/vk_image.h +++ b/src/renderer/images/vk_image.h @@ -6,16 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/25 11:54:21 by maldavid #+# #+# */ -/* Updated: 2024/01/19 06:10:15 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:54:12 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_IMAGE__ #define __MLX_VK_IMAGE__ -#include -#include -#include +#include + #include #include #include diff --git a/src/renderer/pipeline/pipeline.h b/src/renderer/pipeline/pipeline.h index 9700dc7..36155d0 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: 2024/03/14 17:04:28 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:54:23 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __PIPELINE__ #define __PIPELINE__ -#include -#include +#include + #include namespace mlx diff --git a/src/renderer/pixel_put.cpp b/src/renderer/pixel_put.cpp index ef2b911..e70b321 100644 --- a/src/renderer/pixel_put.cpp +++ b/src/renderer/pixel_put.cpp @@ -6,12 +6,11 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/31 15:14:50 by maldavid #+# #+# */ -/* Updated: 2024/01/11 00:06:01 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:57:56 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include -#include #include namespace mlx diff --git a/src/renderer/pixel_put.h b/src/renderer/pixel_put.h index 1de58cd..58876b4 100644 --- a/src/renderer/pixel_put.h +++ b/src/renderer/pixel_put.h @@ -6,14 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/31 13:18:50 by maldavid #+# #+# */ -/* Updated: 2024/01/11 00:06:05 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:57:52 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #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 a0fc309..65d8277 100644 --- a/src/renderer/renderer.h +++ b/src/renderer/renderer.h @@ -6,15 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/18 17:14:45 by maldavid #+# #+# */ -/* Updated: 2024/03/14 16:34:20 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:58:04 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __RENDERER__ #define __RENDERER__ -#include -#include +#include #include #include diff --git a/src/renderer/renderpass/vk_framebuffer.cpp b/src/renderer/renderpass/vk_framebuffer.cpp index 20ac661..585e8e0 100644 --- a/src/renderer/renderpass/vk_framebuffer.cpp +++ b/src/renderer/renderpass/vk_framebuffer.cpp @@ -6,11 +6,10 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:18:06 by maldavid #+# #+# */ -/* Updated: 2024/01/10 21:52:51 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:54:45 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ -#include #include #include #include diff --git a/src/renderer/renderpass/vk_framebuffer.h b/src/renderer/renderpass/vk_framebuffer.h index 275c3e6..0ddd24e 100644 --- a/src/renderer/renderpass/vk_framebuffer.h +++ b/src/renderer/renderpass/vk_framebuffer.h @@ -6,15 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:19:44 by maldavid #+# #+# */ -/* Updated: 2024/01/03 15:28:19 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:54:39 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 a0a7c23..58ecbfc 100644 --- a/src/renderer/renderpass/vk_render_pass.h +++ b/src/renderer/renderpass/vk_render_pass.h @@ -6,15 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:22:00 by maldavid #+# #+# */ -/* Updated: 2024/03/14 17:05:40 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:55:01 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.cpp b/src/renderer/swapchain/vk_swapchain.cpp index 0ce2967..6ab48aa 100644 --- a/src/renderer/swapchain/vk_swapchain.cpp +++ b/src/renderer/swapchain/vk_swapchain.cpp @@ -6,15 +6,13 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:22:28 by maldavid #+# #+# */ -/* Updated: 2024/03/14 17:08:19 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:55:30 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include #include #include -#include -#include namespace mlx { diff --git a/src/renderer/swapchain/vk_swapchain.h b/src/renderer/swapchain/vk_swapchain.h index 81ff0f4..b31fa24 100644 --- a/src/renderer/swapchain/vk_swapchain.h +++ b/src/renderer/swapchain/vk_swapchain.h @@ -6,16 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:23:27 by maldavid #+# #+# */ -/* Updated: 2024/03/14 17:06:41 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:55:25 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_VK_SWAPCHAIN__ #define __MLX_VK_SWAPCHAIN__ -#include -#include -#include +#include + #include namespace mlx diff --git a/src/renderer/texts/font.cpp b/src/renderer/texts/font.cpp index 37f2d0a..4d5397a 100644 --- a/src/renderer/texts/font.cpp +++ b/src/renderer/texts/font.cpp @@ -6,14 +6,13 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/11 22:06:09 by kbz_8 #+# #+# */ -/* Updated: 2024/01/18 13:16:18 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:55:59 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include #include #include -#include constexpr const int RANGE = 1024; diff --git a/src/renderer/texts/font.h b/src/renderer/texts/font.h index 0c898a8..a64bf7a 100644 --- a/src/renderer/texts/font.h +++ b/src/renderer/texts/font.h @@ -6,18 +6,17 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/11 21:17:04 by kbz_8 #+# #+# */ -/* Updated: 2024/01/18 13:15:55 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:55:52 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_FONT__ #define __MLX_FONT__ -#include -#include +#include + #include #include -#include namespace mlx { diff --git a/src/renderer/texts/font_library.cpp b/src/renderer/texts/font_library.cpp index e3a04c0..87b4f12 100644 --- a/src/renderer/texts/font_library.cpp +++ b/src/renderer/texts/font_library.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/18 09:28:14 by maldavid #+# #+# */ -/* Updated: 2024/01/18 13:07:48 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:56:09 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,6 @@ #include #include #include -#include #include namespace mlx diff --git a/src/renderer/texts/font_library.h b/src/renderer/texts/font_library.h index 3019ea1..3de3819 100644 --- a/src/renderer/texts/font_library.h +++ b/src/renderer/texts/font_library.h @@ -6,18 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/18 09:26:03 by maldavid #+# #+# */ -/* Updated: 2024/01/18 09:33:30 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:56:19 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_FONT_LIBRARY__ #define __MLX_FONT_LIBRARY__ -#include -#include -#include -#include -#include +#include + #include #include #include diff --git a/src/renderer/texts/text.h b/src/renderer/texts/text.h index fd244fd..00d446b 100644 --- a/src/renderer/texts/text.h +++ b/src/renderer/texts/text.h @@ -6,15 +6,15 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/11 00:09:04 by maldavid #+# #+# */ -/* Updated: 2024/03/25 16:16:48 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:56:34 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_TEXT__ #define __MLX_TEXT__ -#include -#include +#include + #include #include #include diff --git a/src/renderer/texts/text_descriptor.h b/src/renderer/texts/text_descriptor.h index 27a89cd..cc1374b 100644 --- a/src/renderer/texts/text_descriptor.h +++ b/src/renderer/texts/text_descriptor.h @@ -6,21 +6,19 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/11 00:13:34 by maldavid #+# #+# */ -/* Updated: 2024/02/25 07:58:13 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:56:49 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_TEXT_DESCRIPTOR__ #define __MLX_TEXT_DESCRIPTOR__ -#include -#include -#include +#include + #include #include #include #include -#include namespace mlx { diff --git a/src/renderer/texts/text_library.cpp b/src/renderer/texts/text_library.cpp index 652356c..74f7f85 100644 --- a/src/renderer/texts/text_library.cpp +++ b/src/renderer/texts/text_library.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/10 11:59:57 by maldavid #+# #+# */ -/* Updated: 2024/03/25 16:17:06 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:57:06 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,6 @@ #include #include #include -#include #include namespace mlx diff --git a/src/renderer/texts/text_library.h b/src/renderer/texts/text_library.h index 2b9345b..9d8d2f8 100644 --- a/src/renderer/texts/text_library.h +++ b/src/renderer/texts/text_library.h @@ -6,19 +6,17 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/10 11:52:30 by maldavid #+# #+# */ -/* Updated: 2024/03/25 16:04:47 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:57:00 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_TEXT_LIBRARY__ #define __MLX_TEXT_LIBRARY__ +#include + #include #include -#include -#include -#include -#include #include #include #include diff --git a/src/renderer/texts/text_manager.h b/src/renderer/texts/text_manager.h index 140e87d..1bef272 100644 --- a/src/renderer/texts/text_manager.h +++ b/src/renderer/texts/text_manager.h @@ -6,20 +6,17 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/06 16:24:11 by maldavid #+# #+# */ -/* Updated: 2024/03/14 17:08:43 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:57:35 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_TEXT_MANAGER__ #define __MLX_TEXT_MANAGER__ +#include + #include #include -#include -#include -#include -#include -#include #include #include #include diff --git a/src/utils/combine_hash.h b/src/utils/combine_hash.h index 48a33a3..d8fc484 100644 --- a/src/utils/combine_hash.h +++ b/src/utils/combine_hash.h @@ -6,15 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/14 16:16:06 by maldavid #+# #+# */ -/* Updated: 2023/12/14 16:47:39 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:58:16 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_HASH__ #define __MLX_HASH__ -#include -#include +#include namespace mlx { diff --git a/src/utils/dogica_ttf.h b/src/utils/dogica_ttf.h index e890ab3..68176a2 100644 --- a/src/utils/dogica_ttf.h +++ b/src/utils/dogica_ttf.h @@ -6,14 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/11 16:20:25 by maldavid #+# #+# */ -/* Updated: 2023/12/14 16:54:12 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:43:52 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __MLX_DOGICA_TTF__ #define __MLX_DOGICA_TTF__ -#include +#include constexpr const unsigned int dogica_ttf_len = 33860; diff --git a/src/utils/icon_mlx.h b/src/utils/icon_mlx.h index 04f0029..13f4df3 100644 --- a/src/utils/icon_mlx.h +++ b/src/utils/icon_mlx.h @@ -6,14 +6,14 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/25 11:23:16 by maldavid #+# #+# */ -/* Updated: 2023/11/25 11:55:51 by maldavid ### ########.fr */ +/* Updated: 2024/03/25 17:58:24 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef __ICON_MLX__ #define __ICON_MLX__ -#include +#include constexpr const int logo_mlx_height = 125; constexpr const int logo_mlx_width = 125; diff --git a/xmake.lua b/xmake.lua index 93f72d0..d2d835d 100644 --- a/xmake.lua +++ b/xmake.lua @@ -55,6 +55,8 @@ target("mlx") add_options("graphics_memory_dump") add_includedirs("includes", "src", "third_party") + set_pcxxheader("src/pre_compiled.h") + add_defines("MLX_BUILD", "SDL_MAIN_HANDLED") add_files("src/**.cpp")