Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

constrain UI phase ID to PassLayout/'default' #17542

Merged
merged 2 commits into from
Aug 16, 2024
Merged

constrain UI phase ID to PassLayout/'default' #17542

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b0b579
constrain UI layout to PassLayout/'default'
star-e Aug 15, 2024
ac65663
fix typo
star-e Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions native/cocos/renderer/pipeline/custom/NativeExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ void updateGlobal(

void submitUICommands(
gfx::RenderPass* renderPass,
uint32_t subpassOrPassLayoutID,
uint32_t phaseLayoutID,
const scene::Camera* camera,
gfx::CommandBuffer* cmdBuff) {
const auto cameraVisFlags = camera->getVisibility();
Expand All @@ -264,7 +264,7 @@ void submitUICommands(
const auto& passes = batch->getPasses();
for (size_t i = 0; i < batch->getShaders().size(); ++i) {
const scene::Pass* pass = passes[i];
if (pass->getSubpassOrPassID() != subpassOrPassLayoutID) {
if (pass->getPhaseID() != phaseLayoutID) {
continue;
}
auto* shader = batch->getShaders()[i];
Expand Down Expand Up @@ -687,16 +687,25 @@ struct RenderGraphVisitor : boost::dfs_visitor<> {
const auto queueID = parent(sceneID, ctx.g);
const auto& queueData = get(QueueTag{}, queueID, ctx.g);
const auto passOrSubpassID = parent(queueID, ctx.g);
// To render UI, the phase layout of the material Pass
// must be PassLayout/'default'
if (queueData.passLayoutID != LayoutGraphData::null_vertex()) {
submitUICommands(ctx.currentPass, queueData.passLayoutID, camera, ctx.cmdBuff);
const auto phaseLayoutID = locate(queueData.passLayoutID, "default", ctx.lg);
if (phaseLayoutID != LayoutGraphData::null_vertex()) {
submitUICommands(ctx.currentPass, phaseLayoutID, camera, ctx.cmdBuff);
}
} else {
const auto passID = parent(passOrSubpassID, ctx.g);
if (passID == RenderGraph::null_vertex()) { // Pass
const auto passLayoutID =
locate(LayoutGraphData::null_vertex(),
get(RenderGraph::LayoutTag{}, ctx.g, passOrSubpassID),
ctx.lg);
submitUICommands(ctx.currentPass, passLayoutID, camera, ctx.cmdBuff);
CC_ENSURES(passLayoutID != LayoutGraphData::null_vertex());
const auto phaseLayoutID = locate(passLayoutID, "default", ctx.lg);
if (phaseLayoutID != LayoutGraphData::null_vertex()) {
submitUICommands(ctx.currentPass, phaseLayoutID, camera, ctx.cmdBuff);
}
} else { // Subpass
const auto subpassID = passOrSubpassID;
const auto& passLayoutName = get(RenderGraph::LayoutTag{}, ctx.g, passID);
Expand All @@ -709,7 +718,11 @@ struct RenderGraphVisitor : boost::dfs_visitor<> {
: locate(LayoutGraphData::null_vertex(),
get(RenderGraph::LayoutTag{}, ctx.g, subpassID),
ctx.lg);
submitUICommands(ctx.currentPass, subpassLayoutID, camera, ctx.cmdBuff);
CC_ENSURES(subpassLayoutID != LayoutGraphData::null_vertex());
const auto phaseLayoutID = locate(subpassLayoutID, "default", ctx.lg);
if (phaseLayoutID != LayoutGraphData::null_vertex()) {
submitUICommands(ctx.currentPass, phaseLayoutID, camera, ctx.cmdBuff);
}
}
}
}
Expand Down
Loading