Skip to content

Commit 11073a2

Browse files
committed
debugging CI
1 parent c1898fb commit 11073a2

File tree

5 files changed

+19605
-5
lines changed

5 files changed

+19605
-5
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# ::: :::::::: #
44
# Makefile :+: :+: :+: #
55
# +:+ +:+ +:+ #
6-
# By: vvaas <vvaas@student.42.fr> +#+ +:+ +#+ #
6+
# By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ #
77
# +#+#+#+#+#+ +#+ #
88
# Created: 2022/10/04 16:43:41 by maldavid #+# #+# #
9-
# Updated: 2023/10/19 23:47:59 by maldavid ### ########.fr #
9+
# Updated: 2023/10/20 00:03:33 by maldavid ### ########.fr #
1010
# #
1111
# **************************************************************************** #
1212

src/renderer/buffers/vk_buffer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/10/08 18:55:57 by maldavid #+# #+# */
9-
/* Updated: 2023/04/23 12:37:32 by maldavid ### ########.fr */
9+
/* Updated: 2023/10/20 02:02:24 by maldavid ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

1313
#include "vk_buffer.h"
1414
#include <renderer/command/vk_cmd_pool.h>
1515
#include <renderer/core/render_core.h>
16+
#include <vma.h>
1617
#include <cstring>
1718

1819
namespace mlx

src/renderer/core/memory.h

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/* ************************************************************************** */
2+
/* */
3+
/* ::: :::::::: */
4+
/* memory.h :+: :+: :+: */
5+
/* +:+ +:+ +:+ */
6+
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
7+
/* +#+#+#+#+#+ +#+ */
8+
/* Created: 2023/10/20 02:13:03 by maldavid #+# #+# */
9+
/* Updated: 2023/10/20 03:33:28 by maldavid ### ########.fr */
10+
/* */
11+
/* ************************************************************************** */
12+
13+
#ifndef __MLX_VK_MEMORY__
14+
#define __MLX_VK_MEMORY__
15+
16+
#include <volk.h>
17+
#include <vma.h>
18+
19+
namespace mlx
20+
{
21+
enum class gpu_allocation_type
22+
{
23+
buffer,
24+
image,
25+
};
26+
27+
class GPUallocator
28+
{
29+
public:
30+
GPUallocator() = default;
31+
void init() noexcept;
32+
VkDeviceMemory alloc(gpu_allocation_type type, VkDeviceSize size);
33+
void destroy() noexcept;
34+
~GPUallocator() = default;
35+
36+
private:
37+
VmaAllocator _allocator;
38+
};
39+
}
40+
41+
#endif

src/renderer/core/vk_instance.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/10/08 19:04:21 by maldavid #+# #+# */
9-
/* Updated: 2023/01/25 15:28:18 by maldavid ### ########.fr */
9+
/* Updated: 2023/10/20 03:12:07 by maldavid ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -24,7 +24,7 @@ namespace mlx
2424
appInfo.pApplicationName = "MacroLibX";
2525
appInfo.applicationVersion = VK_MAKE_VERSION(1, 0, 0);
2626
appInfo.pEngineName = "MacroLibX";
27-
appInfo.engineVersion = VK_MAKE_VERSION(0, 0, 1);
27+
appInfo.engineVersion = VK_MAKE_VERSION(1, 0, 0);
2828
appInfo.apiVersion = VK_API_VERSION_1_2;
2929

3030
VkInstanceCreateInfo createInfo{};

0 commit comments

Comments
 (0)