From cb40da83ff8ad33278d9e91c99c8bf1dd626ab2a Mon Sep 17 00:00:00 2001 From: ssdfasd <2156608475@qq.com> Date: Sun, 5 Apr 2026 19:35:18 +0800 Subject: [PATCH] Replace renderer utility umbrella includes --- .../XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h | 6 +++++- .../include/XCEngine/Rendering/Passes/BuiltinObjectIdPass.h | 5 ++++- .../XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h | 4 +++- engine/src/Rendering/Passes/BuiltinDepthStylePassBase.cpp | 1 + engine/src/Rendering/Passes/BuiltinObjectIdPass.cpp | 2 +- engine/src/Rendering/Passes/BuiltinShadowCasterPass.cpp | 1 + engine/src/Rendering/Pipelines/BuiltinForwardPipeline.cpp | 2 +- .../Rendering/Pipelines/BuiltinForwardPipelineResources.cpp | 4 +++- engine/src/Rendering/RenderSceneExtractor.cpp | 1 - engine/src/Rendering/RenderSceneUtility.cpp | 2 +- tests/Rendering/unit/test_render_scene_extractor.cpp | 4 +++- 11 files changed, 23 insertions(+), 9 deletions(-) diff --git a/engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h b/engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h index 845e53ca..2b4bbc38 100644 --- a/engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h +++ b/engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h @@ -1,8 +1,10 @@ #pragma once #include -#include +#include +#include #include +#include #include #include #include @@ -19,6 +21,8 @@ class Shader; } // namespace Resources namespace Rendering { +struct VisibleRenderItem; + namespace Passes { class BuiltinDepthStylePassBase : public RenderPass { diff --git a/engine/include/XCEngine/Rendering/Passes/BuiltinObjectIdPass.h b/engine/include/XCEngine/Rendering/Passes/BuiltinObjectIdPass.h index 5d817eec..14a7f71a 100644 --- a/engine/include/XCEngine/Rendering/Passes/BuiltinObjectIdPass.h +++ b/engine/include/XCEngine/Rendering/Passes/BuiltinObjectIdPass.h @@ -1,8 +1,9 @@ #pragma once +#include +#include #include #include -#include #include #include #include @@ -12,6 +13,8 @@ namespace XCEngine { namespace Rendering { +struct VisibleRenderItem; + namespace Passes { class BuiltinObjectIdPass final : public RenderPass { diff --git a/engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h b/engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h index 492f49fd..e949dd0b 100644 --- a/engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h +++ b/engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h @@ -1,6 +1,8 @@ #pragma once -#include +#include +#include +#include #include #include #include diff --git a/engine/src/Rendering/Passes/BuiltinDepthStylePassBase.cpp b/engine/src/Rendering/Passes/BuiltinDepthStylePassBase.cpp index 670060b8..3802fb10 100644 --- a/engine/src/Rendering/Passes/BuiltinDepthStylePassBase.cpp +++ b/engine/src/Rendering/Passes/BuiltinDepthStylePassBase.cpp @@ -3,6 +3,7 @@ #include "Core/Asset/ResourceManager.h" #include "Debug/Logger.h" #include "RHI/RHICommandList.h" +#include "Rendering/RenderMaterialResolve.h" #include "Rendering/Detail/ShaderVariantUtils.h" #include "Rendering/RenderSceneExtractor.h" #include "Rendering/RenderSurface.h" diff --git a/engine/src/Rendering/Passes/BuiltinObjectIdPass.cpp b/engine/src/Rendering/Passes/BuiltinObjectIdPass.cpp index 5f60257a..4ee1d62f 100644 --- a/engine/src/Rendering/Passes/BuiltinObjectIdPass.cpp +++ b/engine/src/Rendering/Passes/BuiltinObjectIdPass.cpp @@ -6,8 +6,8 @@ #include "RHI/RHICommandList.h" #include "RHI/RHIPipelineLayout.h" #include "RHI/RHIPipelineState.h" +#include "Rendering/BuiltinPassContract.h" #include "Rendering/Detail/ShaderVariantUtils.h" -#include "Rendering/RenderMaterialUtility.h" #include "Rendering/RenderSceneExtractor.h" #include "Rendering/RenderSurface.h" #include "Resources/BuiltinResources.h" diff --git a/engine/src/Rendering/Passes/BuiltinShadowCasterPass.cpp b/engine/src/Rendering/Passes/BuiltinShadowCasterPass.cpp index 26178752..cc351172 100644 --- a/engine/src/Rendering/Passes/BuiltinShadowCasterPass.cpp +++ b/engine/src/Rendering/Passes/BuiltinShadowCasterPass.cpp @@ -1,6 +1,7 @@ #include "Rendering/Passes/BuiltinShadowCasterPass.h" #include "Components/MeshRendererComponent.h" +#include "Rendering/VisibleRenderItem.h" #include "Resources/BuiltinResources.h" namespace XCEngine { diff --git a/engine/src/Rendering/Pipelines/BuiltinForwardPipeline.cpp b/engine/src/Rendering/Pipelines/BuiltinForwardPipeline.cpp index 7936a7d0..fc4d084d 100644 --- a/engine/src/Rendering/Pipelines/BuiltinForwardPipeline.cpp +++ b/engine/src/Rendering/Pipelines/BuiltinForwardPipeline.cpp @@ -3,7 +3,7 @@ #include "Debug/Logger.h" #include "Core/Asset/ResourceManager.h" #include "RHI/RHICommandList.h" -#include "Rendering/RenderMaterialUtility.h" +#include "Rendering/RenderMaterialResolve.h" #include "Rendering/RenderSurface.h" #include "Resources/BuiltinResources.h" diff --git a/engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp b/engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp index 825530d2..4b7759c3 100644 --- a/engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp +++ b/engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp @@ -4,8 +4,10 @@ #include "Debug/Logger.h" #include "RHI/RHICommandList.h" #include "RHI/RHIDevice.h" +#include "Rendering/BuiltinPassContract.h" #include "Rendering/Detail/ShaderVariantUtils.h" -#include "Rendering/RenderMaterialUtility.h" +#include "Rendering/RenderMaterialResolve.h" +#include "Rendering/RenderMaterialStateUtils.h" #include "Resources/Material/Material.h" #include "Resources/Shader/Shader.h" #include "Resources/Texture/Texture.h" diff --git a/engine/src/Rendering/RenderSceneExtractor.cpp b/engine/src/Rendering/RenderSceneExtractor.cpp index 5eeac635..1d134e54 100644 --- a/engine/src/Rendering/RenderSceneExtractor.cpp +++ b/engine/src/Rendering/RenderSceneExtractor.cpp @@ -3,7 +3,6 @@ #include "Components/CameraComponent.h" #include "Components/GameObject.h" #include "Components/LightComponent.h" -#include "Rendering/RenderMaterialUtility.h" #include "Rendering/RenderSceneUtility.h" #include "Scene/Scene.h" diff --git a/engine/src/Rendering/RenderSceneUtility.cpp b/engine/src/Rendering/RenderSceneUtility.cpp index d68dea04..40867cb8 100644 --- a/engine/src/Rendering/RenderSceneUtility.cpp +++ b/engine/src/Rendering/RenderSceneUtility.cpp @@ -6,7 +6,7 @@ #include "Components/MeshFilterComponent.h" #include "Components/MeshRendererComponent.h" #include "Components/TransformComponent.h" -#include "Rendering/RenderMaterialUtility.h" +#include "Rendering/RenderMaterialResolve.h" #include "Scene/Scene.h" #include diff --git a/tests/Rendering/unit/test_render_scene_extractor.cpp b/tests/Rendering/unit/test_render_scene_extractor.cpp index ea698731..799347a2 100644 --- a/tests/Rendering/unit/test_render_scene_extractor.cpp +++ b/tests/Rendering/unit/test_render_scene_extractor.cpp @@ -9,7 +9,9 @@ #include #include #include -#include +#include +#include +#include #include #include #include