EDIT: folder structure refactoring

src/CMakeLists.txt

@@ -45,35 +45,36 @@ add_executable (vulkan_engine
   core/ibl_manager.h
   core/ibl_manager.cpp
   # render
-  render/vk_pipelines.h
-  render/vk_pipelines.cpp
-  render/vk_renderpass.h
-  render/vk_renderpass.cpp
-  render/vk_renderpass_background.h
-  render/vk_renderpass_background.cpp
-  render/vk_renderpass_geometry.h
-  render/vk_renderpass_geometry.cpp
-  render/vk_renderpass_lighting.h
-  render/vk_renderpass_lighting.cpp
-  render/vk_renderpass_shadow.h
-  render/vk_renderpass_shadow.cpp
-  render/vk_renderpass_transparent.h
-  render/vk_renderpass_transparent.cpp
-  render/vk_renderpass_imgui.h
-  render/vk_renderpass_imgui.cpp
-  render/vk_renderpass_tonemap.h
-  render/vk_renderpass_tonemap.cpp
-  # render graph (initial skeleton)
-  render/rg_types.h
-  render/rg_graph.h
-  render/rg_graph.cpp
-  render/rg_builder.h
-  render/rg_builder.cpp
-  render/rg_resources.h
-  render/rg_resources.cpp
-  render/vk_materials.h
-  render/vk_materials.cpp
+  render/pipelines.h
+  render/pipelines.cpp
+  render/renderpass.h
+  render/renderpass.cpp
+  render/materials.h
+  render/materials.cpp
   render/primitives.h
+  # render passes
+  render/passes/background.h
+  render/passes/background.cpp
+  render/passes/geometry.h
+  render/passes/geometry.cpp
+  render/passes/lighting.h
+  render/passes/lighting.cpp
+  render/passes/shadow.h
+  render/passes/shadow.cpp
+  render/passes/transparent.h
+  render/passes/transparent.cpp
+  render/passes/imgui_pass.h
+  render/passes/imgui_pass.cpp
+  render/passes/tonemap.h
+  render/passes/tonemap.cpp
+  # render graph
+  render/graph/types.h
+  render/graph/graph.h
+  render/graph/graph.cpp
+  render/graph/builder.h
+  render/graph/builder.cpp
+  render/graph/resources.h
+  render/graph/resources.cpp
   # scene
   scene/vk_scene.h
   scene/vk_scene.cpp
@@ -93,10 +94,12 @@ add_executable (vulkan_engine
 
 set_property(TARGET vulkan_engine PROPERTY CXX_STANDARD 20)
 target_compile_definitions(vulkan_engine PUBLIC GLM_FORCE_DEPTH_ZERO_TO_ONE)
-target_include_directories(vulkan_engine PUBLIC 
+target_include_directories(vulkan_engine PUBLIC
   "${CMAKE_CURRENT_SOURCE_DIR}"
   "${CMAKE_CURRENT_SOURCE_DIR}/core"
   "${CMAKE_CURRENT_SOURCE_DIR}/render"
+  "${CMAKE_CURRENT_SOURCE_DIR}/render/passes"
+  "${CMAKE_CURRENT_SOURCE_DIR}/render/graph"
   "${CMAKE_CURRENT_SOURCE_DIR}/scene"
   "${CMAKE_CURRENT_SOURCE_DIR}/compute"
 )

src/compute/vk_compute.cpp

@@ -1,6 +1,6 @@
 #include <compute/vk_compute.h>
 #include <core/engine_context.h>
-#include <render/vk_pipelines.h>
+#include <render/pipelines.h>
 #include <core/vk_initializers.h>
 #include <iostream>
 

src/core/asset_manager.cpp

@@ -5,7 +5,7 @@
 
 #include <core/vk_engine.h>
 #include <core/vk_resource.h>
-#include <render/vk_materials.h>
+#include <render/materials.h>
 #include <render/primitives.h>
 #include <scene/tangent_space.h>
 #include <scene/mesh_bvh.h>

src/core/asset_manager.h

@@ -12,7 +12,7 @@
 #include <scene/vk_loader.h>
 #include <core/vk_types.h>
 
-#include "vk_materials.h"
+#include "materials.h"
 #include "asset_locator.h"
 
 class VulkanEngine;

src/core/vk_engine.cpp

@@ -37,12 +37,12 @@
 #include "imgui.h"
 #include "imgui_impl_sdl2.h"
 #include "imgui_impl_vulkan.h"
-#include "render/vk_renderpass_geometry.h"
-#include "render/vk_renderpass_imgui.h"
-#include "render/vk_renderpass_lighting.h"
-#include "render/vk_renderpass_transparent.h"
-#include "render/vk_renderpass_tonemap.h"
-#include "render/vk_renderpass_shadow.h"
+#include "render/passes/geometry.h"
+#include "render/passes/imgui_pass.h"
+#include "render/passes/lighting.h"
+#include "render/passes/transparent.h"
+#include "render/passes/tonemap.h"
+#include "render/passes/shadow.h"
 #include "vk_resource.h"
 #include "engine_context.h"
 #include "core/vk_pipeline_manager.h"

src/core/vk_engine.h

@@ -16,12 +16,12 @@
 #include <scene/camera.h>
 
 #include "vk_device.h"
-#include "render/vk_renderpass.h"
-#include "render/vk_renderpass_background.h"
+#include "render/renderpass.h"
+#include "render/passes/background.h"
 #include "vk_resource.h"
 #include "vk_swapchain.h"
 #include "scene/vk_scene.h"
-#include "render/vk_materials.h"
+#include "render/materials.h"
 
 #include "frame_resources.h"
 #include "vk_descriptor_manager.h"
@@ -29,7 +29,7 @@
 #include "core/engine_context.h"
 #include "core/vk_pipeline_manager.h"
 #include "core/asset_manager.h"
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 #include "core/vk_raytracing.h"
 #include "core/texture_cache.h"
 #include "core/ibl_manager.h"

src/core/vk_engine_ui.cpp

@@ -11,11 +11,11 @@
 
 #include "render/primitives.h"
 #include "vk_mem_alloc.h"
-#include "render/vk_renderpass_tonemap.h"
-#include "render/vk_renderpass_background.h"
+#include "render/passes/tonemap.h"
+#include "render/passes/background.h"
 #include <glm/gtx/euler_angles.hpp>
 #include <glm/gtc/matrix_transform.hpp>
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 #include "core/vk_pipeline_manager.h"
 #include "core/texture_cache.h"
 #include "core/ibl_manager.h"

src/core/vk_pipeline_manager.cpp

@@ -3,7 +3,7 @@
 #include <core/engine_context.h>
 #include <core/vk_initializers.h>
 
-#include <render/vk_pipelines.h>
+#include <render/pipelines.h>
 #include <vk_device.h>
 
 #include <filesystem>

src/core/vk_pipeline_manager.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <core/vk_types.h>
-#include <render/vk_pipelines.h>
+#include <render/pipelines.h>
 #include <compute/vk_compute.h>
 
 #include <functional>

src/core/vk_resource.cpp

@@ -4,9 +4,9 @@
 #include "vk_initializers.h"
 
 #include "vk_mem_alloc.h"
-#include <render/rg_graph.h>
-#include <render/rg_builder.h>
-#include <render/rg_resources.h>
+#include <render/graph/graph.h>
+#include <render/graph/builder.h>
+#include <render/graph/resources.h>
 
 #include "frame_resources.h"
 

src/render/graph/builder.cpp

@@ -1,5 +1,5 @@
-#include <render/rg_builder.h>
-#include <render/rg_resources.h>
+#include "builder.h"
+#include "resources.h"
 
 // ---- RGPassResources ----
 VkImage RGPassResources::image(RGImageHandle h) const

src/render/graph/builder.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <render/rg_types.h>
+#include <render/graph/types.h>
 #include <vector>
 
 class RGResourceRegistry;

src/render/graph/graph.cpp

@@ -1,4 +1,4 @@
-#include <render/rg_graph.h>
+#include "graph.h"
 #include <core/engine_context.h>
 #include <core/vk_images.h>
 #include <core/vk_initializers.h>

src/render/graph/graph.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <core/vk_types.h>
-#include <render/rg_types.h>
-#include <render/rg_resources.h>
-#include <render/rg_builder.h>
+#include <render/graph/types.h>
+#include <render/graph/resources.h>
+#include <render/graph/builder.h>
 
 #include <functional>
 #include <string>

src/render/graph/resources.cpp

@@ -1,4 +1,4 @@
-#include <render/rg_resources.h>
+#include "resources.h"
 #include <core/engine_context.h>
 #include <core/vk_resource.h>
 #include <vk_mem_alloc.h>

src/render/graph/resources.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <core/vk_types.h>
-#include <render/rg_types.h>
+#include <render/graph/types.h>
 #include <string>
 #include <vector>
 #include <unordered_map>

src/render/materials.cpp

@@ -1,7 +1,7 @@
-#include "vk_materials.h"
+#include "materials.h"
 
 #include "core/vk_engine.h"
-#include "render/vk_pipelines.h"
+#include "render/pipelines.h"
 #include "core/vk_initializers.h"
 #include "core/vk_pipeline_manager.h"
 #include "core/asset_manager.h"

src/render/passes/background.cpp

@@ -1,4 +1,4 @@
-#include "vk_renderpass_background.h"
+#include "background.h"
 #include <string_view>
 
 #include "vk_swapchain.h"
@@ -6,7 +6,7 @@
 #include "core/vk_resource.h"
 #include "core/vk_pipeline_manager.h"
 #include "core/asset_manager.h"
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 #include <cstring>
 
 #include "frame_resources.h"

src/render/passes/background.h

@@ -1,7 +1,7 @@
 #pragma once
-#include "vk_renderpass.h"
+#include "render/renderpass.h"
 #include "compute/vk_compute.h"
-#include "render/rg_types.h"
+#include "render/graph/types.h"
 
 class RenderGraph;
 

src/render/passes/geometry.cpp

@@ -1,4 +1,4 @@
-#include "vk_renderpass_geometry.h"
+#include "geometry.h"
 
 #include <chrono>
 #include <unordered_set>
@@ -14,7 +14,7 @@
 #include "vk_mem_alloc.h"
 #include "vk_scene.h"
 #include "vk_swapchain.h"
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 
 // Basic conservative frustum test against RenderObject AABB.
 // Clip space uses Vulkan Z0 (0..w). Returns true if any part of the box is inside.

src/render/passes/geometry.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "vk_renderpass.h"
-#include <render/rg_types.h>
+#include "render/renderpass.h"
+#include <render/graph/types.h>
 
 class SwapchainManager;
 class RenderGraph;

src/render/passes/imgui_pass.cpp

@@ -1,4 +1,4 @@
-#include "vk_renderpass_imgui.h"
+#include "imgui_pass.h"
 
 #include "imgui.h"
 #include "imgui_impl_sdl2.h"
@@ -7,7 +7,7 @@
 #include "vk_swapchain.h"
 #include "core/vk_initializers.h"
 #include "core/engine_context.h"
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 
 void ImGuiPass::init(EngineContext *context)
 {

src/render/passes/imgui_pass.h

@@ -1,7 +1,7 @@
 #pragma once
-#include "vk_renderpass.h"
+#include "render/renderpass.h"
 #include "core/vk_types.h"
-#include <render/rg_types.h>
+#include <render/graph/types.h>
 
 class ImGuiPass : public IRenderPass
 {

src/render/passes/lighting.cpp

@@ -1,4 +1,4 @@
-#include "vk_renderpass_lighting.h"
+#include "lighting.h"
 
 #include "frame_resources.h"
 #include "vk_descriptor_manager.h"
@@ -6,7 +6,7 @@
 #include "core/engine_context.h"
 #include "core/vk_initializers.h"
 #include "core/vk_resource.h"
-#include "render/vk_pipelines.h"
+#include "render/pipelines.h"
 #include "core/vk_pipeline_manager.h"
 #include "core/asset_manager.h"
 #include "core/vk_descriptors.h"
@@ -15,7 +15,7 @@
 #include "vk_mem_alloc.h"
 #include "vk_sampler_manager.h"
 #include "vk_swapchain.h"
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 #include <array>
 #include <cstring>
 

src/render/passes/lighting.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "vk_renderpass.h"
-#include <render/rg_types.h>
+#include "render/renderpass.h"
+#include <render/graph/types.h>
 #include <span>
 
 class LightingPass : public IRenderPass

src/render/passes/shadow.cpp

@@ -1,11 +1,11 @@
-#include "vk_renderpass_shadow.h"
+#include "shadow.h"
 
 #include <unordered_set>
 #include <string>
 
 #include "core/engine_context.h"
-#include "render/rg_graph.h"
-#include "render/rg_builder.h"
+#include "render/graph/graph.h"
+#include "render/graph/builder.h"
 #include "vk_swapchain.h"
 #include "vk_scene.h"
 #include "frame_resources.h"
@@ -15,7 +15,7 @@
 #include "core/vk_initializers.h"
 #include "core/vk_pipeline_manager.h"
 #include "core/asset_manager.h"
-#include "render/vk_pipelines.h"
+#include "render/pipelines.h"
 #include "core/vk_types.h"
 #include "core/config.h"
 

src/render/passes/shadow.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "vk_renderpass.h"
-#include <render/rg_types.h>
+#include "render/renderpass.h"
+#include <render/graph/types.h>
 #include <span>
 
 class RenderGraph;

src/render/passes/tonemap.cpp

@@ -1,4 +1,4 @@
-#include "vk_renderpass_tonemap.h"
+#include "tonemap.h"
 
 #include <core/engine_context.h>
 #include <core/vk_descriptors.h>
@@ -8,8 +8,8 @@
 #include <core/vk_device.h>
 #include <core/vk_resource.h>
 #include <vk_sampler_manager.h>
-#include <render/rg_graph.h>
-#include <render/rg_resources.h>
+#include <render/graph/graph.h>
+#include <render/graph/resources.h>
 
 #include "frame_resources.h"
 

src/render/passes/tonemap.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <core/vk_types.h>
-#include <render/vk_renderpass.h>
-#include <render/rg_types.h>
+#include <render/renderpass.h>
+#include <render/graph/types.h>
 
 class EngineContext;
 class RenderGraph;

src/render/passes/transparent.cpp

@@ -1,4 +1,4 @@
-#include "vk_renderpass_transparent.h"
+#include "transparent.h"
 
 #include <algorithm>
 #include <unordered_set>
@@ -13,7 +13,7 @@
 #include "core/vk_device.h"
 #include "core/vk_descriptor_manager.h"
 #include "core/frame_resources.h"
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 
 void TransparentPass::init(EngineContext *context)
 {

src/render/passes/transparent.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "vk_renderpass.h"
-#include "render/rg_types.h"
+#include "render/renderpass.h"
+#include "render/graph/types.h"
 
 class TransparentPass : public IRenderPass
 {

src/render/pipelines.cpp

@@ -1,4 +1,4 @@
-#include <render/vk_pipelines.h>
+#include "pipelines.h"
 #include <fstream>
 #include <core/vk_initializers.h>
 

src/render/renderpass.cpp

@@ -1,12 +1,12 @@
-#include "vk_renderpass.h"
+#include "renderpass.h"
 
-#include "vk_renderpass_background.h"
-#include "vk_renderpass_geometry.h"
-#include "vk_renderpass_imgui.h"
-#include "vk_renderpass_lighting.h"
-#include "vk_renderpass_transparent.h"
-#include "vk_renderpass_tonemap.h"
-#include "vk_renderpass_shadow.h"
+#include "passes/background.h"
+#include "passes/geometry.h"
+#include "passes/imgui_pass.h"
+#include "passes/lighting.h"
+#include "passes/transparent.h"
+#include "passes/tonemap.h"
+#include "passes/shadow.h"
 
 void RenderPassManager::init(EngineContext *context)
 {

src/scene/vk_loader.cpp

@@ -6,7 +6,7 @@
 #include "core/texture_cache.h"
 
 #include "core/vk_engine.h"
-#include "render/vk_materials.h"
+#include "render/materials.h"
 #include "core/vk_initializers.h"
 #include "core/vk_types.h"
 #include "core/config.h"