From af0b84e7d498ee2d987e51b9fcefbdd1b02cfbbf Mon Sep 17 00:00:00 2001
From: ssdfasd <2156608475@qq.com>
Date: Thu, 30 Apr 2026 22:16:18 +0800
Subject: [PATCH] Tighten rendering internal header visibility

---
 engine/CMakeLists.txt                         |  7 +++--
 .../Internal/RenderSurfacePipelineUtils.h     | 29 -----------------
 .../Rendering/Internal/ShaderVariantUtils.h   | 31 -------------------
 .../Shader/test_shader_dependencies.cpp       |  2 +-
 4 files changed, 5 insertions(+), 64 deletions(-)
 delete mode 100644 engine/include/XCEngine/Rendering/Internal/RenderSurfacePipelineUtils.h
 delete mode 100644 engine/include/XCEngine/Rendering/Internal/ShaderVariantUtils.h

diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index 9a13e124..00517cf7 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -629,8 +629,6 @@ add_library(XCEngine STATIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/SceneRenderFeaturePassId.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/SceneRenderFeatureHost.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/ShaderVariantUtils.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Internal/RenderSurfacePipelineUtils.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Internal/ShaderVariantUtils.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Execution/RenderPipelineHost.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Execution/SceneRenderSequence.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Caches/RenderResourceCache.h
@@ -840,13 +838,16 @@ add_library(XCEngine STATIC
 target_include_directories(XCEngine PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine
-    ${CMAKE_CURRENT_SOURCE_DIR}/src
     ${CMAKE_CURRENT_SOURCE_DIR}/third_party
     ${CMAKE_CURRENT_SOURCE_DIR}/third_party/GLAD/include
     ${CMAKE_CURRENT_SOURCE_DIR}/third_party/stb
     ${CMAKE_CURRENT_SOURCE_DIR}/third_party/assimp/include
 )
 
+target_include_directories(XCEngine PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+
 if(XCENGINE_HAS_NANOVDB)
     target_include_directories(XCEngine PRIVATE
         ${XCENGINE_NANOVDB_INCLUDE_DIR}
diff --git a/engine/include/XCEngine/Rendering/Internal/RenderSurfacePipelineUtils.h b/engine/include/XCEngine/Rendering/Internal/RenderSurfacePipelineUtils.h
deleted file mode 100644
index 149c9a2a..00000000
--- a/engine/include/XCEngine/Rendering/Internal/RenderSurfacePipelineUtils.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <XCEngine/Rendering/RenderSurfacePipelineUtils.h>
-
-namespace XCEngine {
-namespace Rendering {
-namespace Internal {
-
-using ::XCEngine::Rendering::ApplySingleColorAttachmentPropertiesToGraphicsPipelineDesc;
-using ::XCEngine::Rendering::ApplySurfacePropertiesToGraphicsPipelineDesc;
-using ::XCEngine::Rendering::HasKnownDepthAttachmentFormat;
-using ::XCEngine::Rendering::HasKnownSingleColorAttachmentFormat;
-using ::XCEngine::Rendering::HasSingleColorAttachment;
-using ::XCEngine::Rendering::HasValidPipelineSampleDescription;
-using ::XCEngine::Rendering::HasZeroOrSingleColorAttachment;
-using ::XCEngine::Rendering::IsDepthStyleCompatibleSurface;
-using ::XCEngine::Rendering::ResolveSurfaceColorAttachmentCount;
-using ::XCEngine::Rendering::ResolveSurfaceColorFormat;
-using ::XCEngine::Rendering::ResolveSurfaceColorFormats;
-using ::XCEngine::Rendering::ResolveSurfaceDepthFormat;
-using ::XCEngine::Rendering::ResolveSurfaceSampleCount;
-using ::XCEngine::Rendering::ResolveSurfaceSampleQuality;
-using ::XCEngine::Rendering::TryResolveSingleColorAttachmentFormat;
-inline constexpr std::uint32_t kMaxPipelineColorAttachmentCount =
-    ::XCEngine::Rendering::kMaxPipelineColorAttachmentCount;
-
-} // namespace Internal
-} // namespace Rendering
-} // namespace XCEngine
diff --git a/engine/include/XCEngine/Rendering/Internal/ShaderVariantUtils.h b/engine/include/XCEngine/Rendering/Internal/ShaderVariantUtils.h
deleted file mode 100644
index 60e710c6..00000000
--- a/engine/include/XCEngine/Rendering/Internal/ShaderVariantUtils.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <XCEngine/Rendering/ShaderVariantUtils.h>
-
-namespace XCEngine {
-namespace Rendering {
-namespace Internal {
-
-using ::XCEngine::Rendering::AddShaderCompileMacro;
-using ::XCEngine::Rendering::ApplyShaderStageVariant;
-using ::XCEngine::Rendering::BuildRuntimeShaderSource;
-using ::XCEngine::Rendering::BuildShaderKeywordSignature;
-using ::XCEngine::Rendering::EscapeRegexLiteral;
-using ::XCEngine::Rendering::InjectShaderBackendMacros;
-using ::XCEngine::Rendering::ResolveCompiledBinaryBackend;
-using ::XCEngine::Rendering::ResolveRuntimeShaderSourcePath;
-using ::XCEngine::Rendering::ShaderPassHasGraphicsVariants;
-using ::XCEngine::Rendering::ToRHIShaderBinaryBackend;
-using ::XCEngine::Rendering::ToRHIShaderLanguage;
-using ::XCEngine::Rendering::ToShaderBackend;
-using ::XCEngine::Rendering::ToStdString;
-using ::XCEngine::Rendering::ToWideAscii;
-using ::XCEngine::Rendering::TryBuildRuntimeShaderBindings;
-using ::XCEngine::Rendering::TryCollectShaderPassResourceBindings;
-using ::XCEngine::Rendering::TryGetHlslRegisterPrefix;
-using ::XCEngine::Rendering::TryRewriteHlslRegisterBinding;
-using ::XCEngine::Rendering::TryRewriteHlslRegisterBindingWithName;
-
-} // namespace Internal
-} // namespace Rendering
-} // namespace XCEngine
diff --git a/tests/Resources/Shader/test_shader_dependencies.cpp b/tests/Resources/Shader/test_shader_dependencies.cpp
index 55992b79..dee4eb81 100644
--- a/tests/Resources/Shader/test_shader_dependencies.cpp
+++ b/tests/Resources/Shader/test_shader_dependencies.cpp
@@ -4,7 +4,7 @@
 #include <XCEngine/Core/Asset/ResourceTypes.h>
 #include <XCEngine/Core/Containers/Array.h>
 #include <XCEngine/Core/Containers/String.h>
-#include <XCEngine/Rendering/Internal/ShaderVariantUtils.h>
+#include "Rendering/Internal/ShaderVariantUtils.h"
 #include <XCEngine/RHI/D3D12/D3D12Shader.h>
 #include <XCEngine/Resources/Shader/ShaderLoader.h>