Removed volk from DescriptorPool header

Author: Raelr

engine/render/renderer/Renderer.cpp

@@ -6,8 +6,6 @@
 //     https://opensource.org/licenses/Zlib
 //
 
-#define VOLK_IMPLEMENTATION
-
 #include "Renderer.h"
 
 #include "platform/vulkan/Font.h"
@@ -22,19 +20,20 @@ uint32_t Renderer::currentFrameIndex = 0;
 
 Renderer::Renderer(Window& window) : window {window}
 {
+    using namespace Vulkan::Utils;
     Statics::Initialise();
 
     if (instance == nullptr) instance = this;
 
-    auto extent = window.GetExtents();
-
     context.Init(window);
 
-    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1024);
-    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1024);
-    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1024);
-    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, 1024);
-    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1024);
+    DescriptorPool::Initialise();
+
+    DescriptorPool::AddPoolSize(UNIFORM, 1024);
+    DescriptorPool::AddPoolSize(UNIFORM_DYNAMIC, 1024);
+    DescriptorPool::AddPoolSize(STORAGE, 1024);
+    DescriptorPool::AddPoolSize(STORAGE_DYNAMIC, 1024);
+    DescriptorPool::AddPoolSize(TEXTURE2D, 1024);
 
     DescriptorPool::BuildPool();
 

engine/render/renderer/Renderer.h

@@ -12,9 +12,9 @@
 #include <utils/Logging.h>
 #include <window/Window.h>
 
-#include "descriptor/DescriptorPool.h"
 #include "lights/PointLight.h"
 #include "model/Model.h"
+#include "render/renderer/platform/vulkan/DescriptorPool.h"
 #include "render/renderer/platform/vulkan/CommandBuffer.h"
 #include "render/renderer/platform/vulkan/Context.h"
 #include "renderer/Renderer2D.h"

engine/render/renderer/descriptor/DescriptorPool.cpp

@@ -1,19 +1,19 @@
 //
-//
 //  Copyright (c) 2022 Jonathan Moallem (@J-Mo63) & Aryeh Zinn (@Raelr)
 //
 //  This code is released under an unmodified zlib license.
 //  For conditions of distribution and use, please see:
 //      https://opensource.org/licenses/Zlib
 //
 
+#define VOLK_IMPLEMENTATION
+
 #include "Context.h"
+#include "render/renderer/Renderer.h"
 
 #include <GLFW/glfw3.h>
 #include <utils/Logging.h>
 
-#include "render/renderer/Renderer.h"
-
 namespace Siege::Vulkan
 {
 Context::~Context()

engine/render/renderer/platform/vulkan/Context.cpp

@@ -0,0 +1,43 @@
+//
+// Copyright (c) 2022 Jonathan Moallem (@J-Mo63) & Aryeh Zinn (@Raelr)
+//
+// This code is released under an unmodified zlib license.
+// For conditions of distribution and use, please see:
+//     https://opensource.org/licenses/Zlib
+//
+
+#include "DescriptorPool.h"
+
+#include "render/renderer/platform/vulkan/Context.h"
+#include "render/renderer/platform/vulkan/utils/Descriptor.h"
+
+namespace Siege
+{
+Vulkan::Utils::UniformAllocator DescriptorPool::descriptorPool {nullptr};
+MHArray<Vulkan::Utils::UniformAllocation> DescriptorPool::sizes;
+
+void DescriptorPool::AddPoolSize(const Vulkan::Utils::UniformType type, const uint32_t size)
+{
+    sizes.Append({type, size});
+}
+
+void DescriptorPool::Initialise()
+{
+    using namespace Vulkan::Utils;
+    sizes = MHArray<UniformAllocation>(Descriptor::MAX_DESCRIPTOR_POOL_SIZES);
+}
+
+void DescriptorPool::BuildPool()
+{
+    using namespace Vulkan::Utils;
+    descriptorPool = Descriptor::CreateDescriptorPool(Vulkan::Context::GetVkLogicalDevice(),
+                                                      sizes.Data(),
+                                                      sizes.Count());
+}
+
+void DescriptorPool::DestroyPool()
+{
+    Vulkan::Utils::Descriptor::DestroyDescriptorPool(Vulkan::Context::GetVkLogicalDevice(),
+                                                     descriptorPool);
+}
+} // namespace Siege

engine/render/renderer/platform/vulkan/DescriptorPool.cpp

@@ -9,16 +9,21 @@
 #ifndef SIEGE_ENGINE_DESCRIPTOR_POOL_H
 #define SIEGE_ENGINE_DESCRIPTOR_POOL_H
 
-#include "../Core.h"
+#include <utils/collections/HeapArray.h>
+
+#include "render/renderer/platform/vulkan/utils/Types.h"
 
 namespace Siege
 {
+// TODO(Aryeh): Remove the statics in this file (remember to create constructors and Swap functions)
 class DescriptorPool
 {
 public:
 
-    static void AddPoolSize(const VkDescriptorType type, const uint32_t size);
-    static VkDescriptorPool& GetDescriptorPool()
+    static void Initialise();
+    static void AddPoolSize(const Vulkan::Utils::UniformType type, const unsigned int size);
+
+    static inline Vulkan::Utils::UniformAllocator& GetDescriptorPool()
     {
         return descriptorPool;
     }
@@ -28,10 +33,8 @@ class DescriptorPool
 
 private:
 
-    static constexpr size_t MAX_DESCRIPTOR_POOL_SIZES = 1024;
-
-    static VkDescriptorPool descriptorPool;
-    static MSArray<VkDescriptorPoolSize, MAX_DESCRIPTOR_POOL_SIZES> sizes;
+    static Vulkan::Utils::UniformAllocator descriptorPool;
+    static MHArray<Vulkan::Utils::UniformAllocation> sizes;
 };
 } // namespace Siege
 

engine/render/renderer/descriptor/DescriptorPool.h renamed to engine/render/renderer/platform/vulkan/DescriptorPool.h

@@ -16,7 +16,7 @@
 #include "Pipeline.h"
 #include "Swapchain.h"
 #include "render/renderer/Renderer.h"
-#include "render/renderer/descriptor/DescriptorPool.h"
+#include "render/renderer/platform/vulkan/DescriptorPool.h"
 #include "render/renderer/platform/vulkan/utils/Descriptor.h"
 #include "utils/TypeAdaptor.h"
 

engine/render/renderer/platform/vulkan/Material.cpp

@@ -8,8 +8,35 @@
 
 #include "Descriptor.h"
 
+#include <utils/Logging.h>
+
 namespace Siege::Vulkan::Utils::Descriptor
 {
+VkDescriptorPool CreateDescriptorPool(VkDevice device,
+                                      UniformAllocation* sizes,
+                                      unsigned int sizeCount)
+{
+    VkDescriptorPool pool {VK_NULL_HANDLE};
+
+    VkDescriptorPoolCreateInfo poolCreateInfo {};
+    poolCreateInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
+    poolCreateInfo.flags = 0;
+    poolCreateInfo.maxSets = MAX_DESCRIPTOR_POOL_SIZES;
+    poolCreateInfo.poolSizeCount = sizeCount;
+    poolCreateInfo.pPoolSizes = reinterpret_cast<VkDescriptorPoolSize*>(sizes);
+
+    CC_ASSERT(vkCreateDescriptorPool(device, &poolCreateInfo, nullptr, &pool) == VK_SUCCESS,
+              "Unable to create descriptor pool!")
+
+    return pool;
+}
+
+void DestroyDescriptorPool(VkDevice device, VkDescriptorPool pool)
+{
+    if (pool == nullptr) return;
+    vkDestroyDescriptorPool(device, pool, nullptr);
+}
+
 VkDescriptorSetLayoutBinding CreateLayoutBinding(uint32_t binding,
                                                  uint32_t count,
                                                  uint32_t type,

engine/render/renderer/platform/vulkan/utils/Descriptor.cpp

@@ -11,18 +11,19 @@
 
 #include <cstdint>
 
+#include "Types.h"
 #include "volk/volk.h"
 
 namespace Siege::Vulkan::Utils::Descriptor
 {
 
-enum Type
-{
-    UNIFORM = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
-    STORAGE = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
-    UNIFORM_DYNAMIC = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC,
-    STORAGE_DYNAMIC = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC
-};
+static constexpr unsigned int MAX_DESCRIPTOR_POOL_SIZES = 1024;
+
+VkDescriptorPool CreateDescriptorPool(VkDevice device,
+                                      UniformAllocation* sizes,
+                                      unsigned int sizeCount);
+
+void DestroyDescriptorPool(VkDevice device, VkDescriptorPool pool);
 
 VkDescriptorSetLayoutBinding CreateLayoutBinding(uint32_t binding,
                                                  uint32_t count,

engine/render/renderer/platform/vulkan/utils/Descriptor.h

@@ -1,5 +1,4 @@
 //
-//
 //  Copyright (c) 2022 Jonathan Moallem (@J-Mo63) & Aryeh Zinn (@Raelr)
 //
 //  This code is released under an unmodified zlib license.