X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=ece48cf06e2606219e76e6fb86bd03577a98074a;hb=8812fe9fc71b997246ddfdedb8a91932b679d2d3;hp=13c73e4ac0a79694d4d50c7e37b14b6ffd69b1bb;hpb=e55f79ccb21e8c1be3d86f127e3ec1583e58ce92;p=libs%2Fgl.git

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index 13c73e4a..ece48cf0 100644
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -334,7 +334,13 @@ void ProgramCompiler::Formatter::visit(Layout &layout)
 		if(!i->value.empty())
 			formatted += format("=%s", i->value);
 	}
-	formatted += format(") %s;", layout.interface);
+	formatted += ')';
+}
+
+void ProgramCompiler::Formatter::visit(InterfaceLayout &layout)
+{
+	layout.layout.visit(*this);
+	formatted += format(" %s;", layout.interface);
 }
 
 void ProgramCompiler::Formatter::visit(StructDeclaration &strct)
@@ -346,6 +352,11 @@ void ProgramCompiler::Formatter::visit(StructDeclaration &strct)
 
 void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
 {
+	if(var.layout)
+	{
+		var.layout->visit(*this);
+		formatted += ' ';
+	}
 	if(var.constant)
 		formatted += "const ";
 	if(!var.sampling.empty())
@@ -478,6 +489,7 @@ void ProgramCompiler::DeclarationCombiner::visit(VariableDeclaration &var)
 	VariableDeclaration *&ptr = variables[var.name];
 	if(ptr)
 	{
+		ptr->type = var.type;
 		if(var.init_expression)
 			ptr->init_expression = var.init_expression;
 		remove_node = true;