X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fdebug.cpp;h=810ac742f43e906580d8abe6f69c136514df4dc4;hb=c315e77b7791fe92d42e1566b5adaddf2699a758;hp=ddf1013dda2b5a70b00619c821652ae7d50f9e15;hpb=911c6c4acc8218bc40d93917207f9dc32e9f2596;p=libs%2Fgl.git

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index ddf1013d..810ac742 100644
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -21,7 +21,7 @@ const std::string &DumpTree::apply(Stage &stage)
 	for(std::map<string, InterfaceBlock *>::const_iterator i=stage.interface_blocks.begin(); i!=stage.interface_blocks.end(); ++i)
 		if(seen_interfaces.insert(i->second).second)
 		{
-			string text = format("Interface block: %%%d %s %s", get_label(*i->second), i->second->interface, i->second->name);
+			string text = format("Interface block: %%%d %s %s", get_label(*i->second), i->second->interface, i->second->block_name);
 			if(!i->second->instance_name.empty())
 				text += format(" %s", i->second->instance_name);
 			append(text);
@@ -146,11 +146,6 @@ void DumpTree::visit(Literal &literal)
 	append(format("Literal: %s -> %s", literal.token, format_type(literal.type)));
 }
 
-void DumpTree::visit(ParenthesizedExpression &parexpr)
-{
-	annotated_branch(format("(expr) -> %s", format_type(parexpr.type)), *parexpr.expression);
-}
-
 void DumpTree::visit(VariableReference &var)
 {
 	string text;
@@ -382,7 +377,7 @@ void DumpTree::visit(InterfaceBlock &iface)
 	string head;
 	if(!iface.instance_name.empty())
 		head += format("%%%d ", get_label(iface));
-	head += format("%s %s", iface.interface, iface.name);
+	head += format("%s %s", iface.interface, iface.block_name);
 	if(!iface.instance_name.empty())
 		head += format(" %s", iface.instance_name);
 	if(iface.array)
@@ -393,13 +388,14 @@ void DumpTree::visit(InterfaceBlock &iface)
 		head += " (linked)";
 	append(head);
 
-	begin_sub();
-	last_branch();
+	vector<Branch> branches;
 	if(iface.type_declaration)
 		append(format("Type: %%%d %s", get_label(*iface.type_declaration), iface.type_declaration->name));
-	else if(iface.members)
-		iface.members->visit(*this);
-	end_sub();
+	if(iface.layout)
+		branches.push_back(Branch("Layout", iface.layout.get()));
+	if(iface.members)
+		branches.push_back(Branch("Members", iface.members.get()));
+	append_subtree(branches);
 }
 
 void DumpTree::visit(FunctionDeclaration &func)