X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.cpp;h=46314588858667c059a80c131bb6f527b3ba9bc6;hb=90c3973fcadf28e25797656154e42dd3d2915144;hp=3fc703c1966d9b4a9c745f7f3ee8e49aa55c5af8;hpb=c0be4e4ae1a8b6ac31ff6b7080e2242c13d947ff;p=libs%2Fgl.git

diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp
index 3fc703c1..46314588 100644
--- a/source/glsl/output.cpp
+++ b/source/glsl/output.cpp
@@ -186,9 +186,9 @@ void Formatter::visit(Layout &layout)
 	{
 		if(i!=layout.qualifiers.begin())
 			append(", ");
-		append(i->identifier);
-		if(!i->value.empty())
-			append(format("=%s", i->value));
+		append(i->name);
+		if(i->has_value)
+			append(format("=%d", i->value));
 	}
 	append(')');
 }
@@ -341,6 +341,18 @@ void Formatter::visit(Iteration &iter)
 	}
 }
 
+void Formatter::visit(Passthrough &pass)
+{
+	append("passthrough");
+	if(pass.subscript)
+	{
+		append('[');
+		pass.subscript->visit(*this);
+		append(']');
+	}
+	append(';');
+}
+
 void Formatter::visit(Return &ret)
 {
 	append("return");