From bae87afb20f95f9f27c64c4955bbc4464c576509 Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 6 Feb 2025 22:02:43 -0800 Subject: Support stage_switch. (#6311) * Support stage_switch. * Update proposal status. * Fix gl_InstanceID. * Fix. --- source/slang/slang-capability.cpp | 60 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) (limited to 'source/slang/slang-capability.cpp') diff --git a/source/slang/slang-capability.cpp b/source/slang/slang-capability.cpp index 7c4e34d32..1eb0cae31 100644 --- a/source/slang/slang-capability.cpp +++ b/source/slang/slang-capability.cpp @@ -100,6 +100,45 @@ bool isDirectChildOfAbstractAtom(CapabilityAtom name) return _getInfo(name).abstractBase != CapabilityName::Invalid; } +bool isStageAtom(CapabilityName name, CapabilityName& outCanonicalStage) +{ + auto& info = _getInfo(name); + if (info.abstractBase == CapabilityName::stage) + { + outCanonicalStage = name; + return true; + } + switch (name) + { + case CapabilityName::anyhit: + outCanonicalStage = CapabilityName::_anyhit; + return true; + case CapabilityName::closesthit: + outCanonicalStage = CapabilityName::_closesthit; + return true; + case CapabilityName::miss: + outCanonicalStage = CapabilityName::_miss; + return true; + case CapabilityName::intersection: + outCanonicalStage = CapabilityName::_intersection; + return true; + case CapabilityName::raygen: + outCanonicalStage = CapabilityName::_raygen; + return true; + case CapabilityName::callable: + outCanonicalStage = CapabilityName::_callable; + return true; + case CapabilityName::mesh: + outCanonicalStage = CapabilityName::_mesh; + return true; + case CapabilityName::amplification: + outCanonicalStage = CapabilityName::_amplification; + return true; + default: + return false; + } +} + bool isTargetVersionAtom(CapabilityAtom name) { if (name >= CapabilityAtom::_spirv_1_0 && name <= getLatestSpirvAtom()) @@ -620,7 +659,26 @@ CapabilitySet CapabilitySet::getTargetsThisHasButOtherDoesNot(const CapabilitySe if (other.m_targetSets.tryGetValue(i.first)) continue; - newSet.m_targetSets[i.first] = this->m_targetSets[i.first]; + newSet.m_targetSets[i.first] = i.second; + } + return newSet; +} + +CapabilitySet CapabilitySet::getStagesThisHasButOtherDoesNot(const CapabilitySet& other) +{ + CapabilitySet newSet{}; + for (auto& i : this->m_targetSets) + { + if (auto otherTarget = other.m_targetSets.tryGetValue(i.first)) + { + auto& thisTarget = m_targetSets[i.first]; + for (auto& stage : thisTarget.shaderStageSets) + { + if (otherTarget->shaderStageSets.containsKey(stage.first)) + continue; + newSet.m_targetSets[i.first].shaderStageSets[stage.first] = stage.second; + } + } } return newSet; } -- cgit v1.2.3