sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renderer: Add release queue to fix deletion while use

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-14 02:04:47 +02:00
parent 51ecff2912
commit f280cff0a2
13 changed files with 163 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/OpenGLRenderer/OpenGLRenderWindow.hpp
View File

@@ -44,7 +44,7 @@ namespace Nz
private:
std::size_t m_currentFrame;
std::shared_ptr<OpenGLDevice> m_device;
std::vector<OpenGLRenderImage> m_renderImage;
std::vector<std::unique_ptr<OpenGLRenderImage>> m_renderImage;
std::unique_ptr<GL::Context> m_context;
OpenGLRenderPass m_renderPass;
OpenGLWindowFramebuffer m_framebuffer;

7
include/Nazara/Renderer/RenderFrame.hpp
View File

@@ -10,13 +10,13 @@
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Renderer/Config.hpp>
#include <Nazara/Renderer/Enums.hpp>
#include <Nazara/Renderer/RenderImage.hpp>
#include <functional>
namespace Nz
{
class CommandBuffer;
class CommandBufferBuilder;
class RenderImage;
class UploadPool;
class NAZARA_RENDERER_API RenderFrame
@@ -34,10 +34,13 @@ namespace Nz
inline bool IsFramebufferInvalidated() const;
void SubmitCommandBuffer(CommandBuffer* commandBuffer, QueueTypeFlags queueTypeFlags) ;
template<typename T> void PushForRelease(T&& value);
template<typename F> void PushReleaseCallback(F&& releaseCallback);
void Present();
void SubmitCommandBuffer(CommandBuffer* commandBuffer, QueueTypeFlags queueTypeFlags) ;
inline explicit operator bool();
RenderFrame& operator=(const RenderFrame&) = delete;

15
include/Nazara/Renderer/RenderFrame.inl
View File

@@ -23,6 +23,21 @@ namespace Nz
return m_framebufferInvalidation;
}
template<typename T>
void RenderFrame::PushForRelease(T&& value)
{
return PushReleaseCallback([v = std::forward<T>(value)] {});
}
template<typename F>
void RenderFrame::PushReleaseCallback(F&& releaseCallback)
{
if (!m_image)
throw std::runtime_error("frame is either invalid or has already been presented");
m_image->PushReleaseCallback(std::forward<F>(releaseCallback));
}
inline RenderFrame::operator bool()
{
return m_image != nullptr;

43
include/Nazara/Renderer/RenderImage.hpp
View File

@@ -21,12 +21,19 @@ namespace Nz
class NAZARA_RENDERER_API RenderImage
{
public:
class Releasable;
template<typename T> class ReleasableLambda;
virtual ~RenderImage();
virtual void Execute(const std::function<void(CommandBufferBuilder& builder)>& callback, QueueTypeFlags queueTypeFlags) = 0;
inline void FlushReleaseQueue();
virtual UploadPool& GetUploadPool() = 0;
template<typename F> void PushReleaseCallback(F&& callback);
virtual void SubmitCommandBuffer(CommandBuffer* commandBuffer, QueueTypeFlags queueTypeFlags) = 0;
virtual void Present() = 0;
@@ -34,7 +41,41 @@ namespace Nz
protected:
RenderImage() = default;
RenderImage(const RenderImage&) = delete;
RenderImage(RenderImage&&) = default;
RenderImage(RenderImage&&) = delete;
private:
static constexpr std::size_t BlockSize = 4 * 1024;
using Block = std::vector<UInt8>;
std::vector<Releasable*> m_releaseQueue;
std::vector<Block> m_releaseMemoryPool;
};
class NAZARA_RENDERER_API RenderImage::Releasable
{
public:
virtual ~Releasable();
virtual void Release() = 0;
};
template<typename T>
class RenderImage::ReleasableLambda : public Releasable
{
public:
template<typename U> ReleasableLambda(U&& lambda);
ReleasableLambda(const ReleasableLambda&) = delete;
ReleasableLambda(ReleasableLambda&&) = delete;
~ReleasableLambda() = default;
void Release() override;
ReleasableLambda& operator=(const ReleasableLambda&) = delete;
ReleasableLambda& operator=(ReleasableLambda&&) = delete;
private:
T m_lambda;
};
}

81
include/Nazara/Renderer/RenderImage.inl
View File

@@ -3,10 +3,91 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Renderer/RenderImage.hpp>
#include <Nazara/Core/Algorithm.hpp>
#include <Nazara/Core/MemoryHelper.hpp>
#include <Nazara/Renderer/Debug.hpp>
namespace Nz
{
inline void RenderImage::FlushReleaseQueue()
{
for (Releasable* releasable : m_releaseQueue)
{
releasable->Release();
PlacementDestroy(releasable);
}
m_releaseQueue.clear();
for (auto& memoryblock : m_releaseMemoryPool)
memoryblock.clear();
}
template<typename F>
void RenderImage::PushReleaseCallback(F&& callback)
{
using Functor = ReleasableLambda<std::remove_cv_t<std::remove_reference_t<F>>>;
constexpr std::size_t functorSize = sizeof(Functor);
constexpr std::size_t functorAlignment = alignof(Functor);
// Try to minimize lost space
struct
{
Block* block = nullptr;
UInt64 alignedOffset = 0;
UInt64 lostSpace = 0;
} bestBlock;
for (Block& block : m_releaseMemoryPool)
{
std::size_t freeOffset = block.size();
UInt64 alignedOffset = Align(freeOffset, functorAlignment);
if (alignedOffset + functorSize > block.capacity())
continue; //< Not enough space
UInt64 lostSpace = alignedOffset - freeOffset;
if (!bestBlock.block || lostSpace < bestBlock.lostSpace)
{
bestBlock.block = &block;
bestBlock.alignedOffset = alignedOffset;
bestBlock.lostSpace = lostSpace;
}
}
// No block found, allocate a new one
if (!bestBlock.block)
{
Block newBlock;
newBlock.reserve(BlockSize);
bestBlock.block = &m_releaseMemoryPool.emplace_back(std::move(newBlock));
bestBlock.alignedOffset = 0;
bestBlock.lostSpace = 0;
}
Block& targetBlock = *bestBlock.block;
targetBlock.resize(bestBlock.alignedOffset + functorSize);
Functor* releasable = reinterpret_cast<Functor*>(&targetBlock[bestBlock.alignedOffset]);
PlacementNew(releasable, std::forward<F>(callback));
m_releaseQueue.push_back(releasable);
}
template<typename T>
template<typename U>
RenderImage::ReleasableLambda<T>::ReleasableLambda(U&& lambda) :
m_lambda(std::forward<U>(lambda))
{
}
template<typename T>
void RenderImage::ReleasableLambda<T>::Release()
{
m_lambda();
}
}
#include <Nazara/Renderer/DebugOff.hpp>

2
include/Nazara/VulkanRenderer/VkRenderWindow.hpp
View File

@@ -74,7 +74,7 @@ namespace Nz
std::shared_ptr<VulkanDevice> m_device;
std::size_t m_currentFrame;
std::vector<Vk::Fence*> m_inflightFences;
std::vector<VulkanRenderImage> m_concurrentImageData;
std::vector<std::unique_ptr<VulkanRenderImage>> m_concurrentImageData;
Vk::DeviceMemory m_depthBufferMemory;
Vk::Image m_depthBuffer;
Vk::ImageView m_depthBufferView;

6
include/Nazara/VulkanRenderer/VulkanRenderImage.hpp
View File

@@ -36,13 +36,13 @@ namespace Nz
inline Vk::Semaphore& GetRenderFinishedSemaphore();
VulkanUploadPool& GetUploadPool() override;
void SubmitCommandBuffer(CommandBuffer* commandBuffer, QueueTypeFlags queueTypeFlags) override;
void SubmitCommandBuffer(VkCommandBuffer commandBuffer, QueueTypeFlags queueTypeFlags);
void Present() override;
inline void Reset(UInt32 imageIndex);
void SubmitCommandBuffer(CommandBuffer* commandBuffer, QueueTypeFlags queueTypeFlags) override;
void SubmitCommandBuffer(VkCommandBuffer commandBuffer, QueueTypeFlags queueTypeFlags);
VulkanRenderImage& operator=(const VulkanRenderImage&) = delete;
VulkanRenderImage& operator=(VulkanRenderImage&&) = delete;

4
include/Nazara/VulkanRenderer/VulkanRenderImage.inl
View File

@@ -7,7 +7,7 @@
namespace Nz
{
inline Vk::Fence& Nz::VulkanRenderImage::GetInFlightFence()
inline Vk::Fence& VulkanRenderImage::GetInFlightFence()
{
return m_inFlightFence;
}
@@ -29,6 +29,8 @@ namespace Nz
inline void VulkanRenderImage::Reset(UInt32 imageIndex)
{
FlushReleaseQueue();
m_graphicalCommandsBuffers.clear();
m_currentCommandBuffer = 0;
m_imageIndex = imageIndex;