Integrating latest 47acbe8

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
@@ -28,9 +28,21 @@ namespace AZ
->Field("Mask", &ShaderVariantId::m_mask)
;
}
if (BehaviorContext* behaviorContext = azrtti_cast<BehaviorContext*>(context))
{
behaviorContext->Class<ShaderVariantId>()
->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
->Attribute(AZ::Script::Attributes::Category, "Shader")
->Attribute(AZ::Script::Attributes::Module, "shader")
->Method("Equal", &ShaderVariantId::operator==)
->Attribute(AZ::Script::Attributes::Operator, AZ::Script::Attributes::OperatorType::Equal)
->Method("IsEmpty", &ShaderVariantId::IsEmpty)
;
}
}
ShaderVariantId& ShaderVariantId::reset()
ShaderVariantId& ShaderVariantId::Reset()
{
m_key.reset();
m_mask.reset();
@@ -67,6 +79,11 @@ namespace AZ
return ShaderVariantIdComparator::Compare(*this, other) != -1;
}
bool ShaderVariantId::IsEmpty() const
{
return m_key.none();
}
ShaderVariantSearchResult::ShaderVariantSearchResult(ShaderVariantStableId stableId, uint32_t dynamicOptionCount)
: m_shaderVariantStableId (stableId)
, m_dynamicOptionCount(dynamicOptionCount)