kbz_8/MacroLibX
1
0
Fork 0
mirror of https://github.com/seekrs/MacroLibX.git synced 2026-01-11 14:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing windows compilation issue

Browse Source
This commit is contained in:
kbz_8
2024-01-03 15:30:26 +01:00
parent 4ab70c2c35
commit 988ccf32db
24 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
includes/mlx_profile.h
View File

@@ -6,7 +6,7 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <climits>

4
src/renderer/buffers/vk_buffer.h
View File

@@ -6,16 +6,16 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include <renderer/core/render_core.h>
#include <mlx_profile.h>
namespace mlx
{

4
src/renderer/buffers/vk_ibo.h
View File

@@ -6,17 +6,17 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include "vk_buffer.h"
#include <renderer/renderer.h>
#include <mlx_profile.h>
namespace mlx
{

4
src/renderer/command/cmd_manager.h
View File

@@ -6,7 +6,7 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <array>
#include <volk.h>
#include <mlx_profile.h>
#include <volk.h>
#include <renderer/core/render_core.h>
#include <renderer/command/vk_cmd_pool.h>
#include <renderer/command/vk_cmd_buffer.h>

4
src/renderer/command/vk_cmd_buffer.h
View File

@@ -6,16 +6,16 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include <renderer/core/vk_fence.h>
#include <mlx_profile.h>
namespace mlx
{

4
src/renderer/command/vk_cmd_pool.h
View File

@@ -6,15 +6,15 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <volk.h>
#include <mlx_profile.h>
#include <volk.h>
namespace mlx
{

4
src/renderer/core/memory.h
View File

@@ -6,16 +6,16 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include <vma.h>
#include <mlx_profile.h>
namespace mlx
{

15
src/renderer/core/render_core.cpp
View File

@@ -6,25 +6,12 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <renderer/core/render_core.h>
#include <mutex>

4
src/renderer/core/render_core.h
View File

@@ -6,13 +6,14 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include <optional>
@@ -25,7 +26,6 @@
#include <utils/singleton.h>
#include <core/errors.h>
#include <mlx_profile.h>
namespace mlx
{

4
src/renderer/core/vk_device.h
View File

@@ -6,16 +6,16 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include "vk_queues.h"
#include <mlx_profile.h>
namespace mlx
{

4
src/renderer/core/vk_fence.h
View File

@@ -6,15 +6,15 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <volk.h>
#include <mlx_profile.h>
#include <volk.h>
namespace mlx
{

4
src/renderer/core/vk_instance.h
View File

@@ -6,16 +6,16 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include <vector>
#include <mlx_profile.h>
namespace mlx
{

4
src/renderer/core/vk_queues.h
View File

@@ -6,17 +6,17 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include <optional>
#include <cstdint>
#include <mlx_profile.h>
namespace mlx
{

4
src/renderer/core/vk_semaphore.h
View File

@@ -6,16 +6,16 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include <vector>
#include <mlx_profile.h>
namespace mlx
{

4
src/renderer/core/vk_surface.h
View File

@@ -6,16 +6,16 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include <vector>
#include <mlx_profile.h>
namespace mlx
{

4
src/renderer/core/vk_validation_layers.h
View File

@@ -6,15 +6,15 @@
/* By: maldavid <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <volk.h>
#include <mlx_profile.h>
#include <volk.h>
namespace mlx
{

4
src/renderer/descriptors/vk_descriptor_pool.h
View File

@@ -6,16 +6,16 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include <cstddef>
#include <mlx_profile.h>
namespace mlx
{

4
src/renderer/descriptors/vk_descriptor_set.h
View File

@@ -6,16 +6,16 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include <array>
#include <mlx_profile.h>
#include <renderer/core/render_core.h>
namespace mlx

4
src/renderer/descriptors/vk_descriptor_set_layout.h
View File

@@ -6,18 +6,18 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include <cstddef>
#include <vector>
#include <map>
#include <mlx_profile.h>
namespace mlx
{

4
src/renderer/images/vk_image.h
View File

@@ -6,20 +6,20 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <mlx_profile.h>
#include <volk.h>
#include <cstddef>
#include <vector>
#include <vma.h>
#include <renderer/command/vk_cmd_buffer.h>
#include <renderer/command/vk_cmd_pool.h>
#include <mlx_profile.h>
namespace mlx
{

4
src/renderer/pipeline/pipeline.h
View File

@@ -6,15 +6,15 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <volk.h>
#include <mlx_profile.h>
#include <volk.h>
#include <renderer/command/vk_cmd_buffer.h>
namespace mlx

4
src/renderer/renderpass/vk_framebuffer.h
View File

@@ -6,15 +6,15 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <volk.h>
#include <mlx_profile.h>
#include <volk.h>
namespace mlx
{

4
src/renderer/renderpass/vk_render_pass.h
View File

@@ -6,15 +6,15 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <volk.h>
#include <mlx_profile.h>
#include <volk.h>
namespace mlx
{

4
src/renderer/swapchain/vk_swapchain.h
View File

@@ -6,7 +6,7 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <vector>
#include <volk.h>
#include <mlx_profile.h>
#include <volk.h>
#include <renderer/images/vk_image.h>
namespace mlx