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

Pass changes WIP: various fixes, exposure sample now works

Browse Source
This commit is contained in:
antonmic
2021-06-07 23:05:36 -07:00
parent 451de8e782
commit a30d9621d5
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.cpp
+1 -1
View File
@@ -176,7 +176,7 @@ namespace AZ
{
LoadShader();
AZ_Assert(GetPassState() != RPI::PassState::Rendering, "LightCullingTilePreparePass: Trying to reload shader during rendering");
if (GetPassState() == RPI::PassState::Initialized)
if (GetPassState() == RPI::PassState::Idle)
{
ChooseShaderVariant();
}
Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.cpp
+2 -2
View File
@@ -108,7 +108,7 @@ namespace AZ::Render
Base::ResetInternal();
}
void TaaPass::BuildAttachmentsInternal()
void TaaPass::BuildInternal()
{
m_accumulationAttachments[0] = FindAttachment(Name("Accumulation1"));
m_accumulationAttachments[1] = FindAttachment(Name("Accumulation2"));
@@ -143,7 +143,7 @@ namespace AZ::Render
m_outputColorBinding->SetAttachment(m_accumulationAttachments[1]);
}
Base::BuildAttachmentsInternal();
Base::BuildInternal();
}
void TaaPass::UpdateAttachmentImage(RPI::Ptr<RPI::PassAttachment>& attachment)
Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.h
+1 -1
View File
@@ -63,7 +63,7 @@ namespace AZ::Render
// Pass behavior overrides...
void FrameBeginInternal(FramePrepareParams params) override;
void ResetInternal() override;
void BuildAttachmentsInternal() override;
void BuildInternal() override;
void UpdateAttachmentImage(RPI::Ptr<RPI::PassAttachment>& attachment);
Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp
+1 -2
View File
@@ -1160,8 +1160,6 @@ 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);
@@ -1180,6 +1178,7 @@ namespace AZ
}
#endif
AZ_Assert(m_state == PassState::Reset, "ANTON - BUILDING PASS BUT STATE IS NOT RESET!!");
m_state = PassState::Building;
// Bindings, inputs and attachments
Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp
+3 -3
View File
@@ -217,7 +217,7 @@ namespace AZ
Pass* previousPassInList = nullptr;
for (const Ptr<Pass>& pass : buildListCopy)
{
if (pass.get() != previousPassInList);
if (pass.get() != previousPassInList)
{
pass->Reset();
previousPassInList = pass.get();
@@ -226,7 +226,7 @@ namespace AZ
previousPassInList = nullptr;
for (const Ptr<Pass>& pass : buildListCopy)
{
if (pass.get() != previousPassInList);
if (pass.get() != previousPassInList)
{
pass->Build(true);
previousPassInList = pass.get();
@@ -276,7 +276,7 @@ namespace AZ
Pass* previousPassInList = nullptr;
for (const Ptr<Pass>& pass : initListCopy)
{
if (pass.get() != previousPassInList);
if (pass.get() != previousPassInList)
{
pass->Initialize();
previousPassInList = pass.get();