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/Feature/Common/Code/Source/ImageBasedLights/ImageBasedLightFeatureProcessor.cpp
+4 -9
View File
@@ -37,12 +37,6 @@ namespace AZ
{
m_sceneSrg = GetParentScene()->GetShaderResourceGroup();
// Find SRG index for global IBL
m_specularEnvMapIndex = m_sceneSrg->FindShaderInputImageIndex(Name{"m_specularEnvMap"});
m_diffuseEnvMapIndex = m_sceneSrg->FindShaderInputImageIndex(Name{"m_diffuseEnvMap"});
m_iblExposureConstantIndex = m_sceneSrg->FindShaderInputConstantIndex(Name{"m_iblExposure"});
m_iblOrientationConstantIndex = m_sceneSrg->FindShaderInputConstantIndex(Name{"m_iblOrientation"});
// Load default specular and diffuse cubemaps
// These are assigned when Global IBL is disabled or removed from the scene to prevent a Vulkan TDR.
// [GFX-TODO][ATOM-4181] This can be removed after Vulkan is changed to automatically handle this issue.
@@ -51,9 +45,10 @@ namespace AZ
void ImageBasedLightFeatureProcessor::Deactivate()
{
m_iblExposureConstantIndex = {};
m_diffuseEnvMapIndex = {};
m_specularEnvMapIndex = {};
m_iblOrientationConstantIndex.Reset();
m_iblExposureConstantIndex.Reset();
m_diffuseEnvMapIndex.Reset();
m_specularEnvMapIndex.Reset();
m_sceneSrg = {};
}