Move the devil string to macro

This commit is contained in:
MagicXHouse
2026-09-08 19:11:16 +08:00
parent c231410792
commit f264405b7e
7 changed files with 13 additions and 10 deletions
+3
View File
@@ -688,6 +688,9 @@ static constexpr uint32_t CLUSTER_LIGHT_BINDING = 4;
static constexpr uint32_t CLUSTER_LIGHT_INDEX_BINDING = 5;
static constexpr uint32_t CLUSTER_LIGHT_GRID_BINDING = 6;
constexpr const char *GEOMETRY_RENDERER_COMMAND = "geometry-renderer";
constexpr const char *DEBUG_RENDERER_COMMAND = "debug-renderer";
void localDescriptorSetLayoutResizeMaxJoints(uint32_t maxCount);
} // namespace pipeline
@@ -115,10 +115,10 @@ bool RenderPipeline::activate(gfx::Swapchain * /*swapchain*/) {
_pipelineSceneData->activate(_device);
#if CC_USE_DEBUG_RENDERER
CC_DEBUG_RENDERER->activate(_device);
addRenderCommand("debug-renderer", std::make_shared<DebugRendererRenderCommand>(getPipelineSceneData()));
addRenderCommand(cc::pipeline::DEBUG_RENDERER_COMMAND, std::make_shared<DebugRendererRenderCommand>(getPipelineSceneData()));
#endif
#if CC_USE_GEOMETRY_RENDERER
addRenderCommand("geometry-renderer", std::make_shared<GeometryRendererRenderCommand>(getPipelineSceneData()));
addRenderCommand(cc::pipeline::GEOMETRY_RENDERER_COMMAND, std::make_shared<GeometryRendererRenderCommand>(getPipelineSceneData()));
#endif
// generate macros here rather than construct func because _clusterEnabled
@@ -1437,10 +1437,10 @@ bool NativePipeline::activate(gfx::Swapchain *swapchainIn) {
pipelineSceneData->activate(device);
#if CC_USE_DEBUG_RENDERER
DebugRenderer::getInstance()->activate(device);
addCustomRenderCommand("debug-renderer", std::make_shared<DebugRendererRenderCommand>(getPipelineSceneData()));
addCustomRenderCommand(cc::pipeline::DEBUG_RENDERER_COMMAND, std::make_shared<DebugRendererRenderCommand>(getPipelineSceneData()));
#endif
#if CC_USE_GEOMETRY_RENDERER
addCustomRenderCommand("geometry-renderer", std::make_shared<GeometryRendererRenderCommand>(getPipelineSceneData()));
addCustomRenderCommand(cc::pipeline::GEOMETRY_RENDERER_COMMAND, std::make_shared<GeometryRendererRenderCommand>(getPipelineSceneData()));
#endif
// generate macros here rather than construct func because _clusterEnabled
// switch may be changed in root.ts setRenderPipeline() function which is after
@@ -916,7 +916,7 @@ SceneBuilder *NativeRenderQueueBuilder::addScene(
#if CC_USE_GEOMETRY_RENDERER
if (any(sceneFlags & SceneFlags::GEOMETRY)) {
auto &data = get(RenderGraph::DataTag{}, *renderGraph, sceneID);
data.custom = "geometry-renderer";
data.custom = cc::pipeline::GEOMETRY_RENDERER_COMMAND;
}
#endif
@@ -1109,7 +1109,7 @@ void NativeRenderQueueBuilder::addProfiler(const scene::Camera *camera) {
*renderGraph,
queueId);
auto &debugData = get(RenderGraph::DataTag{}, *renderGraph, debugId);
debugData.custom = "debug-renderer";
debugData.custom = cc::pipeline::DEBUG_RENDERER_COMMAND;
setCameraUBOValues(
*camera,
*layoutGraph,
@@ -647,7 +647,7 @@ void LightingStage::fgTransparent(scene::Camera *camera) {
_planarShadowQueue->recordCommandBuffer(_device, table.getRenderPass(), cmdBuff);
#if CC_USE_GEOMETRY_RENDERER
if (auto *command = pipeline->getRenderCommand("geometry-renderer")) {
if (auto *command = pipeline->getRenderCommand(cc::pipeline::GEOMETRY_RENDERER_COMMAND)) {
command->beginRenderCommand({table.getRenderPass(), cmdBuff, pipeline->getPipelineSceneData(), camera});
}
#endif
@@ -228,7 +228,7 @@ void PostProcessStage::render(scene::Camera *camera) {
_uiPhase->render(camera, renderPass);
renderProfiler(renderPass, cmdBuff, pipeline->getProfiler(), camera);
#if CC_USE_DEBUG_RENDERER
if (auto *command = pipeline->getRenderCommand("debug-renderer")) {
if (auto *command = pipeline->getRenderCommand(cc::pipeline::DEBUG_RENDERER_COMMAND)) {
command->beginRenderCommand({renderPass, cmdBuff, pipeline->getPipelineSceneData(), camera});
}
#endif
@@ -259,7 +259,7 @@ void ForwardStage::render(scene::Camera *camera) {
}
#if CC_USE_GEOMETRY_RENDERER
if (auto *command = pipeline->getRenderCommand("geometry-renderer")) {
if (auto *command = pipeline->getRenderCommand(cc::pipeline::GEOMETRY_RENDERER_COMMAND)) {
command->beginRenderCommand({renderPass, cmdBuff, pipeline->getPipelineSceneData(), camera});
}
#endif
@@ -267,7 +267,7 @@ void ForwardStage::render(scene::Camera *camera) {
_uiPhase->render(camera, renderPass);
renderProfiler(renderPass, cmdBuff, _pipeline->getProfiler(), camera);
#if CC_USE_DEBUG_RENDERER
if (auto *command = pipeline->getRenderCommand("debug-renderer")) {
if (auto *command = pipeline->getRenderCommand(cc::pipeline::DEBUG_RENDERER_COMMAND)) {
command->beginRenderCommand({renderPass, cmdBuff, pipeline->getPipelineSceneData(), camera});
}
#endif