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

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index 68615ed6..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;
@@ -196,7 +191,7 @@ void DumpTree::visit(UnaryExpression &unary)
 
 void DumpTree::visit(BinaryExpression &binary)
 {
-	append(format("Binary: %s -> %s", (binary.oper->token[0]=='[' ? "[]" : binary.oper->token), format_type(binary.type)));
+	append(format("Binary: %s%s -> %s", binary.oper->token, binary.oper->token2, format_type(binary.type)));
 	begin_sub();
 	binary.left->visit(*this);
 	last_branch();
@@ -240,6 +235,17 @@ void DumpTree::visit(Assignment &assign)
 	end_sub();
 }
 
+void DumpTree::visit(TernaryExpression &ternary)
+{
+	append(format("Ternary: %s%s -> %s", ternary.oper->token, ternary.oper->token2, format_type(ternary.type)));
+	begin_sub();
+	ternary.condition->visit(*this);
+	ternary.true_expr->visit(*this);
+	last_branch();
+	ternary.false_expr->visit(*this);
+	end_sub();
+}
+
 void DumpTree::visit(FunctionCall &call)
 {
 	string head = "Function call: ";
@@ -371,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)
@@ -382,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)