Shader: Handle type as expressions

2022-02-08 17:03:34 +01:00
parent 5ce8120a0c
commit 402e16bd2b
53 changed files with 1746 additions and 1141 deletions
--- a/src/Nazara/Graphics/UberShader.cpp
+++ b/src/Nazara/Graphics/UberShader.cpp
@@ -31,11 +31,10 @@ namespace Nz
 			supportedStageType |= stageType;
 		};

-		callbacks.onOptionDeclaration = [&](const std::string& optionName, const ShaderAst::ExpressionType& optionType)
+		callbacks.onOptionDeclaration = [&](const std::string& optionName, const ShaderAst::ExpressionValue<ShaderAst::ExpressionType>& optionType)
 		{
 			m_optionIndexByName[optionName] = Option{
-				optionCount,
-				optionType
+				optionCount
 			};

 			optionCount++;