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

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Code/Source/PostProcessing/PostProcessingShaderOptionBase.cpp
+2 -3
View File
@@ -27,8 +27,7 @@ namespace AZ
RHI::PipelineStateDescriptorForDraw pipelineStateDescriptor;
AZ::u64 variationKey = shaderOption.GetShaderVariantId().m_key.to_ullong();
auto searchResult = shader->FindVariantStableId(shaderOption.GetShaderVariantId());
auto shaderVariant = shader->GetVariant(searchResult.GetStableId());
auto shaderVariant = shader->GetVariant(shaderOption.GetShaderVariantId());
shaderVariant.ConfigurePipelineState(pipelineStateDescriptor);
pipelineStateDescriptor.m_renderAttachmentConfiguration = renderAttachmentConfiguration;
@@ -42,7 +41,7 @@ namespace AZ
pipelineStateDescriptor.m_inputStreamLayout = inputStreamLayout;
m_shaderVariantTable[variationKey].m_pipelineState = shader->AcquirePipelineState(pipelineStateDescriptor);
m_shaderVariantTable[variationKey].m_isFullyBaked = searchResult.IsFullyBaked();
m_shaderVariantTable[variationKey].m_isFullyBaked = shaderVariant.IsFullyBaked();
}
void PostProcessingShaderOptionBase::UpdateShaderVariant(const AZ::RPI::ShaderOptionGroup& shaderOption)