Renderer: Add support for struct and UBO

include/Nazara/Renderer/GlslWriter.inl

@@ -17,7 +17,7 @@ namespace Nz
 	}
 
 	template<typename T>
-	void GlslWriter::DeclareVariables(const std::vector<T>& variables, const std::string& keyword, const std::string& section)
+	void GlslWriter::DeclareVariables(const ShaderAst& shader, const std::vector<T>& variables, const std::string& keyword, const std::string& section)
 	{
 		if (!variables.empty())
 		{
@@ -34,27 +34,94 @@ namespace Nz
 						Append(*var.locationIndex);
 						Append(") ");
 					}
+
+					if (!keyword.empty())
+					{
+						Append(keyword);
+						Append(" ");
+					}
+
+					Append(var.type);
+					Append(" ");
+					Append(var.name);
+					AppendLine(";");
 				}
 				else if constexpr (std::is_same_v<T, ShaderAst::Uniform>)
 				{
-					if (var.bindingIndex)
+					if (var.bindingIndex || var.memoryLayout)
 					{
-						Append("layout(binding = ");
-						Append(*var.bindingIndex);
+						Append("layout(");
+
+						bool first = true;
+						if (var.bindingIndex)
+						{
+							if (!first)
+								Append(", ");
+
+							Append("binding = ");
+							Append(*var.bindingIndex);
+
+							first = false;
+						}
+
+						if (var.memoryLayout)
+						{
+							if (!first)
+								Append(", ");
+
+							Append(*var.memoryLayout);
+
+							first = false;
+						}
+
 						Append(") ");
 					}
-				}
 
-				if (!keyword.empty())
-				{
-					Append(keyword);
-					Append(" ");
-				}
+					if (!keyword.empty())
+					{
+						Append(keyword);
+						Append(" ");
+					}
 
-				Append(var.type);
-				Append(" ");
-				Append(var.name);
-				AppendLine(";");
+					std::visit([&](auto&& arg)
+					{
+						using T = std::decay_t<decltype(arg)>;
+						if constexpr (std::is_same_v<T, ShaderNodes::ExpressionType>)
+						{
+							Append(arg);
+							Append(" ");
+							Append(var.name);
+						}
+						else if constexpr (std::is_same_v<T, std::string>)
+						{
+							const auto& structs = shader.GetStructs();
+							auto it = std::find_if(structs.begin(), structs.end(), [&](const auto& s) { return s.name == arg; });
+							if (it == structs.end())
+								throw std::runtime_error("struct " + arg + " has not been defined");
+
+							const auto& s = *it;
+
+							AppendLine(var.name + "_interface");
+							AppendLine("{");
+							for (const auto& m : s.members)
+							{
+								Append("\t");
+								Append(m.type);
+								Append(" ");
+								Append(m.name);
+								AppendLine(";");
+							}
+							Append("} ");
+							Append(var.name);
+						}
+						else
+							static_assert(AlwaysFalse<T>::value, "non-exhaustive visitor");
+
+					}, var.type);
+
+					AppendLine(";");
+					AppendLine();
+				}
 			}
 
 			AppendLine();