From 064f660852348840544d896f39aeaa7b29c7a8b2 Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Fri, 22 Dec 2023 23:21:24 +0100 Subject: [PATCH 1/3] adding possible new feature --- src/core/application.h | 4 +- src/core/application.inl | 15 +++- src/core/graphics.cpp | 25 +++++- src/core/graphics.h | 7 +- src/core/graphics.inl | 2 +- src/renderer/images/texture.cpp | 4 +- src/renderer/images/vk_image.h | 3 +- src/renderer/pipeline/pipeline.cpp | 8 +- src/renderer/renderer.cpp | 94 ++++++++++++++-------- src/renderer/renderer.h | 6 +- src/renderer/renderpass/vk_render_pass.cpp | 8 +- src/renderer/renderpass/vk_render_pass.h | 4 +- 12 files changed, 118 insertions(+), 62 deletions(-) diff --git a/src/core/application.h b/src/core/application.h index 272bda1..24c2368 100644 --- a/src/core/application.h +++ b/src/core/application.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 21:49:46 by maldavid #+# #+# */ -/* Updated: 2023/12/11 19:46:49 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/22 21:04:48 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -40,7 +40,7 @@ namespace mlx::core inline void getScreenSize(int* w, int* h) noexcept; - inline void* newGraphicsSuport(std::size_t w, std::size_t h, std::string title); + inline void* newGraphicsSuport(std::size_t w, std::size_t h, const char* title); inline void clearGraphicsSupport(void* win); inline void destroyGraphicsSupport(void* win); diff --git a/src/core/application.inl b/src/core/application.inl index 2748940..3ecf15c 100644 --- a/src/core/application.inl +++ b/src/core/application.inl @@ -54,10 +54,19 @@ namespace mlx::core *h = DM.h; } - void* Application::newGraphicsSuport(std::size_t w, std::size_t h, std::string title) + void* Application::newGraphicsSuport(std::size_t w, std::size_t h, const char* title) { - _graphics.emplace_back(std::make_unique(w, h, title, _graphics.size())); - _in->addWindow(_graphics.back()->getWindow()); + auto it = std::find_if(_textures.begin(), _textures.end(), [=](const Texture& texture) + { + return &texture == reinterpret_cast(const_cast(title)); + }); + if(it != _textures.end()) + _graphics.emplace_back(std::make_unique(w, h, reinterpret_cast(const_cast(title)), _graphics.size())); + else + { + _graphics.emplace_back(std::make_unique(w, h, title, _graphics.size())); + _in->addWindow(_graphics.back()->getWindow()); + } return static_cast(&_graphics.back()->getID()); } diff --git a/src/core/graphics.cpp b/src/core/graphics.cpp index bc4fd81..a0555ef 100644 --- a/src/core/graphics.cpp +++ b/src/core/graphics.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/02 15:13:55 by maldavid #+# #+# */ -/* Updated: 2023/12/15 21:04:50 by maldavid ### ########.fr */ +/* Updated: 2023/12/22 23:10:51 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,14 +14,30 @@ namespace mlx { - GraphicsSupport::GraphicsSupport(std::size_t w, std::size_t h, const std::string& title, int id) : + GraphicsSupport::GraphicsSupport(std::size_t w, std::size_t h, Texture* render_target, int id) : + _window(nullptr), + _text_put_pipeline(std::make_unique()), + _renderer(std::make_unique()), + _width(w), + _height(h), + _id(id) + { + _renderer->setWindow(nullptr); + _renderer->init(render_target); + _pixel_put_pipeline.init(w, h, *_renderer); + _text_put_pipeline->init(_renderer.get()); + } + + GraphicsSupport::GraphicsSupport(std::size_t w, std::size_t h, std::string title, int id) : _window(std::make_shared(w, h, title)), _text_put_pipeline(std::make_unique()), _renderer(std::make_unique()), + _width(w), + _height(h), _id(id) { _renderer->setWindow(_window.get()); - _renderer->init(); + _renderer->init(nullptr); _pixel_put_pipeline.init(w, h, *_renderer); _text_put_pipeline->init(_renderer.get()); } @@ -76,6 +92,7 @@ namespace mlx _text_put_pipeline->destroy(); _pixel_put_pipeline.destroy(); _renderer->destroy(); - _window->destroy(); + if(_window) + _window->destroy(); } } diff --git a/src/core/graphics.h b/src/core/graphics.h index ffd8e56..05cc2e7 100644 --- a/src/core/graphics.h +++ b/src/core/graphics.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/02 14:49:49 by maldavid #+# #+# */ -/* Updated: 2023/12/11 19:47:03 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/22 23:10:14 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -33,7 +33,8 @@ namespace mlx class GraphicsSupport : public non_copyable { public: - GraphicsSupport(std::size_t w, std::size_t h, const std::string& title, int id); + GraphicsSupport(std::size_t w, std::size_t h, Texture* render_target, int id); + GraphicsSupport(std::size_t w, std::size_t h, std::string title, int id); inline int& getID() noexcept; inline std::shared_ptr getWindow(); @@ -56,6 +57,8 @@ namespace mlx std::shared_ptr _window; std::unique_ptr _text_put_pipeline; // unique_ptr because of the size of the class std::unique_ptr _renderer; + std::size_t _width = 0; + std::size_t _height = 0; int _id; }; } diff --git a/src/core/graphics.inl b/src/core/graphics.inl index 54f00ee..2906b2d 100644 --- a/src/core/graphics.inl +++ b/src/core/graphics.inl @@ -23,7 +23,7 @@ namespace mlx { if(!_renderer->beginFrame()) return; - _proj = glm::ortho(0, _window->getWidth(), 0, _window->getHeight()); + _proj = glm::ortho(0, _width, 0, _height); _renderer->getUniformBuffer()->setData(sizeof(_proj), &_proj); } diff --git a/src/renderer/images/texture.cpp b/src/renderer/images/texture.cpp index 3d43381..2159df3 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: 2023/12/10 22:46:08 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/22 23:07:44 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -31,7 +31,7 @@ namespace mlx { void Texture::create(uint8_t* pixels, uint32_t width, uint32_t height, VkFormat format, const char* name, bool dedicated_memory) { - Image::create(width, height, format, TILING, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, name, dedicated_memory); + Image::create(width, height, format, TILING, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, name, dedicated_memory); Image::createImageView(VK_IMAGE_VIEW_TYPE_2D, VK_IMAGE_ASPECT_COLOR_BIT); Image::createSampler(); diff --git a/src/renderer/images/vk_image.h b/src/renderer/images/vk_image.h index a5600e6..5315190 100644 --- a/src/renderer/images/vk_image.h +++ b/src/renderer/images/vk_image.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/25 11:54:21 by maldavid #+# #+# */ -/* Updated: 2023/12/15 21:44:30 by maldavid ### ########.fr */ +/* Updated: 2023/12/22 23:02:54 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -53,6 +53,7 @@ namespace mlx inline VkImageView getImageView() const noexcept { return _image_view; } inline VkFormat getFormat() const noexcept { return _format; } inline VkImageTiling getTiling() const noexcept { return _tiling; } + inline VkImageLayout getLayout() const noexcept { return _layout; } inline VkSampler getSampler() const noexcept { return _sampler; } inline uint32_t getWidth() const noexcept { return _width; } inline uint32_t getHeight() const noexcept { return _height; } diff --git a/src/renderer/pipeline/pipeline.cpp b/src/renderer/pipeline/pipeline.cpp index cc02741..9d962bb 100644 --- a/src/renderer/pipeline/pipeline.cpp +++ b/src/renderer/pipeline/pipeline.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/18 21:27:38 by maldavid #+# #+# */ -/* Updated: 2023/11/25 10:23:20 by maldavid ### ########.fr */ +/* Updated: 2023/12/22 22:00:37 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -222,14 +222,14 @@ namespace mlx VkViewport viewport{}; viewport.x = 0.0f; viewport.y = 0.0f; - viewport.width = (float)renderer.getSwapChain().getExtent().width; - viewport.height = (float)renderer.getSwapChain().getExtent().height; + viewport.width = (float)renderer.getFrameBuffer(0).getWidth(); + viewport.height = (float)renderer.getFrameBuffer(0).getHeight(); viewport.minDepth = 0.0f; viewport.maxDepth = 1.0f; VkRect2D scissor{}; scissor.offset = { 0, 0 }; - scissor.extent = renderer.getSwapChain().getExtent(); + scissor.extent = { renderer.getFrameBuffer(0).getWidth(), renderer.getFrameBuffer(0).getHeight()}; VkPipelineViewportStateCreateInfo viewportState{}; viewportState.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp index 27667ec..db34449 100644 --- a/src/renderer/renderer.cpp +++ b/src/renderer/renderer.cpp @@ -6,25 +6,36 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/18 17:25:16 by maldavid #+# #+# */ -/* Updated: 2023/12/10 22:21:10 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/22 23:16:10 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ #include #include +#include #include namespace mlx { - void Renderer::init() + void Renderer::init(Texture* render_target) { - _surface.create(*this); - _swapchain.init(this); - _pass.init(_swapchain.getImagesFormat()); + if(render_target == nullptr) + { + _surface.create(*this); + _swapchain.init(this); + _pass.init(_swapchain.getImagesFormat(), VK_IMAGE_LAYOUT_PRESENT_SRC_KHR); + for(std::size_t i = 0; i < _swapchain.getImagesNumber(); i++) + _framebuffers.emplace_back().init(_pass, _swapchain.getImage(i)); + } + else + { + _render_target = render_target; + _render_target->transitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); + _pass.init(_render_target->getFormat(), _render_target->getLayout()); + _framebuffers.emplace_back().init(_pass, *static_cast(_render_target)); + } _cmd.init(); - for(std::size_t i = 0; i < _swapchain.getImagesNumber(); i++) - _framebuffers.emplace_back().init(_pass, _swapchain.getImage(i)); for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) _semaphores[i].init(); @@ -65,15 +76,20 @@ namespace mlx _cmd.getCmdBuffer(_current_frame_index).waitForExecution(); _cmd.getCmdBuffer(_current_frame_index).reset(); - VkResult result = vkAcquireNextImageKHR(device, _swapchain(), UINT64_MAX, _semaphores[_current_frame_index].getImageSemaphore(), VK_NULL_HANDLE, &_image_index); - - if(result == VK_ERROR_OUT_OF_DATE_KHR) + if(_render_target == nullptr) { - _swapchain.recreate(); - return false; + VkResult result = vkAcquireNextImageKHR(device, _swapchain(), UINT64_MAX, _semaphores[_current_frame_index].getImageSemaphore(), VK_NULL_HANDLE, &_image_index); + + if(result == VK_ERROR_OUT_OF_DATE_KHR) + { + _swapchain.recreate(); + return false; + } + else if(result != VK_SUCCESS && result != VK_SUBOPTIMAL_KHR) + core::error::report(e_kind::fatal_error, "Vulkan error : failed to acquire swapchain image"); } - else if(result != VK_SUCCESS && result != VK_SUBOPTIMAL_KHR) - core::error::report(e_kind::fatal_error, "Vulkan error : failed to acquire swapchain image"); + else + _image_index = 0; _cmd.getCmdBuffer(_current_frame_index).beginRecord(); auto& fb = _framebuffers[_image_index]; @@ -102,28 +118,34 @@ namespace mlx { _pass.end(getActiveCmdBuffer()); _cmd.getCmdBuffer(_current_frame_index).endRecord(); - _cmd.getCmdBuffer(_current_frame_index).submit(_semaphores[_current_frame_index]); - VkSwapchainKHR swapchain = _swapchain(); - VkSemaphore signalSemaphores[] = { _semaphores[_current_frame_index].getRenderImageSemaphore() }; - - VkPresentInfoKHR presentInfo{}; - presentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; - presentInfo.waitSemaphoreCount = 1; - presentInfo.pWaitSemaphores = signalSemaphores; - presentInfo.swapchainCount = 1; - presentInfo.pSwapchains = &swapchain; - presentInfo.pImageIndices = &_image_index; - - VkResult result = vkQueuePresentKHR(Render_Core::get().getQueue().getPresent(), &presentInfo); - - if(result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || _framebufferResized) + if(_render_target == nullptr) { - _framebufferResized = false; - _swapchain.recreate(); + _cmd.getCmdBuffer(_current_frame_index).submit(_semaphores[_current_frame_index]); + + VkSwapchainKHR swapchain = _swapchain(); + VkSemaphore signalSemaphores[] = { _semaphores[_current_frame_index].getRenderImageSemaphore() }; + + VkPresentInfoKHR presentInfo{}; + presentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; + presentInfo.waitSemaphoreCount = 1; + presentInfo.pWaitSemaphores = signalSemaphores; + presentInfo.swapchainCount = 1; + presentInfo.pSwapchains = &swapchain; + presentInfo.pImageIndices = &_image_index; + + VkResult result = vkQueuePresentKHR(Render_Core::get().getQueue().getPresent(), &presentInfo); + + if(result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || _framebufferResized) + { + _framebufferResized = false; + _swapchain.recreate(); + } + else if(result != VK_SUCCESS) + core::error::report(e_kind::fatal_error, "Vulkan error : failed to present swap chain image"); } - else if(result != VK_SUCCESS) - core::error::report(e_kind::fatal_error, "Vulkan error : failed to present swap chain image"); + else + _cmd.getCmdBuffer(_current_frame_index).submitIdle(); _current_frame_index = (_current_frame_index + 1) % MAX_FRAMES_IN_FLIGHT; } @@ -139,11 +161,13 @@ namespace mlx _cmd.destroy(); _desc_pool.destroy(); _pass.destroy(); - _swapchain.destroy(); + if(_render_target == nullptr) + _swapchain.destroy(); for(auto& fb : _framebuffers) fb.destroy(); for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) _semaphores[i].destroy(); - _surface.destroy(); + if(_render_target == nullptr) + _surface.destroy(); } } diff --git a/src/renderer/renderer.h b/src/renderer/renderer.h index 1dedc61..fcd820c 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: 2023/12/10 22:19:41 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/22 21:59:15 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -83,7 +83,7 @@ namespace mlx public: Renderer() = default; - void init(); + void init(class Texture* render_target); bool beginFrame(); void endFrame(); @@ -102,6 +102,7 @@ namespace mlx inline GraphicPipeline& getPipeline() noexcept { return _pipeline; } inline CmdBuffer& getCmdBuffer(int i) noexcept { return _cmd.getCmdBuffer(i); } inline CmdBuffer& getActiveCmdBuffer() noexcept { return _cmd.getCmdBuffer(_current_frame_index); } + inline FrameBuffer& getFrameBuffer(int i) noexcept { return _framebuffers[i]; } inline DescriptorSet& getVertDescriptorSet() noexcept { return _vert_set; } inline DescriptorSet& getFragDescriptorSet() noexcept { return _frag_set; } inline DescriptorSetLayout& getVertDescriptorSetLayout() noexcept { return _vert_layout; } @@ -133,6 +134,7 @@ namespace mlx std::unique_ptr _uniform_buffer; class MLX_Window* _window = nullptr; + class Texture* _render_target = nullptr; uint32_t _current_frame_index = 0; uint32_t _image_index = 0; diff --git a/src/renderer/renderpass/vk_render_pass.cpp b/src/renderer/renderpass/vk_render_pass.cpp index 710681f..a2dc03c 100644 --- a/src/renderer/renderpass/vk_render_pass.cpp +++ b/src/renderer/renderpass/vk_render_pass.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:21:36 by maldavid #+# #+# */ -/* Updated: 2023/12/10 22:32:27 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/22 23:05:38 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,7 +20,7 @@ namespace mlx { static const VkClearValue clearColor = {{{ 0.0f, 0.0f, 0.0f, 1.0f }}}; // wtf, this mess to satisfy a warning - void RenderPass::init(VkFormat attachement_format) + void RenderPass::init(VkFormat attachement_format, VkImageLayout layout) { VkAttachmentDescription colorAttachment{}; colorAttachment.format = attachement_format; @@ -30,11 +30,11 @@ namespace mlx colorAttachment.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; colorAttachment.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; colorAttachment.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; - colorAttachment.finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + colorAttachment.finalLayout = layout; VkAttachmentReference colorAttachmentRef{}; colorAttachmentRef.attachment = 0; - colorAttachmentRef.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + colorAttachmentRef.layout = (layout == VK_IMAGE_LAYOUT_PRESENT_SRC_KHR ? VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL : layout); VkSubpassDescription subpass{}; subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; diff --git a/src/renderer/renderpass/vk_render_pass.h b/src/renderer/renderpass/vk_render_pass.h index bc2171b..61625ec 100644 --- a/src/renderer/renderpass/vk_render_pass.h +++ b/src/renderer/renderpass/vk_render_pass.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:22:00 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:11:14 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/22 23:00:00 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -21,7 +21,7 @@ namespace mlx class RenderPass { public: - void init(VkFormat attachement_format); + void init(VkFormat attachement_format, VkImageLayout layout); void destroy() noexcept; void begin(class CmdBuffer& cmd, class FrameBuffer& fb); From df12d08ad36cb72a2f0cc83e88db5da9b3be0394 Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Sat, 23 Dec 2023 01:53:54 +0100 Subject: [PATCH 2/3] working on frame capture --- src/renderer/command/vk_cmd_buffer.cpp | 24 +++++--- src/renderer/command/vk_cmd_buffer.h | 4 +- src/renderer/images/texture.cpp | 22 +++++--- src/renderer/images/texture_atlas.cpp | 3 +- src/renderer/images/vk_image.cpp | 77 +++++++------------------- src/renderer/images/vk_image.h | 4 +- src/renderer/renderer.cpp | 14 ++--- 7 files changed, 63 insertions(+), 85 deletions(-) diff --git a/src/renderer/command/vk_cmd_buffer.cpp b/src/renderer/command/vk_cmd_buffer.cpp index e417508..2c47f76 100644 --- a/src/renderer/command/vk_cmd_buffer.cpp +++ b/src/renderer/command/vk_cmd_buffer.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:26:06 by maldavid #+# #+# */ -/* Updated: 2023/12/16 18:51:03 by maldavid ### ########.fr */ +/* Updated: 2023/12/23 01:32:02 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -86,27 +86,33 @@ namespace mlx vkCreateFence(device, &fenceCreateInfo, nullptr, &fence); vkResetFences(device, 1, &fence); vkQueueSubmit(Render_Core::get().getQueue().getGraphic(), 1, &submitInfo, fence); + _state = state::submitted; vkWaitForFences(device, 1, &fence, VK_TRUE, UINT64_MAX); vkDestroyFence(device, fence, nullptr); - _state = state::submitted; _state = state::ready; } - void CmdBuffer::submit(Semaphore& semaphores) noexcept + void CmdBuffer::submit(Semaphore* semaphores) noexcept { - VkSemaphore signalSemaphores[] = { semaphores.getRenderImageSemaphore() }; - VkSemaphore waitSemaphores[] = { semaphores.getImageSemaphore() }; + std::array signalSemaphores; + std::array waitSemaphores; + + if(semaphores != nullptr) + { + signalSemaphores[0] = semaphores->getRenderImageSemaphore(); + waitSemaphores[0] = semaphores->getImageSemaphore(); + } VkPipelineStageFlags waitStages[] = { VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT }; VkSubmitInfo submitInfo{}; submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; - submitInfo.waitSemaphoreCount = 1; - submitInfo.pWaitSemaphores = waitSemaphores; + submitInfo.waitSemaphoreCount = (semaphores == nullptr ? 0 : waitSemaphores.size()); + submitInfo.pWaitSemaphores = waitSemaphores.data(); submitInfo.pWaitDstStageMask = waitStages; submitInfo.commandBufferCount = 1; submitInfo.pCommandBuffers = &_cmd_buffer; - submitInfo.signalSemaphoreCount = 1; - submitInfo.pSignalSemaphores = signalSemaphores; + submitInfo.signalSemaphoreCount = (semaphores == nullptr ? 0 : signalSemaphores.size()); + submitInfo.pSignalSemaphores = signalSemaphores.data(); if(vkQueueSubmit(Render_Core::get().getQueue().getGraphic(), 1, &submitInfo, _fence.get()) != VK_SUCCESS) core::error::report(e_kind::fatal_error, "Vulkan error : failed to submit draw command buffer"); diff --git a/src/renderer/command/vk_cmd_buffer.h b/src/renderer/command/vk_cmd_buffer.h index f3fe39d..8cc1afb 100644 --- a/src/renderer/command/vk_cmd_buffer.h +++ b/src/renderer/command/vk_cmd_buffer.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:25:42 by maldavid #+# #+# */ -/* Updated: 2023/12/16 18:44:48 by maldavid ### ########.fr */ +/* Updated: 2023/12/23 01:24:34 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,7 +37,7 @@ namespace mlx void destroy() noexcept; void beginRecord(VkCommandBufferUsageFlags usage = 0); - void submit(class Semaphore& semaphores) noexcept; + void submit(class Semaphore* semaphores) noexcept; void submitIdle() noexcept; inline void waitForExecution() noexcept { _fence.waitAndReset(); _state = state::ready; } inline void reset() noexcept { vkResetCommandBuffer(_cmd_buffer, 0); } diff --git a/src/renderer/images/texture.cpp b/src/renderer/images/texture.cpp index 2159df3..d013652 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: 2023/12/22 23:07:44 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/23 01:52:49 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -34,6 +34,7 @@ namespace mlx Image::create(width, height, format, TILING, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, name, dedicated_memory); Image::createImageView(VK_IMAGE_VIEW_TYPE_2D, VK_IMAGE_ASPECT_COLOR_BIT); Image::createSampler(); + transitionLayout(VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); std::vector vertexData = { {{0, 0}, {1.f, 1.f, 1.f, 1.f}, {0.0f, 0.0f}}, @@ -119,12 +120,17 @@ namespace mlx Image::copyFromBuffer(*_buf_map); _has_been_modified = false; } - auto cmd = renderer.getActiveCmdBuffer().get(); + auto cmd = renderer.getActiveCmdBuffer(); + VkImageLayout layout_save = getLayout(); + if(getLayout() != VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + transitionLayout(VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, &cmd); _vbo.bind(renderer); _ibo.bind(renderer); glm::vec2 translate(x, y); - vkCmdPushConstants(cmd, renderer.getPipeline().getPipelineLayout(), VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(translate), &translate); - vkCmdDrawIndexed(cmd, static_cast(_ibo.getSize() / sizeof(uint16_t)), 1, 0, 0, 0); + vkCmdPushConstants(cmd.get(), renderer.getPipeline().getPipelineLayout(), VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(translate), &translate); + vkCmdDrawIndexed(cmd.get(), static_cast(_ibo.getSize() / sizeof(uint16_t)), 1, 0, 0, 0); + if(getLayout() != layout_save) + transitionLayout(layout_save, &cmd); } void Texture::destroy() noexcept @@ -147,11 +153,13 @@ namespace mlx core::error::report(e_kind::fatal_error, "Image : file not found '%s'", filename.c_str()); if(stbi_is_hdr(filename.c_str())) core::error::report(e_kind::fatal_error, "Texture : unsupported image format '%s'", filename.c_str()); - data = stbi_load(filename.c_str(), w, h, &channels, 4); + int dummy_w; + int dummy_h; + data = stbi_load(filename.c_str(), (w == nullptr ? &dummy_w : w), (h == nullptr ? &dummy_h : h), &channels, 4); #ifdef DEBUG - texture.create(data, *w, *h, VK_FORMAT_R8G8B8A8_UNORM, filename.c_str()); + texture.create(data, (w == nullptr ? dummy_w : *w), (h == nullptr ? dummy_h : *h), VK_FORMAT_R8G8B8A8_UNORM, filename.c_str()); #else - texture.create(data, *w, *h, VK_FORMAT_R8G8B8A8_UNORM, nullptr); + texture.create(data, (w == nullptr ? dummy_w : *w), (h == nullptr ? dummy_h : *h), VK_FORMAT_R8G8B8A8_UNORM, nullptr); #endif stbi_image_free(data); return texture; diff --git a/src/renderer/images/texture_atlas.cpp b/src/renderer/images/texture_atlas.cpp index be611bc..5a6d9a9 100644 --- a/src/renderer/images/texture_atlas.cpp +++ b/src/renderer/images/texture_atlas.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/07 16:40:09 by maldavid #+# #+# */ -/* Updated: 2023/12/14 16:39:54 by maldavid ### ########.fr */ +/* Updated: 2023/12/22 23:39:38 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -25,6 +25,7 @@ namespace mlx Image::create(width, height, format, TILING, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, name, dedicated_memory); Image::createImageView(VK_IMAGE_VIEW_TYPE_2D, VK_IMAGE_ASPECT_COLOR_BIT); Image::createSampler(); + transitionLayout(VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); if(pixels != nullptr) { diff --git a/src/renderer/images/vk_image.cpp b/src/renderer/images/vk_image.cpp index 54e3ecf..2d31cd5 100644 --- a/src/renderer/images/vk_image.cpp +++ b/src/renderer/images/vk_image.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/25 11:59:07 by maldavid #+# #+# */ -/* Updated: 2023/12/16 17:10:33 by maldavid ### ########.fr */ +/* Updated: 2023/12/22 23:35:07 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -210,18 +210,8 @@ namespace mlx CmdBuffer& cmd = Render_Core::get().getSingleTimeCmdBuffer(); cmd.beginRecord(); - VkImageMemoryBarrier copy_barrier{}; - copy_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; - copy_barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - copy_barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; - copy_barrier.newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; - copy_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - copy_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - copy_barrier.image = _image; - copy_barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - copy_barrier.subresourceRange.levelCount = 1; - copy_barrier.subresourceRange.layerCount = 1; - vkCmdPipelineBarrier(cmd.get(), VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, ©_barrier); + VkImageLayout layout_save = _layout; + transitionLayout(VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &cmd); VkBufferImageCopy region{}; region.bufferOffset = 0; @@ -236,19 +226,7 @@ namespace mlx vkCmdCopyBufferToImage(cmd.get(), buffer.get(), _image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ®ion); - VkImageMemoryBarrier use_barrier{}; - use_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; - use_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - use_barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT; - use_barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; - use_barrier.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; - use_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - use_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - use_barrier.image = _image; - use_barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - use_barrier.subresourceRange.levelCount = 1; - use_barrier.subresourceRange.layerCount = 1; - vkCmdPipelineBarrier(cmd.get(), VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0, 0, nullptr, 0, nullptr, 1, &use_barrier); + transitionLayout(layout_save, &cmd); cmd.endRecord(); cmd.submitIdle(); @@ -259,18 +237,8 @@ namespace mlx CmdBuffer& cmd = Render_Core::get().getSingleTimeCmdBuffer(); cmd.beginRecord(); - VkImageMemoryBarrier copy_barrier{}; - copy_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; - copy_barrier.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - copy_barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; - copy_barrier.newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL; - copy_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - copy_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - copy_barrier.image = _image; - copy_barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - copy_barrier.subresourceRange.levelCount = 1; - copy_barrier.subresourceRange.layerCount = 1; - vkCmdPipelineBarrier(cmd.get(), VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, ©_barrier); + VkImageLayout layout_save = _layout; + transitionLayout(VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, &cmd); VkBufferImageCopy region{}; region.bufferOffset = 0; @@ -285,31 +253,23 @@ namespace mlx vkCmdCopyImageToBuffer(cmd.get(), _image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, buffer.get(), 1, ®ion); - VkImageMemoryBarrier use_barrier{}; - use_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; - use_barrier.srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - use_barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT; - use_barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL; - use_barrier.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; - use_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - use_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - use_barrier.image = _image; - use_barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - use_barrier.subresourceRange.levelCount = 1; - use_barrier.subresourceRange.layerCount = 1; - vkCmdPipelineBarrier(cmd.get(), VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0, 0, nullptr, 0, nullptr, 1, &use_barrier); + transitionLayout(layout_save, &cmd); cmd.endRecord(); cmd.submitIdle(); } - void Image::transitionLayout(VkImageLayout new_layout) + void Image::transitionLayout(VkImageLayout new_layout, CmdBuffer* cmd) { if(new_layout == _layout) return; - CmdBuffer& cmd = Render_Core::get().getSingleTimeCmdBuffer(); - cmd.beginRecord(); + bool singleTime = (cmd == nullptr); + if(singleTime) + { + cmd = &Render_Core::get().getSingleTimeCmdBuffer(); + cmd->beginRecord(); + } VkImageMemoryBarrier barrier{}; barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; @@ -344,10 +304,13 @@ namespace mlx else destinationStage = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT; - vkCmdPipelineBarrier(cmd.get(), sourceStage, destinationStage, 0, 0, nullptr, 0, nullptr, 1, &barrier); + vkCmdPipelineBarrier(cmd->get(), sourceStage, destinationStage, 0, 0, nullptr, 0, nullptr, 1, &barrier); - cmd.endRecord(); - cmd.submitIdle(); + if(singleTime) + { + cmd->endRecord(); + cmd->submitIdle(); + } _layout = new_layout; } diff --git a/src/renderer/images/vk_image.h b/src/renderer/images/vk_image.h index 5315190..958df86 100644 --- a/src/renderer/images/vk_image.h +++ b/src/renderer/images/vk_image.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/25 11:54:21 by maldavid #+# #+# */ -/* Updated: 2023/12/22 23:02:54 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/22 23:31:02 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -45,7 +45,7 @@ namespace mlx void createSampler() noexcept; void copyFromBuffer(class Buffer& buffer); void copyToBuffer(class Buffer& buffer); - void transitionLayout(VkImageLayout new_layout); + void transitionLayout(VkImageLayout new_layout, CmdBuffer* cmd = nullptr); virtual void destroy() noexcept; inline VkImage get() noexcept { return _image; } diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp index db34449..7fbe199 100644 --- a/src/renderer/renderer.cpp +++ b/src/renderer/renderer.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/18 17:25:16 by maldavid #+# #+# */ -/* Updated: 2023/12/22 23:16:10 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/23 01:28:03 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -74,8 +74,6 @@ namespace mlx auto device = Render_Core::get().getDevice().get(); _cmd.getCmdBuffer(_current_frame_index).waitForExecution(); - _cmd.getCmdBuffer(_current_frame_index).reset(); - if(_render_target == nullptr) { VkResult result = vkAcquireNextImageKHR(device, _swapchain(), UINT64_MAX, _semaphores[_current_frame_index].getImageSemaphore(), VK_NULL_HANDLE, &_image_index); @@ -91,6 +89,7 @@ namespace mlx else _image_index = 0; + _cmd.getCmdBuffer(_current_frame_index).reset(); _cmd.getCmdBuffer(_current_frame_index).beginRecord(); auto& fb = _framebuffers[_image_index]; _pass.begin(getActiveCmdBuffer(), fb); @@ -121,7 +120,7 @@ namespace mlx if(_render_target == nullptr) { - _cmd.getCmdBuffer(_current_frame_index).submit(_semaphores[_current_frame_index]); + _cmd.getCmdBuffer(_current_frame_index).submit(&_semaphores[_current_frame_index]); VkSwapchainKHR swapchain = _swapchain(); VkSemaphore signalSemaphores[] = { _semaphores[_current_frame_index].getRenderImageSemaphore() }; @@ -145,7 +144,7 @@ namespace mlx core::error::report(e_kind::fatal_error, "Vulkan error : failed to present swap chain image"); } else - _cmd.getCmdBuffer(_current_frame_index).submitIdle(); + _cmd.getCmdBuffer(_current_frame_index).submit(nullptr); _current_frame_index = (_current_frame_index + 1) % MAX_FRAMES_IN_FLIGHT; } @@ -162,12 +161,13 @@ namespace mlx _desc_pool.destroy(); _pass.destroy(); if(_render_target == nullptr) + { _swapchain.destroy(); + _surface.destroy(); + } for(auto& fb : _framebuffers) fb.destroy(); for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) _semaphores[i].destroy(); - if(_render_target == nullptr) - _surface.destroy(); } } From 9aaa26ddf5448dcde4277844b9472e09b10660c9 Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Sun, 24 Dec 2023 16:07:09 +0100 Subject: [PATCH 3/3] fixing frame capture --- src/core/application.cpp | 6 +-- src/core/graphics.cpp | 10 ++++- src/core/graphics.h | 5 +-- src/core/graphics.inl | 8 ---- src/renderer/command/vk_cmd_buffer.cpp | 10 ++++- .../descriptors/vk_descriptor_set.cpp | 11 +++--- src/renderer/descriptors/vk_descriptor_set.h | 4 +- src/renderer/images/texture.cpp | 7 +--- src/renderer/images/texture.h | 4 +- src/renderer/images/texture_atlas.h | 4 +- src/renderer/pixel_put.cpp | 4 +- src/renderer/renderer.cpp | 24 +++++++----- src/renderer/renderpass/vk_render_pass.cpp | 39 ++++++++++++++----- src/renderer/renderpass/vk_render_pass.h | 2 +- test/main.c | 2 +- 15 files changed, 82 insertions(+), 58 deletions(-) diff --git a/src/core/application.cpp b/src/core/application.cpp index 5c77a04..1335786 100644 --- a/src/core/application.cpp +++ b/src/core/application.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 22:10:52 by maldavid #+# #+# */ -/* Updated: 2023/12/21 00:17:54 by maldavid ### ########.fr */ +/* Updated: 2023/12/24 08:56:33 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,14 +37,12 @@ namespace mlx::core while(_in->is_running()) { _in->update(); - for(auto& gs : _graphics) - gs->beginRender(); if(_loop_hook) _loop_hook(_param); for(auto& gs : _graphics) - gs->endRender(); + gs->render(); } } diff --git a/src/core/graphics.cpp b/src/core/graphics.cpp index a0555ef..69db6e3 100644 --- a/src/core/graphics.cpp +++ b/src/core/graphics.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/02 15:13:55 by maldavid #+# #+# */ -/* Updated: 2023/12/22 23:10:51 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/24 09:39:45 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -42,8 +42,12 @@ namespace mlx _text_put_pipeline->init(_renderer.get()); } - void GraphicsSupport::endRender() noexcept + void GraphicsSupport::render() noexcept { + if(!_renderer->beginFrame()) + return; + _proj = glm::ortho(0, _width, 0, _height); + _renderer->getUniformBuffer()->setData(sizeof(_proj), &_proj); auto cmd_buff = _renderer->getActiveCmdBuffer().get(); static std::array sets = { @@ -57,6 +61,8 @@ namespace mlx continue; if(data.texture->getSet() == VK_NULL_HANDLE) data.texture->setDescriptor(_renderer->getFragDescriptorSet().duplicate()); + if(data.texture->getLayout() != VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + data.texture->transitionLayout(VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); if(!data.texture->hasBeenUpdated()) data.texture->updateSet(0); sets[1] = data.texture->getSet(); diff --git a/src/core/graphics.h b/src/core/graphics.h index 05cc2e7..04f66b0 100644 --- a/src/core/graphics.h +++ b/src/core/graphics.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/02 14:49:49 by maldavid #+# #+# */ -/* Updated: 2023/12/22 23:10:14 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/24 08:56:14 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -39,8 +39,7 @@ namespace mlx inline int& getID() noexcept; inline std::shared_ptr getWindow(); - inline void beginRender() noexcept; - void endRender() noexcept; + void render() noexcept; inline void clearRenderData() noexcept; inline void pixelPut(int x, int y, uint32_t color) noexcept; diff --git a/src/core/graphics.inl b/src/core/graphics.inl index 2906b2d..b5555e8 100644 --- a/src/core/graphics.inl +++ b/src/core/graphics.inl @@ -19,14 +19,6 @@ namespace mlx int& GraphicsSupport::getID() noexcept { return _id; } std::shared_ptr GraphicsSupport::getWindow() { return _window; } - void GraphicsSupport::beginRender() noexcept - { - if(!_renderer->beginFrame()) - return; - _proj = glm::ortho(0, _width, 0, _height); - _renderer->getUniformBuffer()->setData(sizeof(_proj), &_proj); - } - void GraphicsSupport::clearRenderData() noexcept { _textures_to_render.clear(); diff --git a/src/renderer/command/vk_cmd_buffer.cpp b/src/renderer/command/vk_cmd_buffer.cpp index 2c47f76..b1dade7 100644 --- a/src/renderer/command/vk_cmd_buffer.cpp +++ b/src/renderer/command/vk_cmd_buffer.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:26:06 by maldavid #+# #+# */ -/* Updated: 2023/12/23 01:32:02 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/24 12:58:36 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -85,7 +85,8 @@ namespace mlx VkFence fence; vkCreateFence(device, &fenceCreateInfo, nullptr, &fence); vkResetFences(device, 1, &fence); - vkQueueSubmit(Render_Core::get().getQueue().getGraphic(), 1, &submitInfo, fence); + if(vkQueueSubmit(Render_Core::get().getQueue().getGraphic(), 1, &submitInfo, fence) != VK_SUCCESS) + core::error::report(e_kind::fatal_error, "Vulkan error : failed to submit a single time command buffer"); _state = state::submitted; vkWaitForFences(device, 1, &fence, VK_TRUE, UINT64_MAX); vkDestroyFence(device, fence, nullptr); @@ -102,6 +103,11 @@ namespace mlx signalSemaphores[0] = semaphores->getRenderImageSemaphore(); waitSemaphores[0] = semaphores->getImageSemaphore(); } + else + { + signalSemaphores[0] = nullptr; + waitSemaphores[0] = nullptr; + } VkPipelineStageFlags waitStages[] = { VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT }; VkSubmitInfo submitInfo{}; diff --git a/src/renderer/descriptors/vk_descriptor_set.cpp b/src/renderer/descriptors/vk_descriptor_set.cpp index f0365a1..cf6a624 100644 --- a/src/renderer/descriptors/vk_descriptor_set.cpp +++ b/src/renderer/descriptors/vk_descriptor_set.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/23 18:40:44 by maldavid #+# #+# */ -/* Updated: 2023/12/14 16:45:11 by maldavid ### ########.fr */ +/* Updated: 2023/12/24 09:37:55 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,6 +15,7 @@ #include "vk_descriptor_set_layout.h" #include #include +#include namespace mlx { @@ -66,14 +67,14 @@ namespace mlx } } - void DescriptorSet::writeDescriptor(int binding, VkImageView view, VkSampler sampler) const noexcept + void DescriptorSet::writeDescriptor(int binding, const Image& image) const noexcept { auto device = Render_Core::get().getDevice().get(); VkDescriptorImageInfo imageInfo{}; - imageInfo.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; - imageInfo.imageView = view; - imageInfo.sampler = sampler; + imageInfo.imageLayout = image.getLayout(); + imageInfo.imageView = image.getImageView(); + imageInfo.sampler = image.getSampler(); VkWriteDescriptorSet descriptorWrite{}; descriptorWrite.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; diff --git a/src/renderer/descriptors/vk_descriptor_set.h b/src/renderer/descriptors/vk_descriptor_set.h index 601032f..f1e627d 100644 --- a/src/renderer/descriptors/vk_descriptor_set.h +++ b/src/renderer/descriptors/vk_descriptor_set.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/23 18:39:36 by maldavid #+# #+# */ -/* Updated: 2023/12/14 17:12:49 by maldavid ### ########.fr */ +/* Updated: 2023/12/23 18:47:49 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -26,7 +26,7 @@ namespace mlx void init(class Renderer* renderer, class DescriptorPool* pool, class DescriptorSetLayout* layout); void writeDescriptor(int binding, class UBO* ubo) const noexcept; - void writeDescriptor(int binding, VkImageView view, VkSampler sampler) const noexcept; + void writeDescriptor(int binding, const class Image& image) const noexcept; inline bool isInit() const noexcept { return _pool != nullptr && _renderer != nullptr; } diff --git a/src/renderer/images/texture.cpp b/src/renderer/images/texture.cpp index d013652..35fe3e4 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: 2023/12/23 01:52:49 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/23 18:49:53 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -121,16 +121,11 @@ namespace mlx _has_been_modified = false; } auto cmd = renderer.getActiveCmdBuffer(); - VkImageLayout layout_save = getLayout(); - if(getLayout() != VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) - transitionLayout(VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, &cmd); _vbo.bind(renderer); _ibo.bind(renderer); glm::vec2 translate(x, y); vkCmdPushConstants(cmd.get(), renderer.getPipeline().getPipelineLayout(), VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(translate), &translate); vkCmdDrawIndexed(cmd.get(), static_cast(_ibo.getSize() / sizeof(uint16_t)), 1, 0, 0, 0); - if(getLayout() != layout_save) - transitionLayout(layout_save, &cmd); } void Texture::destroy() noexcept diff --git a/src/renderer/images/texture.h b/src/renderer/images/texture.h index 725b37a..19f7d24 100644 --- a/src/renderer/images/texture.h +++ b/src/renderer/images/texture.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/08 02:24:58 by maldavid #+# #+# */ -/* Updated: 2023/12/14 14:37:08 by maldavid ### ########.fr */ +/* Updated: 2023/12/23 18:49:12 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -40,7 +40,7 @@ namespace mlx inline void setDescriptor(DescriptorSet set) noexcept { _set = std::move(set); } inline VkDescriptorSet getSet() noexcept { return _set.isInit() ? _set.get() : VK_NULL_HANDLE; } - inline void updateSet(int binding) noexcept { _set.writeDescriptor(binding, getImageView(), getSampler()); _has_been_updated = true; } + inline void updateSet(int binding) noexcept { _set.writeDescriptor(binding, *this); _has_been_updated = true; } inline bool hasBeenUpdated() const noexcept { return _has_been_updated; } inline constexpr void resetUpdate() noexcept { _has_been_updated = false; } diff --git a/src/renderer/images/texture_atlas.h b/src/renderer/images/texture_atlas.h index 1cb8c09..6191ca9 100644 --- a/src/renderer/images/texture_atlas.h +++ b/src/renderer/images/texture_atlas.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/07 16:36:33 by maldavid #+# #+# */ -/* Updated: 2023/12/14 17:12:54 by maldavid ### ########.fr */ +/* Updated: 2023/12/23 18:49:25 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -31,7 +31,7 @@ namespace mlx inline void setDescriptor(DescriptorSet&& set) noexcept { _set = set; } inline VkDescriptorSet getSet() noexcept { return _set.isInit() ? _set.get() : VK_NULL_HANDLE; } - inline void updateSet(int binding) const noexcept { _set.writeDescriptor(binding, getImageView(), getSampler()); } + inline void updateSet(int binding) const noexcept { _set.writeDescriptor(binding, *this); } ~TextureAtlas() = default; diff --git a/src/renderer/pixel_put.cpp b/src/renderer/pixel_put.cpp index 7dcff20..c94d30b 100644 --- a/src/renderer/pixel_put.cpp +++ b/src/renderer/pixel_put.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/31 15:14:50 by maldavid #+# #+# */ -/* Updated: 2023/12/14 18:26:03 by maldavid ### ########.fr */ +/* Updated: 2023/12/23 19:34:30 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -56,7 +56,7 @@ namespace mlx { _texture.render(renderer, 0, 0); } - + void PixelPutPipeline::destroy() noexcept { _buffer.destroy(); diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp index 7fbe199..2a57b20 100644 --- a/src/renderer/renderer.cpp +++ b/src/renderer/renderer.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/18 17:25:16 by maldavid #+# #+# */ -/* Updated: 2023/12/23 01:28:03 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/24 16:04:04 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -38,7 +38,7 @@ namespace mlx for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) _semaphores[i].init(); - + _uniform_buffer.reset(new UBO); #ifdef DEBUG _uniform_buffer->create(this, sizeof(glm::mat4), "__mlx_matrices_uniform_buffer_"); @@ -51,14 +51,14 @@ namespace mlx { VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 4096 } }; _desc_pool.init(2, pool_sizes); - + _vert_layout.init({ {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER} }, VK_SHADER_STAGE_VERTEX_BIT); _frag_layout.init({ {0, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER} }, VK_SHADER_STAGE_FRAGMENT_BIT); - + _vert_set.init(this, &_desc_pool, &_vert_layout); _frag_set.init(this, &_desc_pool, &_frag_layout); @@ -73,9 +73,9 @@ namespace mlx { auto device = Render_Core::get().getDevice().get(); - _cmd.getCmdBuffer(_current_frame_index).waitForExecution(); if(_render_target == nullptr) { + _cmd.getCmdBuffer(_current_frame_index).waitForExecution(); VkResult result = vkAcquireNextImageKHR(device, _swapchain(), UINT64_MAX, _semaphores[_current_frame_index].getImageSemaphore(), VK_NULL_HANDLE, &_image_index); if(result == VK_ERROR_OUT_OF_DATE_KHR) @@ -87,7 +87,11 @@ namespace mlx core::error::report(e_kind::fatal_error, "Vulkan error : failed to acquire swapchain image"); } else + { _image_index = 0; + if(_render_target->getLayout() != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) + _render_target->transitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); + } _cmd.getCmdBuffer(_current_frame_index).reset(); _cmd.getCmdBuffer(_current_frame_index).beginRecord(); @@ -107,7 +111,7 @@ namespace mlx VkRect2D scissor{}; scissor.offset = { 0, 0 }; - scissor.extent = _swapchain.getExtent(); + scissor.extent = { fb.getWidth(), fb.getHeight()}; vkCmdSetScissor(_cmd.getCmdBuffer(_current_frame_index).get(), 0, 1, &scissor); return true; @@ -142,11 +146,13 @@ namespace mlx } else if(result != VK_SUCCESS) core::error::report(e_kind::fatal_error, "Vulkan error : failed to present swap chain image"); + _current_frame_index = (_current_frame_index + 1) % MAX_FRAMES_IN_FLIGHT; } else - _cmd.getCmdBuffer(_current_frame_index).submit(nullptr); - - _current_frame_index = (_current_frame_index + 1) % MAX_FRAMES_IN_FLIGHT; + { + _cmd.getCmdBuffer(_current_frame_index).submitIdle(); + _current_frame_index = 0; + } } void Renderer::destroy() diff --git a/src/renderer/renderpass/vk_render_pass.cpp b/src/renderer/renderpass/vk_render_pass.cpp index a2dc03c..2c2dc9c 100644 --- a/src/renderer/renderpass/vk_render_pass.cpp +++ b/src/renderer/renderpass/vk_render_pass.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:21:36 by maldavid #+# #+# */ -/* Updated: 2023/12/22 23:05:38 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/24 15:31:02 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,6 @@ #include #include #include -#include namespace mlx { @@ -36,17 +35,40 @@ namespace mlx colorAttachmentRef.attachment = 0; colorAttachmentRef.layout = (layout == VK_IMAGE_LAYOUT_PRESENT_SRC_KHR ? VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL : layout); - VkSubpassDescription subpass{}; - subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; - subpass.colorAttachmentCount = 1; - subpass.pColorAttachments = &colorAttachmentRef; + VkSubpassDescription subpass1{}; + subpass1.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; + subpass1.colorAttachmentCount = 1; + subpass1.pColorAttachments = &colorAttachmentRef; + + VkSubpassDescription subpasses[] = { subpass1 }; + + std::vector subpassesDeps; + subpassesDeps.emplace_back(); + subpassesDeps.back().srcSubpass = VK_SUBPASS_EXTERNAL; + subpassesDeps.back().dstSubpass = 0; + subpassesDeps.back().srcStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT; + subpassesDeps.back().dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + subpassesDeps.back().srcAccessMask = VK_ACCESS_MEMORY_READ_BIT; + subpassesDeps.back().dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; + subpassesDeps.back().dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; + + subpassesDeps.emplace_back(); + subpassesDeps.back().srcSubpass = 0; + subpassesDeps.back().dstSubpass = VK_SUBPASS_EXTERNAL; + subpassesDeps.back().srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + subpassesDeps.back().dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT; + subpassesDeps.back().srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; + subpassesDeps.back().dstAccessMask = VK_ACCESS_MEMORY_READ_BIT; + subpassesDeps.back().dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; VkRenderPassCreateInfo renderPassInfo{}; renderPassInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO; renderPassInfo.attachmentCount = 1; renderPassInfo.pAttachments = &colorAttachment; - renderPassInfo.subpassCount = 1; - renderPassInfo.pSubpasses = &subpass; + renderPassInfo.subpassCount = sizeof(subpasses) / sizeof(VkSubpassDescription); + renderPassInfo.pSubpasses = subpasses; + renderPassInfo.dependencyCount = static_cast(subpassesDeps.size()); + renderPassInfo.pDependencies = subpassesDeps.data(); if(vkCreateRenderPass(Render_Core::get().getDevice().get(), &renderPassInfo, nullptr, &_renderPass) != VK_SUCCESS) core::error::report(e_kind::fatal_error, "Vulkan : failed to create render pass"); @@ -78,7 +100,6 @@ namespace mlx { if(!_is_running) return; - vkCmdEndRenderPass(cmd.get()); _is_running = false; } diff --git a/src/renderer/renderpass/vk_render_pass.h b/src/renderer/renderpass/vk_render_pass.h index 61625ec..3d57b4d 100644 --- a/src/renderer/renderpass/vk_render_pass.h +++ b/src/renderer/renderpass/vk_render_pass.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:22:00 by maldavid #+# #+# */ -/* Updated: 2023/12/22 23:00:00 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/24 13:01:56 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/test/main.c b/test/main.c index 851aeda..402ae5b 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: 2023/12/16 19:14:56 by maldavid ### ########.fr */ +/* Updated: 2023/12/24 16:02:35 by kbz_8 ### ########.fr */ /* */ /* ************************************************************************** */