summaryrefslogtreecommitdiff
path: root/source/slang/slang-capability.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/slang/slang-capability.cpp')
-rw-r--r--source/slang/slang-capability.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/source/slang/slang-capability.cpp b/source/slang/slang-capability.cpp
index 1eb0cae31..a2fef9f8a 100644
--- a/source/slang/slang-capability.cpp
+++ b/source/slang/slang-capability.cpp
@@ -718,17 +718,17 @@ bool CapabilityTargetSet::tryJoin(const CapabilityTargetSets& other)
return true;
}
-void CapabilitySet::join(const CapabilitySet& other)
+CapabilitySet& CapabilitySet::join(const CapabilitySet& other)
{
if (this->isEmpty() || other.isInvalid())
{
*this = other;
- return;
+ return *this;
}
if (this->isInvalid())
- return;
+ return *this;
if (other.isEmpty())
- return;
+ return *this;
List<CapabilityAtom> destroySet;
destroySet.reserve(this->m_targetSets.getCount());
@@ -746,6 +746,7 @@ void CapabilitySet::join(const CapabilitySet& other)
// join made a invalid CapabilitySet
if (this->m_targetSets.getCount() == 0)
this->m_targetSets[CapabilityAtom::Invalid].target = CapabilityAtom::Invalid;
+ return *this;
}
static uint32_t _calcAtomListDifferenceScore(