X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fdebug.cpp;h=dd9db2f8ff760bdd92cd8e37fa24baa8141ee865;hb=a1ba04add302e7712d127b46d8d11386987a0aea;hp=fd1fd667257b788f86f4b523575d8af730afbd9d;hpb=f526938b407e061c7424adedc34af4d1ff687f90;p=libs%2Fgl.git

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index fd1fd667..dd9db2f8 100644
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -208,8 +208,32 @@ void DumpTree::visit(Assignment &assign)
 {
 	append(format("Assignment: %s%s -> %s", assign.oper->token, (assign.self_referencing ? " (self-referencing)" : ""), format_type(assign.type)));
 	begin_sub();
-	if(assign.target_declaration)
-		append(format("Target: %%%d %s %s", get_label(*assign.target_declaration), assign.target_declaration->type, assign.target_declaration->name));
+	if(assign.target.declaration)
+	{
+		string text = format("Target: %%%d", get_label(*assign.target.declaration));
+
+		static const char swizzle[4] = { 'x', 'y', 'z', 'w' };
+		for(unsigned i=0; i<assign.target.chain_len; ++i)
+		{
+			unsigned component = assign.target.chain[i];
+			switch(static_cast<Assignment::Target::ChainType>(component&0xC0))
+			{
+			case Assignment::Target::MEMBER:
+				text += format(" .%d", component&0x3F);
+				break;
+			case Assignment::Target::SWIZZLE:
+				text += " .";
+				for(unsigned j=0; j<4; ++j)
+					if(component&(1<<j))
+						text += swizzle[j];
+				break;
+			case Assignment::Target::ARRAY:
+				text += format(" [%d]", component&0x3F);
+				break;
+			}
+		}
+		append(text);
+	}
 	assign.left->visit(*this);
 	last_branch();
 	assign.right->visit(*this);
@@ -369,7 +393,7 @@ void DumpTree::visit(InterfaceBlock &block)
 
 void DumpTree::visit(FunctionDeclaration &func)
 {
-	string text = format("%%%d %s %s", get_label(func), func.return_type, func.name);
+	string text = format("%%%d %s %s%s", get_label(func), func.return_type, func.name, (func.signature.empty() ? "(?)" : func.signature));
 	if(func.source==BUILTIN_SOURCE)
 		text += " (builtin)";
 	else if(!func.definition)
@@ -377,6 +401,8 @@ void DumpTree::visit(FunctionDeclaration &func)
 	append(text);
 
 	begin_sub();
+	if(func.return_type_declaration)
+		append(format("Return type: %%%d %s", get_label(*func.return_type_declaration), func.return_type_declaration->name));
 	for(NodeArray<VariableDeclaration>::const_iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
 		(*i)->visit(*this);
 	last_branch();