diff --git a/native/cocos/renderer/pipeline/Define.h b/native/cocos/renderer/pipeline/Define.h index df99d36877..253bd61e14 100644 --- a/native/cocos/renderer/pipeline/Define.h +++ b/native/cocos/renderer/pipeline/Define.h @@ -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 diff --git a/native/cocos/renderer/pipeline/RenderPipeline.cpp b/native/cocos/renderer/pipeline/RenderPipeline.cpp index 9e3877dc6f..5e710d26ac 100644 --- a/native/cocos/renderer/pipeline/RenderPipeline.cpp +++ b/native/cocos/renderer/pipeline/RenderPipeline.cpp @@ -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(getPipelineSceneData())); + addRenderCommand(cc::pipeline::DEBUG_RENDERER_COMMAND, std::make_shared(getPipelineSceneData())); #endif #if CC_USE_GEOMETRY_RENDERER - addRenderCommand("geometry-renderer", std::make_shared(getPipelineSceneData())); + addRenderCommand(cc::pipeline::GEOMETRY_RENDERER_COMMAND, std::make_shared(getPipelineSceneData())); #endif // generate macros here rather than construct func because _clusterEnabled diff --git a/native/cocos/renderer/pipeline/custom/NativePipeline.cpp b/native/cocos/renderer/pipeline/custom/NativePipeline.cpp index 5e43c0d1fc..92c83e129a 100644 --- a/native/cocos/renderer/pipeline/custom/NativePipeline.cpp +++ b/native/cocos/renderer/pipeline/custom/NativePipeline.cpp @@ -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(getPipelineSceneData())); + addCustomRenderCommand(cc::pipeline::DEBUG_RENDERER_COMMAND, std::make_shared(getPipelineSceneData())); #endif #if CC_USE_GEOMETRY_RENDERER - addCustomRenderCommand("geometry-renderer", std::make_shared(getPipelineSceneData())); + addCustomRenderCommand(cc::pipeline::GEOMETRY_RENDERER_COMMAND, std::make_shared(getPipelineSceneData())); #endif // generate macros here rather than construct func because _clusterEnabled // switch may be changed in root.ts setRenderPipeline() function which is after diff --git a/native/cocos/renderer/pipeline/custom/NativeRenderGraph.cpp b/native/cocos/renderer/pipeline/custom/NativeRenderGraph.cpp index 06c06a6bea..50fb6ae95d 100644 --- a/native/cocos/renderer/pipeline/custom/NativeRenderGraph.cpp +++ b/native/cocos/renderer/pipeline/custom/NativeRenderGraph.cpp @@ -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, diff --git a/native/cocos/renderer/pipeline/deferred/LightingStage.cpp b/native/cocos/renderer/pipeline/deferred/LightingStage.cpp index 8d682b2d91..c00f8cd6a3 100644 --- a/native/cocos/renderer/pipeline/deferred/LightingStage.cpp +++ b/native/cocos/renderer/pipeline/deferred/LightingStage.cpp @@ -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 diff --git a/native/cocos/renderer/pipeline/deferred/PostProcessStage.cpp b/native/cocos/renderer/pipeline/deferred/PostProcessStage.cpp index e267b44e6d..1d24ae2e92 100644 --- a/native/cocos/renderer/pipeline/deferred/PostProcessStage.cpp +++ b/native/cocos/renderer/pipeline/deferred/PostProcessStage.cpp @@ -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 diff --git a/native/cocos/renderer/pipeline/forward/ForwardStage.cpp b/native/cocos/renderer/pipeline/forward/ForwardStage.cpp index 980d7bea74..bcddacfd18 100644 --- a/native/cocos/renderer/pipeline/forward/ForwardStage.cpp +++ b/native/cocos/renderer/pipeline/forward/ForwardStage.cpp @@ -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