From 4d037e1250b5dbc5bca523778ab108a50b7ca124 Mon Sep 17 00:00:00 2001 From: Caleb Burke Date: Mon, 21 Sep 2026 01:15:58 -0700 Subject: [PATCH] moving stuff around --- engine/src/application.cpp | 8 ++++---- engine/src/rendering/imgui_renderer.hpp | 2 +- engine/src/rendering/model_render_system.hpp | 4 ++-- engine/src/rendering/render_context.cpp | 2 +- engine/src/rendering/render_context.hpp | 4 ++-- engine/src/rendering/render_graph.hpp | 4 ++-- engine/src/resources/mesh.hpp | 4 ++-- engine/src/resources/pools/render_target_pool.hpp | 2 +- engine/src/resources/render_target.hpp | 4 ++-- engine/src/resources/resource_registry.hpp | 2 +- engine/src/{rendering => vulkan}/access.cpp | 2 +- engine/src/{rendering => vulkan}/access.hpp | 0 engine/src/{ => vulkan}/buffer.cpp | 2 +- engine/src/{ => vulkan}/buffer.hpp | 2 +- engine/src/{ => vulkan}/descriptors/descriptor_pool.cpp | 0 engine/src/{ => vulkan}/descriptors/descriptor_pool.hpp | 2 +- .../{ => vulkan}/descriptors/descriptor_set_layout.cpp | 0 .../{ => vulkan}/descriptors/descriptor_set_layout.hpp | 2 +- engine/src/{ => vulkan}/descriptors/descriptor_writer.cpp | 0 engine/src/{ => vulkan}/descriptors/descriptor_writer.hpp | 2 +- engine/src/{ => vulkan}/device.cpp | 2 +- engine/src/{ => vulkan}/device.hpp | 0 engine/src/{ => vulkan}/image.cpp | 4 ++-- engine/src/{ => vulkan}/image.hpp | 2 +- engine/src/{ => vulkan}/pipelines/compute_pipeline.cpp | 0 engine/src/{ => vulkan}/pipelines/compute_pipeline.hpp | 4 ++-- engine/src/{ => vulkan}/pipelines/graphics_pipeline.cpp | 0 engine/src/{ => vulkan}/pipelines/graphics_pipeline.hpp | 4 ++-- engine/src/{ => vulkan}/pipelines/pipeline.cpp | 0 engine/src/{ => vulkan}/pipelines/pipeline.hpp | 2 +- engine/src/{ => vulkan}/shader.cpp | 2 +- engine/src/{ => vulkan}/shader.hpp | 0 engine/src/{ => vulkan}/swapchain.cpp | 2 +- engine/src/{ => vulkan}/swapchain.hpp | 4 ++-- 34 files changed, 37 insertions(+), 37 deletions(-) rename engine/src/{rendering => vulkan}/access.cpp (99%) rename engine/src/{rendering => vulkan}/access.hpp (100%) rename engine/src/{ => vulkan}/buffer.cpp (99%) rename engine/src/{ => vulkan}/buffer.hpp (98%) rename engine/src/{ => vulkan}/descriptors/descriptor_pool.cpp (100%) rename engine/src/{ => vulkan}/descriptors/descriptor_pool.hpp (97%) rename engine/src/{ => vulkan}/descriptors/descriptor_set_layout.cpp (100%) rename engine/src/{ => vulkan}/descriptors/descriptor_set_layout.hpp (97%) rename engine/src/{ => vulkan}/descriptors/descriptor_writer.cpp (100%) rename engine/src/{ => vulkan}/descriptors/descriptor_writer.hpp (95%) rename engine/src/{ => vulkan}/device.cpp (99%) rename engine/src/{ => vulkan}/device.hpp (100%) rename engine/src/{ => vulkan}/image.cpp (99%) rename engine/src/{ => vulkan}/image.hpp (99%) rename engine/src/{ => vulkan}/pipelines/compute_pipeline.cpp (100%) rename engine/src/{ => vulkan}/pipelines/compute_pipeline.hpp (92%) rename engine/src/{ => vulkan}/pipelines/graphics_pipeline.cpp (100%) rename engine/src/{ => vulkan}/pipelines/graphics_pipeline.hpp (98%) rename engine/src/{ => vulkan}/pipelines/pipeline.cpp (100%) rename engine/src/{ => vulkan}/pipelines/pipeline.hpp (95%) rename engine/src/{ => vulkan}/shader.cpp (99%) rename engine/src/{ => vulkan}/shader.hpp (100%) rename engine/src/{ => vulkan}/swapchain.cpp (99%) rename engine/src/{ => vulkan}/swapchain.hpp (97%) diff --git a/engine/src/application.cpp b/engine/src/application.cpp index 405c4d4..1fd3776 100644 --- a/engine/src/application.cpp +++ b/engine/src/application.cpp @@ -14,9 +14,6 @@ #include -#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 { diff --git a/engine/src/rendering/imgui_renderer.hpp b/engine/src/rendering/imgui_renderer.hpp index cfc79a1..5ee558a 100644 --- a/engine/src/rendering/imgui_renderer.hpp +++ b/engine/src/rendering/imgui_renderer.hpp @@ -7,8 +7,8 @@ #include #include -#include "device.hpp" #include "resources/resource_registry.hpp" +#include "vulkan/device.hpp" #include "window.hpp" namespace sophia { diff --git a/engine/src/rendering/model_render_system.hpp b/engine/src/rendering/model_render_system.hpp index 03b1b6d..b3d7470 100644 --- a/engine/src/rendering/model_render_system.hpp +++ b/engine/src/rendering/model_render_system.hpp @@ -4,10 +4,10 @@ #include #include -#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 { diff --git a/engine/src/rendering/render_context.cpp b/engine/src/rendering/render_context.cpp index 891f7f0..e57ace9 100644 --- a/engine/src/rendering/render_context.cpp +++ b/engine/src/rendering/render_context.cpp @@ -5,7 +5,7 @@ #include #include -#include "rendering/access.hpp" +#include "vulkan/access.hpp" namespace sophia { diff --git a/engine/src/rendering/render_context.hpp b/engine/src/rendering/render_context.hpp index afe4728..25001e1 100644 --- a/engine/src/rendering/render_context.hpp +++ b/engine/src/rendering/render_context.hpp @@ -6,8 +6,8 @@ #include #include -#include "device.hpp" -#include "swapchain.hpp" +#include "vulkan/device.hpp" +#include "vulkan/swapchain.hpp" #include "window.hpp" namespace sophia { diff --git a/engine/src/rendering/render_graph.hpp b/engine/src/rendering/render_graph.hpp index 17ce0fb..d7374e3 100644 --- a/engine/src/rendering/render_graph.hpp +++ b/engine/src/rendering/render_graph.hpp @@ -7,8 +7,8 @@ #include #include -#include "image.hpp" -#include "rendering/access.hpp" +#include "vulkan/access.hpp" +#include "vulkan/image.hpp" namespace sophia { diff --git a/engine/src/resources/mesh.hpp b/engine/src/resources/mesh.hpp index f25f7db..3c64513 100644 --- a/engine/src/resources/mesh.hpp +++ b/engine/src/resources/mesh.hpp @@ -9,8 +9,8 @@ #define GLM_FORCE_DEPTH_ZERO_TO_ONE #include -#include "buffer.hpp" -#include "device.hpp" +#include "vulkan/buffer.hpp" +#include "vulkan/device.hpp" namespace sophia { diff --git a/engine/src/resources/pools/render_target_pool.hpp b/engine/src/resources/pools/render_target_pool.hpp index d86d62a..7a8b870 100644 --- a/engine/src/resources/pools/render_target_pool.hpp +++ b/engine/src/resources/pools/render_target_pool.hpp @@ -3,8 +3,8 @@ #include #include -#include "device.hpp" #include "resources/render_target.hpp" +#include "vulkan/device.hpp" namespace sophia { diff --git a/engine/src/resources/render_target.hpp b/engine/src/resources/render_target.hpp index c73d4a1..fd4f4f8 100644 --- a/engine/src/resources/render_target.hpp +++ b/engine/src/resources/render_target.hpp @@ -5,8 +5,8 @@ #include #include -#include "device.hpp" -#include "image.hpp" +#include "vulkan/device.hpp" +#include "vulkan/image.hpp" namespace sophia { diff --git a/engine/src/resources/resource_registry.hpp b/engine/src/resources/resource_registry.hpp index 8e94a63..24882ef 100644 --- a/engine/src/resources/resource_registry.hpp +++ b/engine/src/resources/resource_registry.hpp @@ -3,9 +3,9 @@ #include #include -#include "device.hpp" #include "resources/mesh.hpp" #include "resources/pools/render_target_pool.hpp" +#include "vulkan/device.hpp" namespace sophia { diff --git a/engine/src/rendering/access.cpp b/engine/src/vulkan/access.cpp similarity index 99% rename from engine/src/rendering/access.cpp rename to engine/src/vulkan/access.cpp index 4dd417c..640e369 100644 --- a/engine/src/rendering/access.cpp +++ b/engine/src/vulkan/access.cpp @@ -1,4 +1,4 @@ -#include "rendering/access.hpp" +#include "vulkan/access.hpp" #include #include diff --git a/engine/src/rendering/access.hpp b/engine/src/vulkan/access.hpp similarity index 100% rename from engine/src/rendering/access.hpp rename to engine/src/vulkan/access.hpp diff --git a/engine/src/buffer.cpp b/engine/src/vulkan/buffer.cpp similarity index 99% rename from engine/src/buffer.cpp rename to engine/src/vulkan/buffer.cpp index 341c436..88428af 100644 --- a/engine/src/buffer.cpp +++ b/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 diff --git a/engine/src/buffer.hpp b/engine/src/vulkan/buffer.hpp similarity index 98% rename from engine/src/buffer.hpp rename to engine/src/vulkan/buffer.hpp index 7c313fa..2320ab4 100644 --- a/engine/src/buffer.hpp +++ b/engine/src/vulkan/buffer.hpp @@ -4,7 +4,7 @@ */ #pragma once -#include "device.hpp" +#include "vulkan/device.hpp" namespace sophia { diff --git a/engine/src/descriptors/descriptor_pool.cpp b/engine/src/vulkan/descriptors/descriptor_pool.cpp similarity index 100% rename from engine/src/descriptors/descriptor_pool.cpp rename to engine/src/vulkan/descriptors/descriptor_pool.cpp diff --git a/engine/src/descriptors/descriptor_pool.hpp b/engine/src/vulkan/descriptors/descriptor_pool.hpp similarity index 97% rename from engine/src/descriptors/descriptor_pool.hpp rename to engine/src/vulkan/descriptors/descriptor_pool.hpp index 78ee0c7..dcab1d2 100644 --- a/engine/src/descriptors/descriptor_pool.hpp +++ b/engine/src/vulkan/descriptors/descriptor_pool.hpp @@ -3,7 +3,7 @@ #include #include -#include "device.hpp" +#include "vulkan/device.hpp" namespace sophia { diff --git a/engine/src/descriptors/descriptor_set_layout.cpp b/engine/src/vulkan/descriptors/descriptor_set_layout.cpp similarity index 100% rename from engine/src/descriptors/descriptor_set_layout.cpp rename to engine/src/vulkan/descriptors/descriptor_set_layout.cpp diff --git a/engine/src/descriptors/descriptor_set_layout.hpp b/engine/src/vulkan/descriptors/descriptor_set_layout.hpp similarity index 97% rename from engine/src/descriptors/descriptor_set_layout.hpp rename to engine/src/vulkan/descriptors/descriptor_set_layout.hpp index ff75b55..b56d0da 100644 --- a/engine/src/descriptors/descriptor_set_layout.hpp +++ b/engine/src/vulkan/descriptors/descriptor_set_layout.hpp @@ -4,7 +4,7 @@ #include #include -#include "device.hpp" +#include "vulkan/device.hpp" namespace sophia { diff --git a/engine/src/descriptors/descriptor_writer.cpp b/engine/src/vulkan/descriptors/descriptor_writer.cpp similarity index 100% rename from engine/src/descriptors/descriptor_writer.cpp rename to engine/src/vulkan/descriptors/descriptor_writer.cpp diff --git a/engine/src/descriptors/descriptor_writer.hpp b/engine/src/vulkan/descriptors/descriptor_writer.hpp similarity index 95% rename from engine/src/descriptors/descriptor_writer.hpp rename to engine/src/vulkan/descriptors/descriptor_writer.hpp index 95effbb..47e53c8 100644 --- a/engine/src/descriptors/descriptor_writer.hpp +++ b/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 { diff --git a/engine/src/device.cpp b/engine/src/vulkan/device.cpp similarity index 99% rename from engine/src/device.cpp rename to engine/src/vulkan/device.cpp index e909b26..742f15b 100644 --- a/engine/src/device.cpp +++ b/engine/src/vulkan/device.cpp @@ -1,4 +1,4 @@ -#include "device.hpp" +#include "vulkan/device.hpp" #include diff --git a/engine/src/device.hpp b/engine/src/vulkan/device.hpp similarity index 100% rename from engine/src/device.hpp rename to engine/src/vulkan/device.hpp diff --git a/engine/src/image.cpp b/engine/src/vulkan/image.cpp similarity index 99% rename from engine/src/image.cpp rename to engine/src/vulkan/image.cpp index a54f08b..5ea66c1 100644 --- a/engine/src/image.cpp +++ b/engine/src/vulkan/image.cpp @@ -1,10 +1,10 @@ -#include "image.hpp" +#include "vulkan/image.hpp" #include #include #include -#include "device.hpp" +#include "vulkan/device.hpp" namespace sophia { diff --git a/engine/src/image.hpp b/engine/src/vulkan/image.hpp similarity index 99% rename from engine/src/image.hpp rename to engine/src/vulkan/image.hpp index af62af7..5f8647f 100644 --- a/engine/src/image.hpp +++ b/engine/src/vulkan/image.hpp @@ -4,7 +4,7 @@ #include #include -#include "rendering/access.hpp" +#include "vulkan/access.hpp" namespace sophia { diff --git a/engine/src/pipelines/compute_pipeline.cpp b/engine/src/vulkan/pipelines/compute_pipeline.cpp similarity index 100% rename from engine/src/pipelines/compute_pipeline.cpp rename to engine/src/vulkan/pipelines/compute_pipeline.cpp diff --git a/engine/src/pipelines/compute_pipeline.hpp b/engine/src/vulkan/pipelines/compute_pipeline.hpp similarity index 92% rename from engine/src/pipelines/compute_pipeline.hpp rename to engine/src/vulkan/pipelines/compute_pipeline.hpp index 74e5e90..e8f7f43 100644 --- a/engine/src/pipelines/compute_pipeline.hpp +++ b/engine/src/vulkan/pipelines/compute_pipeline.hpp @@ -3,9 +3,9 @@ #include #include -#include "device.hpp" #include "pipeline.hpp" -#include "shader.hpp" +#include "vulkan/device.hpp" +#include "vulkan/shader.hpp" namespace sophia { diff --git a/engine/src/pipelines/graphics_pipeline.cpp b/engine/src/vulkan/pipelines/graphics_pipeline.cpp similarity index 100% rename from engine/src/pipelines/graphics_pipeline.cpp rename to engine/src/vulkan/pipelines/graphics_pipeline.cpp diff --git a/engine/src/pipelines/graphics_pipeline.hpp b/engine/src/vulkan/pipelines/graphics_pipeline.hpp similarity index 98% rename from engine/src/pipelines/graphics_pipeline.hpp rename to engine/src/vulkan/pipelines/graphics_pipeline.hpp index 600253c..2a77943 100644 --- a/engine/src/pipelines/graphics_pipeline.hpp +++ b/engine/src/vulkan/pipelines/graphics_pipeline.hpp @@ -6,9 +6,9 @@ #include #include -#include "device.hpp" #include "pipeline.hpp" -#include "shader.hpp" +#include "vulkan/device.hpp" +#include "vulkan/shader.hpp" namespace sophia { diff --git a/engine/src/pipelines/pipeline.cpp b/engine/src/vulkan/pipelines/pipeline.cpp similarity index 100% rename from engine/src/pipelines/pipeline.cpp rename to engine/src/vulkan/pipelines/pipeline.cpp diff --git a/engine/src/pipelines/pipeline.hpp b/engine/src/vulkan/pipelines/pipeline.hpp similarity index 95% rename from engine/src/pipelines/pipeline.hpp rename to engine/src/vulkan/pipelines/pipeline.hpp index 92b44fb..28f0b0d 100644 --- a/engine/src/pipelines/pipeline.hpp +++ b/engine/src/vulkan/pipelines/pipeline.hpp @@ -4,7 +4,7 @@ #include #include -#include "device.hpp" +#include "vulkan/device.hpp" namespace sophia { diff --git a/engine/src/shader.cpp b/engine/src/vulkan/shader.cpp similarity index 99% rename from engine/src/shader.cpp rename to engine/src/vulkan/shader.cpp index a75b6bc..e0de91b 100644 --- a/engine/src/shader.cpp +++ b/engine/src/vulkan/shader.cpp @@ -1,4 +1,4 @@ -#include "shader.hpp" +#include "vulkan/shader.hpp" #include #include diff --git a/engine/src/shader.hpp b/engine/src/vulkan/shader.hpp similarity index 100% rename from engine/src/shader.hpp rename to engine/src/vulkan/shader.hpp diff --git a/engine/src/swapchain.cpp b/engine/src/vulkan/swapchain.cpp similarity index 99% rename from engine/src/swapchain.cpp rename to engine/src/vulkan/swapchain.cpp index ed07c2e..67744d9 100644 --- a/engine/src/swapchain.cpp +++ b/engine/src/vulkan/swapchain.cpp @@ -1,4 +1,4 @@ -#include "swapchain.hpp" +#include "vulkan/swapchain.hpp" #include #include diff --git a/engine/src/swapchain.hpp b/engine/src/vulkan/swapchain.hpp similarity index 97% rename from engine/src/swapchain.hpp rename to engine/src/vulkan/swapchain.hpp index 0422aec..1a8b558 100644 --- a/engine/src/swapchain.hpp +++ b/engine/src/vulkan/swapchain.hpp @@ -5,8 +5,8 @@ #include #include -#include "device.hpp" -#include "image.hpp" +#include "vulkan/device.hpp" +#include "vulkan/image.hpp" namespace sophia {