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

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index aef17fa2..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())