Removed volk and core from Buffer class

Author: Raelr

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.

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

@@ -43,7 +43,7 @@ Material::Material(Shader vertShader, Shader fragShader, bool isWritingDepth) :
 
     // Allocate buffer which can store all the data we need
     Buffer::CreateBuffer(bufferSize,
-                         VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
+                         Vulkan::Utils::STORAGE_BUFFER | Vulkan::Utils::UNIFORM_BUFFER,
                          VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
                          OUT buffer.buffer,
                          OUT buffer.bufferMemory);

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

@@ -206,13 +206,69 @@ DECL_VULKAN_SWITCH_FUN(VkImageLayout,
 
 DECL_VULKAN_SWITCH_FUN(BufferType,
                        VkBufferUsageFlagBits,
+                       SWITCH_MEM(VkBufferUsageFlagBits,
+                                  VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
+                                  TRANSFER_SRC_BUFFER)
+                       SWITCH_MEM(VkBufferUsageFlagBits,
+                                  VK_BUFFER_USAGE_TRANSFER_DST_BIT,
+                                  TRANSFER_DST_BUFFER)
                        SWITCH_MEM(VkBufferUsageFlagBits,
                                   VK_BUFFER_USAGE_INDEX_BUFFER_BIT,
-                                  INDEX_BUFFER) SWITCH_DEFAULT(VERTEX_BUFFER))
+                                  INDEX_BUFFER)
+                       SWITCH_MEM(VkBufferUsageFlagBits,
+                                  VK_BUFFER_USAGE_VERTEX_BUFFER_BIT,
+                                  VERTEX_BUFFER)
+                       SWITCH_MEM(VkBufferUsageFlagBits,
+                                  VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
+                                  UNIFORM_BUFFER)
+                       SWITCH_MEM(VkBufferUsageFlagBits,
+                                  VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
+                                  STORAGE_BUFFER)
+                       SWITCH_DEFAULT(TRANSFER_SRC_BUFFER))
 DECL_VULKAN_SWITCH_FUN(VkBufferUsageFlagBits,
                        BufferType,
-                       SWITCH_MEM(BufferType, INDEX_BUFFER, VK_BUFFER_USAGE_INDEX_BUFFER_BIT)
-                           SWITCH_DEFAULT(VK_BUFFER_USAGE_VERTEX_BUFFER_BIT))
+                       SWITCH_MEM(BufferType,
+                                  TRANSFER_SRC_BUFFER,
+                                  VK_BUFFER_USAGE_TRANSFER_SRC_BIT)
+                       SWITCH_MEM(BufferType,
+                                  TRANSFER_DST_BUFFER,
+                                  VK_BUFFER_USAGE_TRANSFER_DST_BIT)
+                       SWITCH_MEM(BufferType,
+                                  INDEX_BUFFER,
+                                  VK_BUFFER_USAGE_INDEX_BUFFER_BIT)
+                       SWITCH_MEM(BufferType,
+                                  VERTEX_BUFFER,
+                                  VK_BUFFER_USAGE_VERTEX_BUFFER_BIT)
+                       SWITCH_MEM(BufferType,
+                                  UNIFORM_BUFFER,
+                                  VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT)
+                       SWITCH_MEM(BufferType,
+                                  STORAGE_BUFFER,
+                                  VK_BUFFER_USAGE_STORAGE_BUFFER_BIT)
+                       SWITCH_DEFAULT(VK_BUFFER_USAGE_TRANSFER_SRC_BIT))
+
+DECL_VULKAN_SWITCH_FUN(MemoryProperty, VkMemoryPropertyFlagBits,
+                       SWITCH_MEM(VkMemoryPropertyFlagBits,
+                                  VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+                                  MEMORY_DEVICE_LOCAL)
+                       SWITCH_MEM(VkMemoryPropertyFlagBits,
+                                  VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+                                  MEMORY_HOST_COHERENT)
+                       SWITCH_MEM(VkMemoryPropertyFlagBits,
+                                  VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
+                                  MEMORY_HOST_VISIBLE)
+                       SWITCH_DEFAULT(MEMORY_DEVICE_LOCAL))
+
+DECL_VULKAN_SWITCH_FUN(VkMemoryPropertyFlagBits, MemoryProperty,
+                       SWITCH_MEM(MemoryProperty,
+                                  MEMORY_DEVICE_LOCAL,
+                                  VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)
+                       SWITCH_MEM(MemoryProperty,
+                                  MEMORY_HOST_COHERENT,
+                                  VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)
+                       SWITCH_MEM(MemoryProperty,
+                                  MEMORY_HOST_VISIBLE,
+                                  VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT))
 
 DECL_VULKAN_SWITCH_FUN(
     PipelineStage,

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

@@ -159,8 +159,12 @@ enum ImageLayout
 
 enum BufferType
 {
+    TRANSFER_SRC_BUFFER = 0x00000001,
+    TRANSFER_DST_BUFFER = 0x00000002,
+    UNIFORM_BUFFER = 0x00000010,
+    STORAGE_BUFFER = 0x00000020,
+    INDEX_BUFFER = 0x00000040,
     VERTEX_BUFFER = 0x00000080,
-    INDEX_BUFFER = 0x00000040
 };
 
 enum PipelineStage
@@ -195,6 +199,13 @@ enum VertexInputRate
     INPUT_RATE_INSTANCE = 1
 };
 
+enum MemoryProperty
+{
+    MEMORY_DEVICE_LOCAL = 0x00000001,
+    MEMORY_HOST_COHERENT = 0x00000002,
+    MEMORY_HOST_VISIBLE = 0x00000004
+};
+
 //----------------------------------------- Structs -----------------------------------------------
 
 struct Extent2D