xuanchi/XCEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tighten rendering internal header visibility

Browse Source
This commit is contained in:
ssdfasd
2026-04-30 22:16:18 +08:00
parent 7a697ea253
commit af0b84e7d4
4 changed files with 5 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
engine/CMakeLists.txt
View File

@@ -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}

29
engine/include/XCEngine/Rendering/Internal/RenderSurfacePipelineUtils.h
View File

@@ -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

31
engine/include/XCEngine/Rendering/Internal/ShaderVariantUtils.h
View File

@@ -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

2
tests/Resources/Shader/test_shader_dependencies.cpp
View File

@@ -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>