Renamed iterators, Stackarray tests, and added traits to function ptrs

Author: Raelr

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

@@ -98,6 +98,22 @@ Material::~Material()
         [&](PropertiesSlot& prop) { vkDestroyDescriptorSetLayout(device, prop.layout, nullptr); });
 }
 
+void Material::Destroy()
+{
+    auto device = Vulkan::Context::GetVkLogicalDevice();
+
+    Buffer::DestroyBuffer(buffer);
+
+    propertiesSlots.MForEach([&](PropertiesSlot& prop) {
+        vkDestroyDescriptorSetLayout(device, prop.layout, nullptr);
+        prop.layout = nullptr;
+    });
+
+    vertexShader.Destroy();
+    fragmentShader.Destroy();
+    graphicsPipeline.Destroy();
+}
+
 Material& Material::operator=(Material&& other)
 {
     Swap(other);

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

@@ -59,6 +59,8 @@ class Material
      */
     ~Material();
 
+    void Destroy();
+
     /**
      * A movement assignment operator
      * @param other the Material to be moved

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

@@ -144,6 +144,11 @@ Pipeline Pipeline::Builder::Build()
 }
 
 Pipeline::~Pipeline()
+{
+    Destroy();
+}
+
+void Pipeline::Destroy()
 {
     auto device = Vulkan::Context::GetVkLogicalDevice();
 

engine/render/renderer/platform/vulkan/Pipeline.h

@@ -146,6 +146,11 @@ class Pipeline
      */
     ~Pipeline();
 
+    /**
+     * Manual destruction function
+     */
+    void Destroy();
+
     /**
      * A Pipeline move assignment operator
      * @param other the Pipeline to be moved

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

@@ -129,6 +129,11 @@ Shader::Shader(const String& filePath,
 }
 
 Shader::~Shader()
+{
+    Destroy();
+}
+
+void Shader::Destroy()
 {
     Utils::Shader::DestroyShaderModule(shaderModule);
 }

engine/render/renderer/platform/vulkan/Shader.h

@@ -288,6 +288,8 @@ class Shader
      */
     ~Shader();
 
+    void Destroy();
+
     static ::Siege::Utils::MHArray<char> ReadFileAsBinary(const String& filePath);
 
     /**

engine/render/renderer/renderer/DebugRenderer3D.cpp

@@ -37,7 +37,7 @@ void DebugRenderer3D::Initialise(const String& globalDataAttributeName,
 
 void DebugRenderer3D::Destroy()
 {
-    lineMaterial.~Material();
+    lineMaterial.Destroy();
     lineModel.DestroyModel();
 }
 

engine/render/renderer/renderer/LightRenderer.cpp

@@ -33,7 +33,7 @@ void LightRenderer::Initialise(const String& globalDataAttributeName,
 
 void LightRenderer::Destroy()
 {
-    lightMaterial.~Material();
+    lightMaterial.Destroy();
     lightModel.DestroyModel();
 }
 

engine/render/renderer/renderer/ModelRenderer.cpp

@@ -22,8 +22,6 @@ void ModelRenderer::Initialise(const String& globalDataAttributeName,
     transformId = INTERN_STR("transforms");
 }
 
-void ModelRenderer::Destroy() {}
-
 void ModelRenderer::DrawModel(Model* model,
                               const Vec3& position,
                               const Vec3& scale,

engine/render/renderer/renderer/ModelRenderer.h

@@ -23,7 +23,6 @@ class ModelRenderer
     ~ModelRenderer();
 
     void Initialise(const String& globalDataAttributeName, const uint64_t& globalDataSize);
-    void Destroy();
 
     void DrawModel(Model* model, const Vec3& position, const Vec3& scale, const Vec3& rotation);