From 4c1043ee179e756353f209ea156f868f3f2b3007 Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Mon, 23 Jan 2023 19:27:37 +0100 Subject: [PATCH] adding descriptors support to renderer --- Makefile | 3 +- src/platform/window.cpp | 4 +- src/renderer/buffers/vk_ubo.cpp | 63 +++++++++++++--- src/renderer/buffers/vk_ubo.h | 29 +++++++- src/renderer/core/render_core.cpp | 4 +- .../descriptors/vk_descriptor_pool.cpp | 34 +++++++++ src/renderer/descriptors/vk_descriptor_pool.h | 35 +++++++++ .../descriptors/vk_descriptor_set.cpp | 74 +++++++++++++++++++ src/renderer/descriptors/vk_descriptor_set.h | 38 ++++++++++ .../descriptors/vk_descriptor_set_layout.cpp | 40 ++++++++++ .../descriptors/vk_descriptor_set_layout.h | 35 +++++++++ src/renderer/renderer.h | 8 +- test/main.c | 7 +- 13 files changed, 346 insertions(+), 28 deletions(-) create mode 100644 src/renderer/descriptors/vk_descriptor_pool.cpp create mode 100644 src/renderer/descriptors/vk_descriptor_pool.h create mode 100644 src/renderer/descriptors/vk_descriptor_set.cpp create mode 100644 src/renderer/descriptors/vk_descriptor_set.h create mode 100644 src/renderer/descriptors/vk_descriptor_set_layout.cpp create mode 100644 src/renderer/descriptors/vk_descriptor_set_layout.h diff --git a/Makefile b/Makefile index 4849dad..561c2c0 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: maldavid +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/10/04 16:43:41 by maldavid #+# #+# # -# Updated: 2022/12/19 00:06:48 by maldavid ### ########.fr # +# Updated: 2023/01/23 18:30:59 by maldavid ### ########.fr # # # # **************************************************************************** # @@ -44,7 +44,6 @@ $(NAME): $(OBJS) clean: @$(RM) $(OBJS) - @$(RM) $(OBJS_B) fclean: clean @$(RM) $(NAME) diff --git a/src/platform/window.cpp b/src/platform/window.cpp index 328fc92..3863c1a 100644 --- a/src/platform/window.cpp +++ b/src/platform/window.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 17:36:44 by maldavid #+# #+# */ -/* Updated: 2022/12/19 15:53:35 by maldavid ### ########.fr */ +/* Updated: 2023/01/22 18:53:41 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -31,7 +31,7 @@ namespace mlx _renderer->init(); _vbo.create(sizeof(Vertex)); - proj = glm::ortho(_width, 0, _height, 0); + proj = glm::ortho(0, _width, 0, _height); } bool MLX_Window::beginFrame() diff --git a/src/renderer/buffers/vk_ubo.cpp b/src/renderer/buffers/vk_ubo.cpp index 7063ffd..fd96343 100644 --- a/src/renderer/buffers/vk_ubo.cpp +++ b/src/renderer/buffers/vk_ubo.cpp @@ -6,29 +6,68 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:45:52 by maldavid #+# #+# */ -/* Updated: 2022/12/18 00:25:55 by maldavid ### ########.fr */ +/* Updated: 2023/01/23 18:54:12 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ #include "vk_ubo.h" #include +#include namespace mlx { - void UBO::setData(uint32_t size, const void* data) + void UBO::create(Renderer* renderer, uint32_t size) { - void* temp = nullptr; - mapMem(&temp); - std::memcpy(temp, data, static_cast(size)); - unmapMem(); + _renderer = renderer; + + for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) + { + _buffers[i].create(Buffer::kind::uniform, size, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT); + _buffers[i].mapMem(&_maps[i]); + if(_maps[i] == nullptr) + core::error::report(e_kind::fatal_error, "Vulkan : unable to map a uniform buffer"); + } } - void UBO::setDynamicData(uint32_t size, uint32_t typeSize, const void* data) + void UBO::setData(uint32_t size, const void* data) { - void* temp = nullptr; - mapMem(&temp); - std::memcpy(temp, data, static_cast(size)); - Buffer::flush(); - unmapMem(); + std::memcpy(_maps[_renderer->getActiveImageIndex()], data, static_cast(size)); + } + + void UBO::setDynamicData(uint32_t size, const void* data) + { + std::memcpy(_maps[_renderer->getActiveImageIndex()], data, static_cast(size)); + _buffers[_renderer->getActiveImageIndex()].flush(); + } + + unsigned int UBO::getSize() noexcept + { + return _buffers[_renderer->getActiveImageIndex()].getSize(); + } + + unsigned int UBO::getOffset() noexcept + { + return _buffers[_renderer->getActiveImageIndex()].getOffset(); + } + + VkDeviceMemory UBO::getDeviceMemory() noexcept + { + return _buffers[_renderer->getActiveImageIndex()].getDeviceMemory(); + } + + VkBuffer& UBO::operator()() noexcept + { + return _buffers[_renderer->getActiveImageIndex()].get(); + } + + VkBuffer& UBO::get() noexcept + { + return _buffers[_renderer->getActiveImageIndex()].get(); + } + + void UBO::destroy() noexcept + { + for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) + _buffers[i].destroy(); } } diff --git a/src/renderer/buffers/vk_ubo.h b/src/renderer/buffers/vk_ubo.h index daaf928..64aa48d 100644 --- a/src/renderer/buffers/vk_ubo.h +++ b/src/renderer/buffers/vk_ubo.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:45:29 by maldavid #+# #+# */ -/* Updated: 2022/10/06 18:45:49 by maldavid ### ########.fr */ +/* Updated: 2023/01/23 18:54:08 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,16 +14,37 @@ #define __MLX_VK_UBO__ #include "vk_buffer.h" +#include +#include namespace mlx { - class UBO : public Buffer + class UBO { public: - inline void create(uint32_t size) { Buffer::create(Buffer::kind::dynamic, size, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT); } + void create(class Renderer* renderer, uint32_t size); void setData(uint32_t size, const void* data); - void setDynamicData(uint32_t size, uint32_t typeSize, const void* data); + void setDynamicData(uint32_t size, const void* data); + + void destroy() noexcept; + + unsigned int getSize() noexcept; + unsigned int getOffset() noexcept; + VkDeviceMemory getDeviceMemory() noexcept; + VkBuffer& operator()() noexcept; + VkBuffer& get() noexcept; + + inline unsigned int getSize(int i) noexcept { return _buffers[i].getSize(); } + inline unsigned int getOffset(int i) noexcept { return _buffers[i].getOffset(); } + inline VkDeviceMemory getDeviceMemory(int i) noexcept { return _buffers[i].getDeviceMemory(); } + inline VkBuffer& operator()(int i) noexcept { return _buffers[i].get(); } + inline VkBuffer& get(int i) noexcept { return _buffers[i].get(); } + + private: + std::array _buffers; + std::array _maps; + class Renderer* _renderer = nullptr; }; } diff --git a/src/renderer/core/render_core.cpp b/src/renderer/core/render_core.cpp index 882ceef..6339cd9 100644 --- a/src/renderer/core/render_core.cpp +++ b/src/renderer/core/render_core.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/17 23:33:34 by maldavid #+# #+# */ -/* Updated: 2022/12/19 14:08:57 by maldavid ### ########.fr */ +/* Updated: 2023/01/23 18:28:12 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -71,8 +71,10 @@ namespace mlx volkInitialize(); _instance.init(); + volkLoadInstance(_instance.get()); _layers.init(); _device.init(); + volkLoadDevice(_device.get()); _queues.init(); _is_init = true; } diff --git a/src/renderer/descriptors/vk_descriptor_pool.cpp b/src/renderer/descriptors/vk_descriptor_pool.cpp new file mode 100644 index 0000000..54d25db --- /dev/null +++ b/src/renderer/descriptors/vk_descriptor_pool.cpp @@ -0,0 +1,34 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* vk_descriptor_pool.cpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2023/01/23 18:34:23 by maldavid #+# #+# */ +/* Updated: 2023/01/23 18:44:51 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "vk_descriptor_pool.h" +#include + +namespace mlx +{ + void DescriptorPool::init(std::size_t n, VkDescriptorPoolSize* size) + { + VkDescriptorPoolCreateInfo poolInfo{}; + poolInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; + poolInfo.poolSizeCount = n; + poolInfo.pPoolSizes = size; + poolInfo.maxSets = 8192; + + if(vkCreateDescriptorPool(Render_Core::get().getDevice().get(), &poolInfo, nullptr, &_pool) != VK_SUCCESS) + core::error::report(e_kind::fatal_error, "Vulkan : failed to create descriptor pool"); + } + + void DescriptorPool::destroy() noexcept + { + vkDestroyDescriptorPool(Render_Core::get().getDevice().get(), _pool, nullptr); + } +} diff --git a/src/renderer/descriptors/vk_descriptor_pool.h b/src/renderer/descriptors/vk_descriptor_pool.h new file mode 100644 index 0000000..115cecb --- /dev/null +++ b/src/renderer/descriptors/vk_descriptor_pool.h @@ -0,0 +1,35 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* vk_descriptor_pool.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2023/01/23 18:32:43 by maldavid #+# #+# */ +/* Updated: 2023/01/23 18:44:40 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef __VK_DESCRIPTOR_POOL__ +#define __VK_DESCRIPTOR_POOL__ + +#include +#include + +namespace mlx +{ + class DescriptorPool + { + public: + void init(std::size_t n, VkDescriptorPoolSize* size); + void destroy() noexcept; + + inline VkDescriptorPool& operator()() noexcept { return _pool; } + inline VkDescriptorPool& get() noexcept { return _pool; } + + private: + VkDescriptorPool _pool = VK_NULL_HANDLE; + }; +} + +#endif diff --git a/src/renderer/descriptors/vk_descriptor_set.cpp b/src/renderer/descriptors/vk_descriptor_set.cpp new file mode 100644 index 0000000..b15902b --- /dev/null +++ b/src/renderer/descriptors/vk_descriptor_set.cpp @@ -0,0 +1,74 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* vk_descriptor_set.cpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2023/01/23 18:40:44 by maldavid #+# #+# */ +/* Updated: 2023/01/23 18:54:28 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "vk_descriptor_set.h" +#include "vk_descriptor_pool.h" +#include "vk_descriptor_set_layout.h" +#include +#include + +namespace mlx +{ + void DescriptorSet::init(Renderer* renderer, UBO* ubo, DescriptorSetLayout& layout, DescriptorPool& pool) + { + _renderer = renderer; + + auto device = Render_Core::get().getDevice().get(); + + _pool = pool.get(); + + std::array layouts; + layouts.fill(layout.get()); + + VkDescriptorSetAllocateInfo allocInfo{}; + allocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; + allocInfo.descriptorPool = _pool; + allocInfo.descriptorSetCount = MAX_FRAMES_IN_FLIGHT; + allocInfo.pSetLayouts = layouts.data(); + + if(vkAllocateDescriptorSets(device, &allocInfo, _desc_set.data()) != VK_SUCCESS) + core::error::report(e_kind::fatal_error, "Vulkan : failed to allocate descriptor set"); + + for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) + { + VkDescriptorBufferInfo bufferInfo{}; + bufferInfo.buffer = ubo->get(i); + bufferInfo.offset = ubo->getOffset(i); + bufferInfo.range = ubo->getSize(i); + + VkWriteDescriptorSet descriptorWrite{}; + descriptorWrite.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + descriptorWrite.dstSet = _desc_set[i]; + descriptorWrite.dstBinding = 0; + descriptorWrite.dstArrayElement = 0; + descriptorWrite.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + descriptorWrite.descriptorCount = 1; + descriptorWrite.pBufferInfo = &bufferInfo; + + vkUpdateDescriptorSets(device, 1, &descriptorWrite, 0, nullptr); + } + } + + VkDescriptorSet& DescriptorSet::operator()() noexcept + { + return _desc_set[_renderer->getActiveImageIndex()]; + } + VkDescriptorSet& DescriptorSet::get() noexcept + { + return _desc_set[_renderer->getActiveImageIndex()]; + } + + void DescriptorSet::destroy() noexcept + { + vkFreeDescriptorSets(Render_Core::get().getDevice().get(), _pool, MAX_FRAMES_IN_FLIGHT, _desc_set.data()); + } +} diff --git a/src/renderer/descriptors/vk_descriptor_set.h b/src/renderer/descriptors/vk_descriptor_set.h new file mode 100644 index 0000000..84c00ee --- /dev/null +++ b/src/renderer/descriptors/vk_descriptor_set.h @@ -0,0 +1,38 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* vk_descriptor_set.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2023/01/23 18:39:36 by maldavid #+# #+# */ +/* Updated: 2023/01/23 18:54:22 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef __VK_DESCRIPTOR_SET__ +#define __VK_DESCRIPTOR_SET__ + +#include +#include +#include + +namespace mlx +{ + class DescriptorSet + { + public: + void init(class Renderer* renderer, class UBO* ubo, class DescriptorSetLayout& layout, class DescriptorPool& pool); + void destroy() noexcept; + + VkDescriptorSet& operator()() noexcept; + VkDescriptorSet& get() noexcept; + + private: + std::array _desc_set; + VkDescriptorPool _pool = VK_NULL_HANDLE; + class Renderer* _renderer = nullptr; + }; +} + +#endif diff --git a/src/renderer/descriptors/vk_descriptor_set_layout.cpp b/src/renderer/descriptors/vk_descriptor_set_layout.cpp new file mode 100644 index 0000000..4fb3639 --- /dev/null +++ b/src/renderer/descriptors/vk_descriptor_set_layout.cpp @@ -0,0 +1,40 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* vk_descriptor_set_layout.cpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2023/01/23 18:37:28 by maldavid #+# #+# */ +/* Updated: 2023/01/23 18:45:32 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "vk_descriptor_set_layout.h" +#include + +namespace mlx +{ + void DescriptorSetLayout::init(VkDescriptorType t, std::size_t n, int binding, VkShaderStageFlagBits stage) + { + VkDescriptorSetLayoutBinding bindings{}; + bindings.binding = binding; + bindings.descriptorCount = 1; + bindings.descriptorType = t; + bindings.pImmutableSamplers = nullptr; + bindings.stageFlags = stage; + + VkDescriptorSetLayoutCreateInfo layoutInfo{}; + layoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; + layoutInfo.bindingCount = n; + layoutInfo.pBindings = &bindings; + + if(vkCreateDescriptorSetLayout(Render_Core::get().getDevice().get(), &layoutInfo, nullptr, &_layout) != VK_SUCCESS) + core::error::report(e_kind::fatal_error, "Vulkan : failed to create descriptor set layout"); + } + + void DescriptorSetLayout::destroy() noexcept + { + vkDestroyDescriptorSetLayout(Render_Core::get().getDevice().get(), _layout, nullptr); + } +} diff --git a/src/renderer/descriptors/vk_descriptor_set_layout.h b/src/renderer/descriptors/vk_descriptor_set_layout.h new file mode 100644 index 0000000..8ae6751 --- /dev/null +++ b/src/renderer/descriptors/vk_descriptor_set_layout.h @@ -0,0 +1,35 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* vk_descriptor_set_layout.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maldavid +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2023/01/23 18:36:22 by maldavid #+# #+# */ +/* Updated: 2023/01/23 18:45:44 by maldavid ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef __VK_DESCRIPTOR_SET_LAYOUT__ +#define __VK_DESCRIPTOR_SET_LAYOUT__ + +#include +#include + +namespace mlx +{ + class DescriptorSetLayout + { + public: + void init(VkDescriptorType t = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, std::size_t n = 1, int binding = 0, VkShaderStageFlagBits stage = VK_SHADER_STAGE_VERTEX_BIT); + void destroy() noexcept; + + inline VkDescriptorSetLayout& operator()() noexcept { return _layout; } + inline VkDescriptorSetLayout& get() noexcept { return _layout; } + + private: + VkDescriptorSetLayout _layout = VK_NULL_HANDLE; + }; +} + +#endif diff --git a/src/renderer/renderer.h b/src/renderer/renderer.h index 70f17bd..fba06b0 100644 --- a/src/renderer/renderer.h +++ b/src/renderer/renderer.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/18 17:14:45 by maldavid #+# #+# */ -/* Updated: 2022/12/18 22:15:50 by maldavid ### ########.fr */ +/* Updated: 2023/01/23 19:08:29 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -25,6 +25,9 @@ #include #include #include +#include +#include +#include #include @@ -101,6 +104,9 @@ namespace mlx CmdPool _cmd_pool; SwapChain _swapchain; Semaphore _semaphore; + DescriptorPool _desc_pool; + std::vector _sets; + std::vector _layouts; std::array _cmd_buffers; class MLX_Window* _window; diff --git a/test/main.c b/test/main.c index 6b815c8..327eeae 100644 --- a/test/main.c +++ b/test/main.c @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 17:55:21 by maldavid #+# #+# */ -/* Updated: 2022/12/19 15:52:54 by maldavid ### ########.fr */ +/* Updated: 2023/01/22 18:17:53 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -25,11 +25,6 @@ int update(t_mlx *mlx) printf("%d\n", i); mlx_pixel_put(mlx->mlx, mlx->win, 200, 50, 0xFF0000); - mlx_pixel_put(mlx->mlx, mlx->win, 200, 60, 0x00FF00); - mlx_pixel_put(mlx->mlx, mlx->win, 200, 70, 0x0000FF); - mlx_pixel_put(mlx->mlx, mlx->win, 200, 80, 0xFF00FF); - mlx_pixel_put(mlx->mlx, mlx->win, 200, 90, 0xFFFF00); - mlx_pixel_put(mlx->mlx, mlx->win, 200, 100, 0xFFFFFF); i++; if (i > 20000) mlx_loop_end(mlx->mlx);