Merge pull request #46 from CapsCollective/feature/remove-volk

Removed all Vulkan leakages from modules

Author: Raelr

engine/render/renderer/Renderer.cpp

@@ -6,12 +6,11 @@
 //     https://opensource.org/licenses/Zlib
 //
 
-#define VOLK_IMPLEMENTATION
-
 #include "Renderer.h"
 
 #include "platform/vulkan/Font.h"
 #include "platform/vulkan/utils/Types.h"
+#include "platform/vulkan/utils/Viewport.h"
 #include "statics/Statics.h"
 
 namespace Siege
@@ -22,19 +21,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();
 
@@ -174,6 +174,11 @@ void Renderer::EndFrame()
     renderer2D.Flush();
 }
 
+void Renderer::ClearDeviceQueue()
+{
+    Vulkan::Context::GetCurrentDevice()->WaitIdle();
+}
+
 void Renderer::BeginSwapChainRenderPass()
 {
     auto& swapchain = context.GetSwapchain();
@@ -182,19 +187,14 @@ void Renderer::BeginSwapChainRenderPass()
 
     auto swapExtent = swapchain.GetExtent();
 
-    swapchain.BeginRenderPass(commandBuffers, currentImageIndex, {{clearValue}, {{{1.f, 0.f}}}});
+    swapchain.BeginRenderPass(commandBuffers, currentImageIndex, {0.96f, 0.96f, 0.96f, 1.f});
 
-    VkViewport viewport {};
-    viewport.x = 0.0f;
-    viewport.y = 0.0f;
-    viewport.width = static_cast<float>(swapExtent.width);
-    viewport.height = static_cast<float>(swapExtent.height);
-    viewport.minDepth = 0.0f;
-    viewport.maxDepth = 1.0f;
-    VkRect2D scissor {{0, 0}, {swapExtent.width, swapExtent.height}};
+    using namespace Vulkan::Utils;
 
-    vkCmdSetViewport(commandBuffers.GetActiveCommandBuffer(), 0, 1, &viewport);
-    vkCmdSetScissor(commandBuffers.GetActiveCommandBuffer(), 0, 1, &scissor);
+    SetViewport(commandBuffers.GetActiveCommandBuffer(),
+                static_cast<float>(swapExtent.width),
+                static_cast<float>(swapExtent.height));
+    SetScissor(commandBuffers.GetActiveCommandBuffer(), swapExtent.width, swapExtent.height);
 }
 
 void Renderer::EndSwapChainRenderPass()

engine/render/renderer/Renderer.h

@@ -12,16 +12,18 @@
 #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/CommandBuffer.h"
 #include "render/renderer/platform/vulkan/Context.h"
+#include "render/renderer/platform/vulkan/DescriptorPool.h"
+#include "renderer/CameraData.h"
 #include "renderer/Renderer2D.h"
 #include "renderer/Renderer3D.h"
 
 namespace Siege
 {
+
 class Renderer
 {
 public:
@@ -48,15 +50,7 @@ class Renderer
     bool StartFrame();
     void EndFrame();
 
-    void ClearDeviceQueue()
-    {
-        vkDeviceWaitIdle(Context().GetVkLogicalDevice());
-    }
-
-    void SetClearValue(float r, float g, float b, float a)
-    {
-        clearValue = {{r, g, b, a}};
-    }
+    void ClearDeviceQueue();
 
     void DrawQuad(const Vec2 position,
                   const Vec2 scale = {1.f, 1.f},
@@ -99,9 +93,6 @@ class Renderer
     static Vulkan::CommandBuffer commandBuffers;
     static uint32_t currentFrameIndex;
 
-    // Make this adjustable in the window, not the renderer.
-    VkClearColorValue clearValue {{0.96f, 0.96f, 0.96f, 1.f}};
-
     void RecreateSwapChain();
 
     void BeginSwapChainRenderPass();

engine/render/renderer/buffer/Buffer.cpp

@@ -12,15 +12,16 @@
 
 #include "render/renderer/platform/vulkan/Context.h"
 #include "render/renderer/platform/vulkan/utils/Device.h"
+#include "render/renderer/platform/vulkan/utils/TypeAdaptor.h"
 
 namespace Siege::Buffer
 {
 // TODO: Wrap this in a static class 'BufferAllocator' so that we
 // don't need to keep a static instance.
 
-void CreateBuffer(VkDeviceSize size,
-                  VkBufferUsageFlags usage,
-                  VkMemoryPropertyFlags properties,
+void CreateBuffer(unsigned long size,
+                  unsigned int usage,
+                  unsigned int properties,
                   VkBuffer& buffer,
                   VkDeviceMemory& bufferMemory)
 {
@@ -54,7 +55,7 @@ void CreateBuffer(VkDeviceSize size,
     vkBindBufferMemory(device, buffer, bufferMemory, 0);
 };
 
-void CopyData(Buffer& dstBuffer, VkDeviceSize size, const void* bufferData, VkDeviceSize offset)
+void CopyData(Buffer& dstBuffer, unsigned long size, const void* bufferData, unsigned long offset)
 {
     auto device = Vulkan::Context::GetVkLogicalDevice();
 
@@ -64,7 +65,7 @@ void CopyData(Buffer& dstBuffer, VkDeviceSize size, const void* bufferData, VkDe
     vkUnmapMemory(device, dstBuffer.bufferMemory);
 }
 
-void AppendData(Buffer& dstBuffer, VkDeviceSize size, const void* bufferData)
+void AppendData(Buffer& dstBuffer, unsigned long size, const void* bufferData)
 {
     auto device = Vulkan::Context::GetVkLogicalDevice();
 
@@ -76,7 +77,7 @@ void AppendData(Buffer& dstBuffer, VkDeviceSize size, const void* bufferData)
     dstBuffer.size = dstBuffer.size + size;
 }
 
-void CopyBuffer(VkBuffer& srcBuffer, VkBuffer& dstBuffer, VkDeviceSize size)
+void CopyBuffer(VkBuffer& srcBuffer, VkBuffer& dstBuffer, unsigned long size)
 {
     Vulkan::Context::GetCurrentDevice()->CopyBuffer(srcBuffer, dstBuffer, size);
 }

engine/render/renderer/buffer/Buffer.h

@@ -9,14 +9,14 @@
 #ifndef SIEGE_ENGINE_BUFFER_H
 #define SIEGE_ENGINE_BUFFER_H
 
-#include "../Core.h"
+#include "render/renderer/platform/vulkan/utils/Types.h"
 
 namespace Siege::Buffer
 {
 struct Buffer
 {
-    VkBuffer buffer {VK_NULL_HANDLE};
-    VkDeviceMemory bufferMemory {VK_NULL_HANDLE};
+    VkBuffer buffer {nullptr};
+    VkDeviceMemory bufferMemory {nullptr};
     uint64_t size = 0;
 };
 
@@ -30,9 +30,9 @@ struct Buffer
  * @param buffer - the buffer that the function should write data to.
  * @param bufferMemory - the buffer memory data the function should write data to.
  **/
-void CreateBuffer(VkDeviceSize size,
-                  VkBufferUsageFlags usage,
-                  VkMemoryPropertyFlags properties,
+void CreateBuffer(unsigned long size,
+                  unsigned int usage,
+                  unsigned int properties,
                   VkBuffer& buffer,
                   VkDeviceMemory& bufferMemory);
 
@@ -44,7 +44,7 @@ void CreateBuffer(VkDeviceSize size,
  * @param typeFilter - The bitmask for the required memory type
  * @param properties - The available device memory properties. Used to query for available memory.
  **/
-uint32_t FindMemoryType(uint32_t typeFilter, VkMemoryPropertyFlags properties);
+uint32_t FindMemoryType(unsigned long typeFilter, Vulkan::Utils::MemoryProperty properties);
 
 /**
  * Copies data into a buffer. Data can be any type as specified by
@@ -55,11 +55,11 @@ uint32_t FindMemoryType(uint32_t typeFilter, VkMemoryPropertyFlags properties);
  * @param bufferData - the data being copied into the buffer
  **/
 void CopyData(Buffer& dstBuffer,
-              VkDeviceSize size,
+              unsigned long size,
               const void* bufferData,
-              VkDeviceSize offset = 0);
+              unsigned long offset = 0);
 
-void AppendData(Buffer& dstBuffer, VkDeviceSize size, const void* bufferData);
+void AppendData(Buffer& dstBuffer, unsigned long size, const void* bufferData);
 
 /**
  * Copies a buffer. This is generally used when copying the values within a buffer into
@@ -69,7 +69,7 @@ void AppendData(Buffer& dstBuffer, VkDeviceSize size, const void* bufferData);
  * @param dstBuffer - the buffer where the data is being copied into.
  * @param size - the expected size of the resulting buffer.
  **/
-void CopyBuffer(VkBuffer& srcBuffer, VkBuffer& dstBuffer, VkDeviceSize size);
+void CopyBuffer(VkBuffer& srcBuffer, VkBuffer& dstBuffer, unsigned long size);
 
 /**
  * Destroys a buffer struct and releases memory back to the device.