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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassUtils.cpp
+7 -7
View File
@@ -45,22 +45,22 @@ namespace AZ
{
bool success = true;
// Apply mappings from PassRequest
// Apply mappings from PassTemplate
const RenderPassData* passData = nullptr;
if (descriptor.m_passRequest != nullptr)
if (descriptor.m_passTemplate != nullptr)
{
passData = azrtti_cast<const RenderPassData*>(descriptor.m_passRequest->m_passData.get());
passData = azrtti_cast<const RenderPassData*>(descriptor.m_passTemplate->m_passData.get());
if (passData)
{
success = shaderResourceGroup->ApplyDataMappings(passData->m_mappings);
}
}
// Apply mappings from PassTemplate
// Apply mappings from PassRequest
passData = nullptr;
if (descriptor.m_passTemplate != nullptr)
if (descriptor.m_passRequest != nullptr)
{
passData = azrtti_cast<const RenderPassData*>(descriptor.m_passTemplate->m_passData.get());
passData = azrtti_cast<const RenderPassData*>(descriptor.m_passRequest->m_passData.get());
if (passData)
{
success = success && shaderResourceGroup->ApplyDataMappings(passData->m_mappings);
@@ -80,4 +80,4 @@ namespace AZ
} // namespace PassUtils
} // namespace RPI
} // namespace AZ
} // namespace AZ