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

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;