[*] Use new buffer wrapper

include/inexor/vulkan-renderer/renderer.hpp

@@ -6,8 +6,8 @@
 #include "inexor/vulkan-renderer/octree_gpu_vertex.hpp"
 #include "inexor/vulkan-renderer/time_step.hpp"
 #include "inexor/vulkan-renderer/vk_tools/gpu_info.hpp"
+#include "inexor/vulkan-renderer/wrapper/buffer.hpp"
 #include "inexor/vulkan-renderer/wrapper/instance.hpp"
-#include "inexor/vulkan-renderer/wrapper/uniform_buffer.hpp"
 #include "inexor/vulkan-renderer/wrapper/window.hpp"
 #include "inexor/vulkan-renderer/wrapper/window_surface.hpp"
 
@@ -45,7 +45,7 @@ class VulkanRenderer {
 
     std::vector<wrapper::Shader> m_shaders;
     std::vector<wrapper::GpuTexture> m_textures;
-    std::vector<wrapper::UniformBuffer> m_uniform_buffers;
+    std::vector<wrapper::Buffer> m_uniform_buffers;
     std::vector<wrapper::ResourceDescriptor> m_descriptors;
     std::vector<OctreeGpuVertex> m_octree_vertices;
     std::vector<std::uint32_t> m_octree_indices;

include/inexor/vulkan-renderer/wrapper/command_buffer.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
+#include "inexor/vulkan-renderer/wrapper/buffer.hpp"
 #include "inexor/vulkan-renderer/wrapper/fence.hpp"
-#include "inexor/vulkan-renderer/wrapper/gpu_memory_buffer.hpp"
 
 #include <cassert>
 #include <memory>
@@ -29,7 +29,7 @@ class CommandBuffer {
     /// @note We are not recycling staging buffers. Once they are used and the command buffer handle has reached the end
     /// of its lifetime, the staging bufers will be cleared. We trust Vulkan Memory Allocator (VMA) in managing the
     /// memory for staging buffers.
-    mutable std::vector<GPUMemoryBuffer> m_staging_bufs;
+    mutable std::vector<Buffer> m_staging_bufs;
 
     friend class CommandPool;
 
@@ -50,8 +50,8 @@ class CommandBuffer {
         assert(!name.empty());
 
         // Create a staging buffer for the copy operation and keep it until the CommandBuffer exceeds its lifetime
-        m_staging_bufs.emplace_back(m_device, name, data_size, data, data_size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
-                                    VMA_MEMORY_USAGE_CPU_ONLY);
+        m_staging_bufs.emplace_back(m_device, data_size, data, VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
+                                    VMA_MEMORY_USAGE_CPU_ONLY, name);
 
         return m_staging_bufs.back().buffer();
     }

include/inexor/vulkan-renderer/wrapper/gpu_texture.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
+#include "inexor/vulkan-renderer/wrapper/buffer.hpp"
 #include "inexor/vulkan-renderer/wrapper/cpu_texture.hpp"
 #include "inexor/vulkan-renderer/wrapper/device.hpp"
-#include "inexor/vulkan-renderer/wrapper/gpu_memory_buffer.hpp"
 #include "inexor/vulkan-renderer/wrapper/image.hpp"
 #include "inexor/vulkan-renderer/wrapper/sampler.hpp"
 

src/CMakeLists.txt

@@ -22,6 +22,7 @@ set(INEXOR_SOURCE_FILES
     vulkan-renderer/vk_tools/gpu_info.cpp
     vulkan-renderer/vk_tools/representation.cpp
 
+    vulkan-renderer/wrapper/buffer.cpp
     vulkan-renderer/wrapper/command_buffer.cpp
     vulkan-renderer/wrapper/command_pool.cpp
     vulkan-renderer/wrapper/cpu_texture.cpp
@@ -30,7 +31,6 @@ set(INEXOR_SOURCE_FILES
     vulkan-renderer/wrapper/device.cpp
     vulkan-renderer/wrapper/fence.cpp
     vulkan-renderer/wrapper/framebuffer.cpp
-    vulkan-renderer/wrapper/gpu_memory_buffer.cpp
     vulkan-renderer/wrapper/gpu_texture.cpp
     vulkan-renderer/wrapper/image.cpp
     vulkan-renderer/wrapper/instance.cpp
@@ -41,7 +41,6 @@ set(INEXOR_SOURCE_FILES
     vulkan-renderer/wrapper/semaphore.cpp
     vulkan-renderer/wrapper/shader.cpp
     vulkan-renderer/wrapper/swapchain.cpp
-    vulkan-renderer/wrapper/uniform_buffer.cpp
     vulkan-renderer/wrapper/window.cpp
     vulkan-renderer/wrapper/window_surface.cpp
 

src/vulkan-renderer/application.cpp

@@ -493,7 +493,8 @@ Application::Application(int argc, char **argv) {
     load_textures();
     load_shaders();
 
-    m_uniform_buffers.emplace_back(*m_device, "matrices uniform buffer", sizeof(UniformBufferObject));
+    m_uniform_buffers.emplace_back(*m_device, sizeof(UniformBufferObject), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
+                                   VMA_MEMORY_USAGE_CPU_TO_GPU, "matrices uniform buffer");
 
     // Create an instance of the resource descriptor builder.
     // This allows us to make resource descriptors with the help of a builder pattern.
@@ -520,7 +521,7 @@ void Application::update_uniform_buffers() {
     ubo.proj[1][1] *= -1;
 
     // TODO: Embed this into the render graph.
-    m_uniform_buffers[0].update(&ubo, sizeof(ubo));
+    std::memcpy(m_uniform_buffers[0].memory(), &ubo, sizeof(ubo));
 }
 
 void Application::update_imgui_overlay() {