X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fdebug.cpp;h=2bc3a893e099384e16c663cfdfd601e3a945d85d;hb=ffdb126a55467245da08a9e6f5669f86e1899bb0;hp=80346dd0af6a86cc09c13785335c7aad28a2108d;hpb=d2f75fa9ccf8252ff8a750071b26e77047a346cb;p=libs%2Fgl.git

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index 80346dd0..2bc3a893 100644
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -147,7 +147,7 @@ void DumpTree::visit(BinaryExpression &binary)
 
 void DumpTree::visit(Assignment &assign)
 {
-	append(format("Assignment%s", (assign.self_referencing ? " (self-referencing)" : "")));
+	append(format("Assignment: %s%s", assign.oper, (assign.self_referencing ? " (self-referencing)" : "")));
 	begin_sub();
 	assign.left->visit(*this);
 	last_branch();
@@ -157,11 +157,12 @@ void DumpTree::visit(Assignment &assign)
 
 void DumpTree::visit(FunctionCall &call)
 {
-	string head = format("Function call: %s", call.name);
+	string head = "Function call: ";
 	if(call.declaration)
-		head += format(", declaration %%%d", get_label(*call.declaration));
+		head += format("%%%d ", get_label(*call.declaration));
+	head += call.name;
 	if(call.constructor)
-		head += ", constructor";
+		head += " (constructor)";
 	append(head);
 
 	begin_sub();
@@ -195,9 +196,9 @@ void DumpTree::visit(Layout &layout)
 	for(vector<Layout::Qualifier>::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); )
 	{
 		vector<Layout::Qualifier>::const_iterator j = increment(i, layout.qualifiers);
-		string qualifier = j->identifier;
-		if(!j->value.empty())
-			qualifier += format("=%s", j->value);
+		string qualifier = j->name;
+		if(j->has_value)
+			qualifier += format("=%d", j->value);
 		append(qualifier);
 	}
 	end_sub();
@@ -227,6 +228,8 @@ void DumpTree::visit(VariableDeclaration &var)
 	if(!var.precision.empty())
 		decl += format("%s ", var.precision);
 	decl += format("%s %s", var.type, var.name);
+	if(var.linked_declaration)
+		decl += " (linked)";
 	append(decl);
 
 	begin_sub();