engine/src/application.cpp

@@ -14,9 +14,6 @@
 
 #include <glm/glm.hpp>
 
-#include "buffer.hpp"
-#include "device.hpp"
-#include "pipelines/graphics_pipeline.hpp"
 #include "rendering/imgui_renderer.hpp"
 #include "rendering/model_render_system.hpp"
 #include "rendering/render_context.hpp"
@@ -24,7 +21,10 @@
 #include "resources/mesh.hpp"
 #include "resources/render_target.hpp"
 #include "resources/resource_registry.hpp"
-#include "shader.hpp"
+#include "vulkan/buffer.hpp"
+#include "vulkan/device.hpp"
+#include "vulkan/pipelines/graphics_pipeline.hpp"
+#include "vulkan/shader.hpp"
 #include "window.hpp"
 
 namespace sophia {

engine/src/rendering/imgui_renderer.hpp

@@ -7,8 +7,8 @@
 #include <sophia/ui/dock_layout.hpp>
 #include <unordered_map>
 
-#include "device.hpp"
 #include "resources/resource_registry.hpp"
+#include "vulkan/device.hpp"
 #include "window.hpp"
 
 namespace sophia {

engine/src/rendering/model_render_system.hpp

@@ -4,10 +4,10 @@
 #include <sophia/frame_info.hpp>
 #include <span>
 
-#include "device.hpp"
-#include "pipelines/graphics_pipeline.hpp"
 #include "rendering/render_context.hpp"
 #include "resources/mesh.hpp"
+#include "vulkan/device.hpp"
+#include "vulkan/pipelines/graphics_pipeline.hpp"
 
 namespace sophia {
 

engine/src/rendering/render_context.cpp

@@ -5,7 +5,7 @@
 #include <sophia/util/logger.hpp>
 #include <stdexcept>
 
-#include "rendering/access.hpp"
+#include "vulkan/access.hpp"
 
 namespace sophia {
 

engine/src/rendering/render_context.hpp

@@ -6,8 +6,8 @@
 #include <vector>
 #include <vulkan/vulkan.hpp>
 
-#include "device.hpp"
+#include "vulkan/device.hpp"
-#include "swapchain.hpp"
+#include "vulkan/swapchain.hpp"
 #include "window.hpp"
 
 namespace sophia {

engine/src/rendering/render_graph.hpp

@@ -7,8 +7,8 @@
 #include <vector>
 #include <vulkan/vulkan.hpp>
 
-#include "image.hpp"
+#include "vulkan/access.hpp"
-#include "rendering/access.hpp"
+#include "vulkan/image.hpp"
 
 namespace sophia {
 

engine/src/resources/mesh.hpp

@@ -9,8 +9,8 @@
 #define GLM_FORCE_DEPTH_ZERO_TO_ONE
 #include <glm/glm.hpp>
 
-#include "buffer.hpp"
+#include "vulkan/buffer.hpp"
-#include "device.hpp"
+#include "vulkan/device.hpp"
 
 namespace sophia {
 

engine/src/resources/pools/render_target_pool.hpp

@@ -3,8 +3,8 @@
 #include <sophia/handles.hpp>
 #include <sophia/util/pool.hpp>
 
-#include "device.hpp"
 #include "resources/render_target.hpp"
+#include "vulkan/device.hpp"
 
 namespace sophia {
 

engine/src/resources/render_target.hpp

@@ -5,8 +5,8 @@
 #include <sophia/types.hpp>
 #include <vulkan/vulkan.hpp>
 
-#include "device.hpp"
+#include "vulkan/device.hpp"
-#include "image.hpp"
+#include "vulkan/image.hpp"
 
 namespace sophia {
 

engine/src/resources/resource_registry.hpp

@@ -3,9 +3,9 @@
 #include <sophia/handles.hpp>
 #include <sophia/util/pool.hpp>
 
-#include "device.hpp"
 #include "resources/mesh.hpp"
 #include "resources/pools/render_target_pool.hpp"
+#include "vulkan/device.hpp"
 
 namespace sophia {
 

engine/src/vulkan/access.cpp

@@ -1,4 +1,4 @@
-#include "rendering/access.hpp"
+#include "vulkan/access.hpp"
 
 #include <array>
 #include <sophia/util/logger.hpp>

engine/src/vulkan/buffer.cpp

@@ -2,7 +2,7 @@
  * Based on
  * https://github.com/blurrypiano/littleVulkanEngine/blob/main/src/lve_buffer.cpp
  */
-#include "buffer.hpp"
+#include "vulkan/buffer.hpp"
 
 #include <sophia/util/assert.hpp>
 

engine/src/vulkan/buffer.hpp

@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#include "device.hpp"
+#include "vulkan/device.hpp"
 
 namespace sophia {
 

engine/src/vulkan/descriptors/descriptor_pool.hpp

@@ -3,7 +3,7 @@
 #include <memory>
 #include <vector>
 
-#include "device.hpp"
+#include "vulkan/device.hpp"
 
 namespace sophia {
 

engine/src/vulkan/descriptors/descriptor_set_layout.hpp

@@ -4,7 +4,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "device.hpp"
+#include "vulkan/device.hpp"
 
 namespace sophia {
 

engine/src/vulkan/descriptors/descriptor_writer.hpp

@@ -4,7 +4,7 @@
 
 #include "descriptor_pool.hpp"
 #include "descriptor_set_layout.hpp"
-#include "device.hpp"
+#include "vulkan/device.hpp"
 
 namespace sophia {
 

engine/src/vulkan/device.cpp

@@ -1,4 +1,4 @@
-#include "device.hpp"
+#include "vulkan/device.hpp"
 
 #include <string.h>
 

engine/src/vulkan/image.cpp

@@ -1,10 +1,10 @@
-#include "image.hpp"
+#include "vulkan/image.hpp"
 
 #include <cstring>
 #include <sophia/util/logger.hpp>
 #include <stdexcept>
 
-#include "device.hpp"
+#include "vulkan/device.hpp"
 
 namespace sophia {
 

engine/src/vulkan/image.hpp

@@ -4,7 +4,7 @@
 #include <sophia/types.hpp>
 #include <vulkan/vulkan.hpp>
 
-#include "rendering/access.hpp"
+#include "vulkan/access.hpp"
 
 namespace sophia {
 

engine/src/vulkan/pipelines/compute_pipeline.hpp

@@ -3,9 +3,9 @@
 #include <memory>
 #include <vulkan/vulkan.hpp>
 
-#include "device.hpp"
 #include "pipeline.hpp"
-#include "shader.hpp"
+#include "vulkan/device.hpp"
+#include "vulkan/shader.hpp"
 
 namespace sophia {
 

engine/src/vulkan/pipelines/graphics_pipeline.hpp

@@ -6,9 +6,9 @@
 #include <vector>
 #include <vulkan/vulkan.hpp>
 
-#include "device.hpp"
 #include "pipeline.hpp"
-#include "shader.hpp"
+#include "vulkan/device.hpp"
+#include "vulkan/shader.hpp"
 
 namespace sophia {
 

engine/src/vulkan/pipelines/pipeline.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 #include <vulkan/vulkan.hpp>
 
-#include "device.hpp"
+#include "vulkan/device.hpp"
 
 namespace sophia {
 

engine/src/vulkan/shader.cpp

@@ -1,4 +1,4 @@
-#include "shader.hpp"
+#include "vulkan/shader.hpp"
 
 #include <fstream>
 #include <shaderc/shaderc.hpp>

engine/src/vulkan/swapchain.cpp

@@ -1,4 +1,4 @@
-#include "swapchain.hpp"
+#include "vulkan/swapchain.hpp"
 
 #include <algorithm>
 #include <limits>

engine/src/vulkan/swapchain.hpp

@@ -5,8 +5,8 @@
 #include <vector>
 #include <vulkan/vulkan.hpp>
 
-#include "device.hpp"
+#include "vulkan/device.hpp"
-#include "image.hpp"
+#include "vulkan/image.hpp"
 
 namespace sophia {