From 2405ce5bb02b7e4ededcf47e116874f97de5bd47 Mon Sep 17 00:00:00 2001 From: GengineJS <476393671@qq.com> Date: Fri, 10 Dec 2021 17:57:28 +0800 Subject: [PATCH] Pipeline depth load modification and camera visibility synchronization (#4098) --- native/cocos/renderer/pipeline/forward/ForwardStage.cpp | 9 +++++++-- native/cocos/scene/Camera.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/native/cocos/renderer/pipeline/forward/ForwardStage.cpp b/native/cocos/renderer/pipeline/forward/ForwardStage.cpp index f65e990332..166266a811 100644 --- a/native/cocos/renderer/pipeline/forward/ForwardStage.cpp +++ b/native/cocos/renderer/pipeline/forward/ForwardStage.cpp @@ -173,7 +173,8 @@ void ForwardStage::render(scene::Camera *camera) { colorAttachmentInfo.clearColor = _clearColors[0]; colorAttachmentInfo.loadOp = gfx::LoadOp::CLEAR; auto clearFlags = static_cast(camera->clearFlag); - if (!hasFlag(clearFlags, gfx::ClearFlagBit::COLOR)) { + bool isSwapchain = !!camera->window->swapchain; + if (isSwapchain && !hasFlag(clearFlags, gfx::ClearFlagBit::COLOR)) { if (hasFlag(clearFlags, static_cast(skyboxFlag))) { colorAttachmentInfo.loadOp = gfx::LoadOp::DISCARD; } else { @@ -198,8 +199,12 @@ void ForwardStage::render(scene::Camera *camera) { depthAttachmentInfo.loadOp = gfx::LoadOp::CLEAR; depthAttachmentInfo.clearDepth = camera->clearDepth; depthAttachmentInfo.clearStencil = camera->clearStencil; + depthAttachmentInfo.beginAccesses = {gfx::AccessType::DEPTH_STENCIL_ATTACHMENT_WRITE}; depthAttachmentInfo.endAccesses = {gfx::AccessType::DEPTH_STENCIL_ATTACHMENT_WRITE}; - + if (isSwapchain && static_cast(clearFlags & gfx::ClearFlagBit::DEPTH_STENCIL) != gfx::ClearFlagBit::DEPTH_STENCIL + && (!hasFlag(clearFlags, gfx::ClearFlagBit::DEPTH) || !hasFlag(clearFlags, gfx::ClearFlagBit::STENCIL))) { + depthAttachmentInfo.loadOp = gfx::LoadOp::LOAD; + } data.depth = builder.create(RenderPipeline::fgStrHandleOutDepthTexture, depthTexInfo); data.depth = builder.write(data.depth, depthAttachmentInfo); builder.writeToBlackboard(RenderPipeline::fgStrHandleOutDepthTexture, data.depth); diff --git a/native/cocos/scene/Camera.h b/native/cocos/scene/Camera.h index 8ea61afd92..ff137a8ce7 100644 --- a/native/cocos/scene/Camera.h +++ b/native/cocos/scene/Camera.h @@ -52,7 +52,7 @@ struct Camera final { float aspect{0.0F}; Vec4 viewPort; uint32_t clearStencil{0}; - uint32_t visibility{0}; + int32_t visibility{0}; Node * node{nullptr}; RenderScene * scene{nullptr}; RenderWindow *window{nullptr};