birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass changes WIP: small improvements

Browse Source
This commit is contained in:
antonmic
2021-06-07 08:39:08 -07:00
parent 9d7119a7f8
commit bd7c5f4ee2
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp
+5 -5
View File
@@ -1027,7 +1027,7 @@ namespace AZ
void Pass::QueueForBuild()
{
#if OLD_SCHOOL
#if 0//OLD_SCHOOL
// Don't queue if we're in building phase
//if (PassSystemInterface::Get()->GetState() != RPI::PassSystemState::Building)
{
@@ -1107,7 +1107,7 @@ namespace AZ
execute = execute || (m_state == PassState::Queued && m_queueState == PassQueueState::QueuedForInitialization);
#if OLD_SCHOOL
AZ_Assert(!execute == m_flags.m_alreadyReset, "ANTON - EARLY OUT FLAGS do not match for pass BUILD!!");
AZ_Assert(!execute == m_flags.m_alreadyReset, "ANTON - EARLY OUT FLAGS do not match for pass RESET!!");
if (m_flags.m_alreadyReset)
{
return;
@@ -1143,6 +1143,8 @@ namespace AZ
{
AZ_RPI_BREAK_ON_TARGET_PASS;
AZ_Assert(m_state == PassState::Reset, "ANTON - BUILDING PASS BUT STATE IS NOT RESET!!");
bool execute = (m_state == PassState::Idle || m_state == PassState::Reset);
execute = execute || (m_state == PassState::Queued && m_queueState == PassQueueState::QueuedForBuild);
execute = execute || (m_state == PassState::Queued && m_queueState == PassQueueState::QueuedForInitialization);
@@ -1161,10 +1163,7 @@ namespace AZ
}
#endif
//Reset();
m_state = PassState::Building;
m_queueState = PassQueueState::NoQueue;
// Bindings, inputs and attachments
CreateBindingsFromTemplate();
@@ -1187,6 +1186,7 @@ namespace AZ
UpdateAttachmentUsageIndices();
m_state = PassState::Built;
m_queueState = PassQueueState::NoQueue;
// If this pass's Build() wasn't called from the Pass System, then it was called by it's parent pass
// In which case we don't need to queue for initialization because the parent will already be queued
Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp
+18 -3
View File
@@ -214,13 +214,23 @@ namespace AZ
SortPassListAscending(buildListCopy);
Pass* previousPassInList = nullptr;
for (const Ptr<Pass>& pass : buildListCopy)
{
pass->Reset();
if (pass.get() != previousPassInList);
{
pass->Reset();
previousPassInList = pass.get();
}
}
previousPassInList = nullptr;
for (const Ptr<Pass>& pass : buildListCopy)
{
pass->Build(true);
if (pass.get() != previousPassInList);
{
pass->Build(true);
previousPassInList = pass.get();
}
}
loopCounter++;
}
@@ -263,9 +273,14 @@ namespace AZ
SortPassListAscending(initListCopy);
Pass* previousPassInList = nullptr;
for (const Ptr<Pass>& pass : initListCopy)
{
pass->Initialize();
if (pass.get() != previousPassInList);
{
pass->Initialize();
previousPassInList = pass.get();
}
}
loopCounter++;
}