X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.cpp;h=c15c8c0421b9aae64add279cf11b9c05a03753f6;hb=2280a09a286bbff2eb41783f8023863f320a3736;hp=1d82cae6a9ed95f20debbcf500a6a242c929c54a;hpb=9cfccf5c4e366e033cfd5eebf8955d2b13202b46;p=libs%2Fgl.git

diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp
index 1d82cae6..c15c8c04 100644
--- a/source/glsl/output.cpp
+++ b/source/glsl/output.cpp
@@ -14,10 +14,11 @@ Formatter::Formatter():
 	source_line(1),
 	indent(0),
 	parameter_list(false),
-	omit_builtin(false)
+	omit_builtin(false),
+	r_empty_name(false)
 { }
 
-const string &Formatter::apply(Stage &s)
+string Formatter::apply(Stage &s)
 {
 	stage = &s;
 	omit_builtin = true;
@@ -154,17 +155,22 @@ void Formatter::visit(Literal &literal)
 void Formatter::visit(VariableReference &var)
 {
 	append(var.name);
+	r_empty_name = false;
 }
 
 void Formatter::visit(InterfaceBlockReference &iface)
 {
-	append(iface.name);
+	r_empty_name = iface.declaration->instance_name.empty();
+	if(!r_empty_name)
+		append(iface.declaration->instance_name);
 }
 
 void Formatter::visit(MemberAccess &memacc)
 {
 	visit_expression(*memacc.left, memacc.oper, false);
-	append(format(".%s", memacc.member));
+	if(!r_empty_name)
+		append('.');
+	append(memacc.member);
 }
 
 void Formatter::visit(Swizzle &swizzle)