🐛 Present under mutex lock

Close #52 (can be reopened upon regression).

Author: karnkaul

lib/render/src/renderer.cpp

@@ -239,10 +239,11 @@ bool Renderer::render() {
 	// submit commands
 	{
 		auto lock = std::scoped_lock{m_impl->gfx.shared->mutex};
-		frame.submit(m_impl->gfx.queue);
+		frame.submit(lock, m_impl->gfx.queue);
+
+		// present image
+		m_impl->swapchain.present(lock, m_impl->window.framebuffer_extent(), *frame.sync.present);
 	}
-	// present image
-	m_impl->swapchain.present(m_impl->window.framebuffer_extent(), *frame.sync.present);
 
 	// rotate everything
 	m_impl->pipes.rotate();

lib/vk/include/facade/vk/render_frame.hpp

@@ -23,7 +23,7 @@ struct RenderFrame {
 
 	Framebuffer refresh(vk::Device device, vk::RenderPass rp, RenderTarget const& rt);
 
-	void submit(vk::Queue queue) const;
+	void submit(std::scoped_lock<std::mutex> const& q_lock, vk::Queue queue) const;
 };
 
 template <std::size_t Size = buffering_v>

lib/vk/include/facade/vk/swapchain.hpp

@@ -47,7 +47,7 @@ class Swapchain {
 	vk::Result refresh(Spec const& spec);
 
 	[[nodiscard]] vk::Result acquire(glm::uvec2 extent, ImageView& out, vk::Semaphore semaphore, vk::Fence fence = {});
-	vk::Result present(glm::uvec2 extent, vk::Semaphore wait);
+	vk::Result present(std::scoped_lock<std::mutex> const& q_lock, glm::uvec2 extent, vk::Semaphore wait);
 
 	vk::SwapchainCreateInfoKHR info{};
 

lib/vk/src/render_frame.cpp

@@ -84,7 +84,7 @@ Framebuffer RenderFrame::refresh(vk::Device device, vk::RenderPass rp, RenderTar
 	return {rt.attachments(), *framebuffer, primary, secondary.span()};
 }
 
-void RenderFrame::submit(vk::Queue queue) const {
+void RenderFrame::submit(std::scoped_lock<std::mutex> const&, vk::Queue queue) const {
 	static constexpr vk::PipelineStageFlags wait = vk::PipelineStageFlagBits::eColorAttachmentOutput;
 	auto si = vk::SubmitInfo{*sync.draw, wait, primary, *sync.present};
 	queue.submit(si, *sync.drawn);

lib/vk/src/swapchain.cpp

@@ -106,7 +106,7 @@ vk::Result Swapchain::acquire(glm::uvec2 extent, ImageView& out, vk::Semaphore s
 	return ret;
 }
 
-vk::Result Swapchain::present(glm::uvec2 extent, vk::Semaphore wait) {
+vk::Result Swapchain::present(std::scoped_lock<std::mutex> const&, glm::uvec2 extent, vk::Semaphore wait) {
 	if (!m_storage.acquired || is_zero(extent)) { return vk::Result::eNotReady; }
 	auto pi = vk::PresentInfoKHR{};
 	pi.swapchainCount = 1U;