Shader: Rework scope handling

2021-04-04 20:31:09 +02:00
parent feffcfa6e5
commit f93a5bbdc1
23 changed files with 661 additions and 755 deletions
--- a/include/Nazara/Shader/SpirvAstVisitor.inl
+++ b/include/Nazara/Shader/SpirvAstVisitor.inl
@@ -7,13 +7,18 @@

 namespace Nz
 {
-	inline SpirvAstVisitor::SpirvAstVisitor(SpirvWriter& writer, std::vector<SpirvBlock>& blocks, ShaderAst::AstCache* cache) :
-	m_cache(cache),
+	inline SpirvAstVisitor::SpirvAstVisitor(SpirvWriter& writer, std::vector<SpirvBlock>& blocks) :
 	m_blocks(blocks),
 	m_writer(writer)
 	{
 		m_currentBlock = &m_blocks.back();
 	}
+
+	inline const ShaderAst::ExpressionType& SpirvAstVisitor::GetExpressionType(ShaderAst::Expression& expr) const
+	{
+		assert(expr.cachedExpressionType);
+		return expr.cachedExpressionType.value();
+	}
 }

 #include <Nazara/Shader/DebugOff.hpp>