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

Merge branch 'main' into Atom/antonmic/PassChanges

Browse Source
This commit is contained in:
antonmic
2021-06-07 08:41:31 -07:00
parent bd7c5f4ee2 1a6b6d5bc0
commit 451de8e782
171 changed files with 8369 additions and 4764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp
+23 -6
View File
@@ -902,23 +902,40 @@ namespace AZ
{
// make sure to only import the resource one time
RHI::AttachmentId attachmentId = attachment->GetAttachmentId();
if (!attachmentDatabase.IsAttachmentValid(attachmentId))
const RHI::FrameAttachment* currentAttachment = attachmentDatabase.FindAttachment(attachmentId);
if (azrtti_istypeof<Image>(attachment->m_importedResource.get()))
{
if (azrtti_istypeof<Image>(attachment->m_importedResource.get()))
Image* image = static_cast<Image*>(attachment->m_importedResource.get());
if (currentAttachment == nullptr)
{
Image* image = static_cast<Image*>(attachment->m_importedResource.get());
attachmentDatabase.ImportImage(attachmentId, image->GetRHIImage());
}
else if (azrtti_istypeof<Buffer>(attachment->m_importedResource.get()))
else
{
AZ_Assert(currentAttachment->GetResource() == image->GetRHIImage(),
"Importing image attachment named \"%s\" but a different attachment with the "
"same name already exists in the database.\n", attachmentId.GetCStr());
}
}
else if (azrtti_istypeof<Buffer>(attachment->m_importedResource.get()))
{
Buffer* buffer = static_cast<Buffer*>(attachment->m_importedResource.get());
if (currentAttachment == nullptr)
{
Buffer* buffer = static_cast<Buffer*>(attachment->m_importedResource.get());
attachmentDatabase.ImportBuffer(attachmentId, buffer->GetRHIBuffer());
}
else
{
AZ_RPI_PASS_ERROR(false, "Can't import unknown resource type");
AZ_Assert(currentAttachment->GetResource() == buffer->GetRHIBuffer(),
"Importing buffer attachment named \"%s\" but a different attachment with the "
"same name already exists in the database.\n", attachmentId.GetCStr());
}
}
else
{
AZ_RPI_PASS_ERROR(false, "Can't import unknown resource type");
}
}
}
}