[*] Move wrapper code for command buffers and command pools into subfolder

Author: IAmNotHanni

include/inexor/vulkan-renderer/render_graph.hpp

@@ -16,19 +16,26 @@
 // TODO: Compute stages.
 // TODO: Uniform buffers.
 
-// Forward declarations
 namespace inexor::vulkan_renderer::wrapper {
-class CommandBuffer;
+// Forward declaration
 class Shader;
 }; // namespace inexor::vulkan_renderer::wrapper
 
+namespace inexor::vulkan_renderer::wrapper::commands {
+// Forward declaration
+class CommandBuffer;
+} // namespace inexor::vulkan_renderer::wrapper::commands
+
 namespace inexor::vulkan_renderer {
 
 // Forward declarations
 class PhysicalResource;
 class PhysicalStage;
 class RenderGraph;
 
+// Using declaration
+using wrapper::commands::CommandBuffer;
+
 /// @brief Base class of all render graph objects (resources and stages).
 /// @note This is just for internal use.
 struct RenderGraphObject {
@@ -167,7 +174,7 @@ class RenderStage : public RenderGraphObject {
 
     std::vector<VkDescriptorSetLayout> m_descriptor_layouts;
     std::vector<VkPushConstantRange> m_push_constant_ranges;
-    std::function<void(const PhysicalStage &, const wrapper::CommandBuffer &)> m_on_record{[](auto &, auto &) {}};
+    std::function<void(const PhysicalStage &, const CommandBuffer &)> m_on_record{[](auto &, auto &) {}};
 
 protected:
     explicit RenderStage(std::string name) : m_name(std::move(name)) {}
@@ -393,7 +400,7 @@ class RenderGraph {
 
     // Functions for building stage related vulkan objects.
     void build_pipeline_layout(const RenderStage *, PhysicalStage &) const;
-    void record_command_buffer(const RenderStage *, const wrapper::CommandBuffer &cmd_buf,
+    void record_command_buffer(const RenderStage *, const wrapper::commands::CommandBuffer &cmd_buf,
                                std::uint32_t image_index) const;
 
     // Functions for building graphics stage related vulkan objects.
@@ -427,7 +434,7 @@ class RenderGraph {
     /// @brief Submits the command frame's command buffers for drawing.
     /// @param image_index The current image index, retrieved from Swapchain::acquire_next_image
     /// @param cmd_buf The command buffer
-    void render(std::uint32_t image_index, const wrapper::CommandBuffer &cmd_buf);
+    void render(std::uint32_t image_index, const wrapper::commands::CommandBuffer &cmd_buf);
 };
 
 template <typename T>

…lkan-renderer/wrapper/command_buffer.hpp …erer/wrapper/commands/command_buffer.hppinclude/inexor/vulkan-renderer/wrapper/command_buffer.hpp renamed to include/inexor/vulkan-renderer/wrapper/commands/command_buffer.hpp include/inexor/vulkan-renderer/wrapper/command_buffer.hpp renamed to include/inexor/vulkan-renderer/wrapper/commands/command_buffer.hpp

@@ -9,9 +9,15 @@
 #include <vector>
 
 namespace inexor::vulkan_renderer::wrapper {
-
 // Forward declaration
-class Device;
+class wrapper::Device;
+} // namespace inexor::vulkan_renderer::wrapper
+
+namespace inexor::vulkan_renderer::wrapper::commands {
+
+// Using declarations
+using wrapper::Device;
+using wrapper::Fence;
 
 /// @brief RAII wrapper class for VkCommandBuffer.
 /// @todo Make trivially copyable (this class doesn't really "own" the command buffer, more just an OOP wrapper).
@@ -364,4 +370,4 @@ class CommandBuffer {
     const CommandBuffer &submit_and_wait() const; // NOLINT
 };
 
-} // namespace inexor::vulkan_renderer::wrapper
+} // namespace inexor::vulkan_renderer::wrapper::commands

…vulkan-renderer/wrapper/command_pool.hpp …nderer/wrapper/commands/command_pool.hppinclude/inexor/vulkan-renderer/wrapper/command_pool.hpp renamed to include/inexor/vulkan-renderer/wrapper/commands/command_pool.hpp include/inexor/vulkan-renderer/wrapper/command_pool.hpp renamed to include/inexor/vulkan-renderer/wrapper/commands/command_pool.hpp

@@ -3,14 +3,16 @@
 #include <spdlog/spdlog.h>
 #include <volk.h>
 
-#include "inexor/vulkan-renderer/wrapper/command_buffer.hpp"
+#include "inexor/vulkan-renderer/wrapper/commands/command_buffer.hpp"
 
 #include <cassert>
 
 namespace inexor::vulkan_renderer::wrapper {
-
 // Forward declaration
 class Device;
+} // namespace inexor::vulkan_renderer::wrapper
+
+namespace inexor::vulkan_renderer::wrapper::commands {
 
 /// @brief RAII wrapper class for VkCommandPool.
 class CommandPool {
@@ -49,4 +51,4 @@ class CommandPool {
     [[nodiscard]] const CommandBuffer &request_command_buffer(const std::string &name);
 };
 
-} // namespace inexor::vulkan_renderer::wrapper
+} // namespace inexor::vulkan_renderer::wrapper::commands

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

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "inexor/vulkan-renderer/wrapper/command_pool.hpp"
+#include "inexor/vulkan-renderer/wrapper/commands/command_pool.hpp"
 
 #include <array>
 #include <functional>
@@ -13,6 +13,9 @@ namespace inexor::vulkan_renderer::wrapper {
 // Forward declaration
 class Instance;
 
+using wrapper::commands::CommandBuffer;
+using wrapper::commands::CommandPool;
+
 /// A wrapper struct for physical device data
 struct DeviceInfo {
     std::string name;

src/CMakeLists.txt

@@ -21,8 +21,6 @@ set(INEXOR_SOURCE_FILES
     vulkan-renderer/tools/file.cpp
     vulkan-renderer/tools/representation.cpp
 
-    vulkan-renderer/wrapper/command_buffer.cpp
-    vulkan-renderer/wrapper/command_pool.cpp
     vulkan-renderer/wrapper/cpu_texture.cpp
     vulkan-renderer/wrapper/descriptor.cpp
     vulkan-renderer/wrapper/descriptor_builder.cpp
@@ -39,6 +37,9 @@ set(INEXOR_SOURCE_FILES
     vulkan-renderer/wrapper/swapchain.cpp
     vulkan-renderer/wrapper/uniform_buffer.cpp
 
+    vulkan-renderer/wrapper/commands/command_buffer.cpp
+    vulkan-renderer/wrapper/commands/command_pool.cpp
+
     vulkan-renderer/wrapper/window/window.cpp
     vulkan-renderer/wrapper/window/surface.cpp
 

src/vulkan-renderer/imgui.cpp

@@ -164,7 +164,7 @@ void ImGUIOverlay::update() {
         return;
     }
 
-    m_stage->set_on_record([this](const PhysicalStage &physical, const wrapper::CommandBuffer &cmd_buf) {
+    m_stage->set_on_record([this](const PhysicalStage &physical, const wrapper::commands::CommandBuffer &cmd_buf) {
         ImDrawData *imgui_draw_data = ImGui::GetDrawData();
         if (imgui_draw_data == nullptr) {
             return;

src/vulkan-renderer/render_graph.cpp

@@ -1,7 +1,7 @@
 #include "inexor/vulkan-renderer/render_graph.hpp"
 
 #include "inexor/vulkan-renderer/exception.hpp"
-#include "inexor/vulkan-renderer/wrapper/command_buffer.hpp"
+#include "inexor/vulkan-renderer/wrapper/commands/command_buffer.hpp"
 #include "inexor/vulkan-renderer/wrapper/make_info.hpp"
 #include "inexor/vulkan-renderer/wrapper/shader.hpp"
 
@@ -167,7 +167,7 @@ void RenderGraph::build_pipeline_layout(const RenderStage *stage, PhysicalStage
     }
 }
 
-void RenderGraph::record_command_buffer(const RenderStage *stage, const wrapper::CommandBuffer &cmd_buf,
+void RenderGraph::record_command_buffer(const RenderStage *stage, const wrapper::commands::CommandBuffer &cmd_buf,
                                         const std::uint32_t image_index) const {
     const PhysicalStage &physical = *stage->m_physical;
 
@@ -528,7 +528,7 @@ void RenderGraph::compile(const RenderResource *target) {
     }
 }
 
-void RenderGraph::render(const std::uint32_t image_index, const wrapper::CommandBuffer &cmd_buf) {
+void RenderGraph::render(const std::uint32_t image_index, const wrapper::commands::CommandBuffer &cmd_buf) {
     // Update dynamic buffers.
     for (auto &buffer_resource : m_buffer_resources) {
         if (buffer_resource->m_data_upload_needed) {

src/vulkan-renderer/renderer.cpp

@@ -29,7 +29,7 @@ void VulkanRenderer::setup_render_graph() {
     main_stage->bind_buffer(m_vertex_buffer, 0);
     main_stage->set_clears_screen(true);
     main_stage->set_depth_options(true, true);
-    main_stage->set_on_record([&](const PhysicalStage &physical, const wrapper::CommandBuffer &cmd_buf) {
+    main_stage->set_on_record([&](const PhysicalStage &physical, const wrapper::commands::CommandBuffer &cmd_buf) {
         cmd_buf.bind_descriptor_sets(m_descriptors[0].descriptor_sets(), physical.pipeline_layout());
         cmd_buf.draw_indexed(static_cast<std::uint32_t>(m_octree_indices.size()));
     });

…lkan-renderer/wrapper/command_buffer.cpp …erer/wrapper/commands/command_buffer.cppsrc/vulkan-renderer/wrapper/command_buffer.cpp renamed to src/vulkan-renderer/wrapper/commands/command_buffer.cpp src/vulkan-renderer/wrapper/command_buffer.cpp renamed to src/vulkan-renderer/wrapper/commands/command_buffer.cpp

@@ -1,4 +1,4 @@
-#include "inexor/vulkan-renderer/wrapper/command_buffer.hpp"
+#include "inexor/vulkan-renderer/wrapper/commands/command_buffer.hpp"
 
 #include "inexor/vulkan-renderer/exception.hpp"
 #include "inexor/vulkan-renderer/wrapper/device.hpp"
@@ -8,7 +8,7 @@
 #include <memory>
 #include <utility>
 
-namespace inexor::vulkan_renderer::wrapper {
+namespace inexor::vulkan_renderer::wrapper::commands {
 
 CommandBuffer::CommandBuffer(const Device &device, const VkCommandPool cmd_pool, std::string name)
     : m_device(device), m_name(std::move(name)) {
@@ -325,4 +325,4 @@ const CommandBuffer &CommandBuffer::submit_and_wait() const {
     }));
 }
 
-} // namespace inexor::vulkan_renderer::wrapper
+} // namespace inexor::vulkan_renderer::wrapper::commands

…vulkan-renderer/wrapper/command_pool.cpp …nderer/wrapper/commands/command_pool.cppsrc/vulkan-renderer/wrapper/command_pool.cpp renamed to src/vulkan-renderer/wrapper/commands/command_pool.cpp src/vulkan-renderer/wrapper/command_pool.cpp renamed to src/vulkan-renderer/wrapper/commands/command_pool.cpp

@@ -1,4 +1,4 @@
-#include "inexor/vulkan-renderer/wrapper/command_pool.hpp"
+#include "inexor/vulkan-renderer/wrapper/commands/command_pool.hpp"
 
 #include "inexor/vulkan-renderer/exception.hpp"
 #include "inexor/vulkan-renderer/wrapper/device.hpp"
@@ -8,7 +8,7 @@
 
 #include <thread>
 
-namespace inexor::vulkan_renderer::wrapper {
+namespace inexor::vulkan_renderer::wrapper::commands {
 
 CommandPool::CommandPool(const Device &device, std::string name) : m_device(device), m_name(std::move(name)) {
     const auto cmd_pool_ci = make_info<VkCommandPoolCreateInfo>({
@@ -56,4 +56,4 @@ const CommandBuffer &CommandPool::request_command_buffer(const std::string &name
     return *m_cmd_bufs.back();
 }
 
-} // namespace inexor::vulkan_renderer::wrapper
+} // namespace inexor::vulkan_renderer::wrapper::commands