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

Vulkan: Replace ShaderBinding& by ShaderBindingPtr

Browse Source
This commit is contained in:
Lynix
2020-04-06 21:13:59 +02:00
parent f443bec6bc
commit ac8b908079
10 changed files with 171 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Renderer/RenderPipelineLayout.hpp
View File

@@ -7,8 +7,10 @@
#ifndef NAZARA_RENDERPIPELINELAYOUT_HPP
#define NAZARA_RENDERPIPELINELAYOUT_HPP
#include <Nazara/Renderer/Config.hpp>
#include <Nazara/Core/MovablePtr.hpp>
#include <Nazara/Renderer/Enums.hpp>
#include <Nazara/Renderer/ShaderBinding.hpp>
#include <memory>
#include <string>
#include <vector>
@@ -27,15 +29,13 @@ namespace Nz
std::vector<Binding> bindings;
};
class ShaderBinding;
class NAZARA_RENDERER_API RenderPipelineLayout
{
public:
RenderPipelineLayout() = default;
virtual ~RenderPipelineLayout();
virtual ShaderBinding& AllocateShaderBinding() = 0;
virtual ShaderBindingPtr AllocateShaderBinding() = 0;
};
}

15
include/Nazara/Renderer/ShaderBinding.hpp
View File

@@ -9,16 +9,23 @@
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Renderer/Config.hpp>
#include <memory>
#include <variant>
namespace Nz
{
class AbstractBuffer;
class ShaderBinding;
class ShaderBindingDeleter;
class Texture;
class TextureSampler;
using ShaderBindingPtr = std::unique_ptr<ShaderBinding, ShaderBindingDeleter>;
class NAZARA_RENDERER_API ShaderBinding
{
friend ShaderBindingDeleter;
public:
struct Binding;
@@ -47,9 +54,17 @@ namespace Nz
};
protected:
virtual void Release() = 0;
ShaderBinding(const ShaderBinding&) = delete;
ShaderBinding(ShaderBinding&&) = default;
};
class ShaderBindingDeleter
{
public:
inline void operator()(ShaderBinding* binding);
};
}
#include <Nazara/Renderer/ShaderBinding.inl>

4
include/Nazara/Renderer/ShaderBinding.inl
View File

@@ -7,6 +7,10 @@
namespace Nz
{
inline void ShaderBindingDeleter::operator()(ShaderBinding* binding)
{
binding->Release();
}
}
#include <Nazara/Renderer/DebugOff.hpp>

21
include/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp
View File

@@ -8,6 +8,7 @@
#define NAZARA_VULKANRENDERER_VULKANRENDERPIPELINELAYOUT_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/Bitset.hpp>
#include <Nazara/Renderer/RenderPipelineLayout.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/VulkanShaderBinding.hpp>
@@ -16,17 +17,21 @@
#include <Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp>
#include <Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp>
#include <memory>
#include <type_traits>
#include <vector>
namespace Nz
{
class NAZARA_VULKANRENDERER_API VulkanRenderPipelineLayout : public RenderPipelineLayout
{
friend VulkanShaderBinding;
public:
VulkanRenderPipelineLayout() = default;
~VulkanRenderPipelineLayout() = default;
~VulkanRenderPipelineLayout();
VulkanShaderBinding& AllocateShaderBinding() override;
ShaderBindingPtr AllocateShaderBinding() override;
bool Create(Vk::Device& device, RenderPipelineLayoutInfo layoutInfo);
@@ -36,10 +41,20 @@ namespace Nz
inline const Vk::PipelineLayout& GetPipelineLayout() const;
private:
struct DescriptorPool;
DescriptorPool& AllocatePool();
ShaderBindingPtr AllocateFromPool(std::size_t poolIndex);
void Release(ShaderBinding& binding);
inline void TryToShrink();
struct DescriptorPool
{
using BindingStorage = std::aligned_storage_t<sizeof(VulkanShaderBinding), alignof(VulkanShaderBinding)>;
Bitset<UInt64> freeBindings;
Vk::DescriptorPool descriptorPool;
std::vector<VulkanShaderBinding> allocatedSets;
std::unique_ptr<BindingStorage[]> storage;
};
MovablePtr<Vk::Device> m_device;

15
include/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.inl
View File

@@ -21,6 +21,21 @@ namespace Nz
{
return m_pipelineLayout;
}
inline void VulkanRenderPipelineLayout::TryToShrink()
{
std::size_t poolCount = m_descriptorPools.size();
if (poolCount >= 2 && m_descriptorPools.back().freeBindings.TestAll())
{
for (std::size_t i = poolCount - 1; i > 0; ++i)
{
if (m_descriptorPools[i].freeBindings.TestAll())
poolCount--;
}
m_descriptorPools.resize(poolCount);
}
}
}
#include <Nazara/VulkanRenderer/DebugOff.hpp>

8
include/Nazara/VulkanRenderer/VulkanShaderBinding.hpp
View File

@@ -18,12 +18,14 @@ namespace Nz
class NAZARA_VULKANRENDERER_API VulkanShaderBinding : public ShaderBinding
{
public:
inline VulkanShaderBinding(VulkanRenderPipelineLayout& owner, Vk::DescriptorSet descriptorSet);
inline VulkanShaderBinding(VulkanRenderPipelineLayout& owner, std::size_t poolIndex, std::size_t bindingIndex, Vk::DescriptorSet descriptorSet);
VulkanShaderBinding(const VulkanShaderBinding&) = default;
VulkanShaderBinding(VulkanShaderBinding&&) noexcept = default;
~VulkanShaderBinding() = default;
inline std::size_t GetBindingIndex() const;
inline Vk::DescriptorSet& GetDescriptorSet();
inline std::size_t GetPoolIndex() const;
inline VulkanRenderPipelineLayout& GetOwner();
void Update(std::initializer_list<Binding> bindings) override;
@@ -32,8 +34,12 @@ namespace Nz
VulkanShaderBinding& operator=(VulkanShaderBinding&&) = delete;
private:
void Release() override;
Vk::AutoDescriptorSet m_descriptorSet;
VulkanRenderPipelineLayout& m_owner;
std::size_t m_bindingIndex;
std::size_t m_poolIndex;
};
}

16
include/Nazara/VulkanRenderer/VulkanShaderBinding.inl
View File

@@ -7,12 +7,24 @@
namespace Nz
{
inline VulkanShaderBinding::VulkanShaderBinding(VulkanRenderPipelineLayout& owner, Vk::DescriptorSet descriptorSet) :
inline VulkanShaderBinding::VulkanShaderBinding(VulkanRenderPipelineLayout& owner, std::size_t poolIndex, std::size_t bindingIndex, Vk::DescriptorSet descriptorSet) :
m_descriptorSet(std::move(descriptorSet)),
m_owner(owner)
m_owner(owner),
m_bindingIndex(bindingIndex),
m_poolIndex(poolIndex)
{
}
inline std::size_t VulkanShaderBinding::GetBindingIndex() const
{
return m_bindingIndex;
}
inline std::size_t VulkanShaderBinding::GetPoolIndex() const
{
return m_poolIndex;
}
inline Vk::DescriptorSet& VulkanShaderBinding::GetDescriptorSet()
{
return m_descriptorSet;