X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fdebug.cpp;h=62cf7a94701ec04169c39748fbad6c84b46d58d2;hb=bd8816692056230c36504dcccd76c6946dff47b1;hp=0a5b6ef375be2efccb77261fdf6c9e124c4f2b05;hpb=48fa4e32b654aa1f2107caf266c3bdda9cc74847;p=libs%2Fgl.git

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index 0a5b6ef3..62cf7a94 100644
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -10,14 +10,11 @@ namespace SL {
 
 const std::string &DumpTree::apply(Stage &stage)
 {
-	formatted = format("Stage %s\n", Stage::get_stage_name(stage.type));
+	formatted = format("Stage: %s\n", Stage::get_stage_name(stage.type));
 	tree.push_back(BRANCH);
-	for(map<string, VariableDeclaration *>::const_iterator i=stage.in_variables.begin(); i!=stage.in_variables.end(); ++i)
-		append(format("Input: %%%d %s %s", get_label(*i->second), i->second->type, i->first));
-	for(map<string, VariableDeclaration *>::const_iterator i=stage.out_variables.begin(); i!=stage.out_variables.end(); ++i)
-		append(format("Output: %%%d %s %s", get_label(*i->second), i->second->type, i->first));
+	append(format("Version: %d.%02d", stage.required_features.glsl_version.major, stage.required_features.glsl_version.minor));
 	last_branch();
-	visit(stage.content);
+	stage.content.visit(*this);
 	return formatted;
 }
 
@@ -83,10 +80,20 @@ void DumpTree::visit(Block &block)
 	begin_sub();
 
 	for(std::map<string, StructDeclaration *>::const_iterator i=block.types.begin(); i!=block.types.end(); ++i)
-		append(format("Type %%%d %s", get_label(*i->second), i->first));
+		append(format("Type: %%%d %s", get_label(*i->second), i->first));
 
 	for(std::map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
-		append(format("Variable %%%d %s %s", get_label(*i->second), i->second->type, i->first));
+		append(format("Variable: %%%d %s %s", get_label(*i->second), i->second->type, i->first));
+
+	set<InterfaceBlock *> seen_interfaces;
+	for(std::map<string, InterfaceBlock *>::const_iterator i=block.interfaces.begin(); i!=block.interfaces.end(); ++i)
+		if(seen_interfaces.insert(i->second).second)
+		{
+			string text = format("Interface: %%%d %s %s", get_label(*i->second), i->second->interface, i->second->name);
+			if(!i->second->instance_name.empty())
+				text += format(" %s", i->second->instance_name);
+			append(text);
+		}
 
 	bool labeled_body = (!block.types.empty() || !block.variables.empty());
 	if(labeled_body)
@@ -121,13 +128,26 @@ void DumpTree::visit(VariableReference &var)
 	string text;
 	if(var.declaration)
 		text += format("%%%d ", get_label(*var.declaration));
-	text += var.name;
+	text += format("%s (var)", var.name);
+	append(text);
+}
+
+void DumpTree::visit(InterfaceBlockReference &iface)
+{
+	string text;
+	if(iface.declaration)
+		text += format("%%%d ", get_label(*iface.declaration));
+	text += format("%s (iface)", iface.name);
 	append(text);
 }
 
 void DumpTree::visit(MemberAccess &memacc)
 {
-	annotated_branch(format("Member access: .%s", memacc.member), *memacc.left);
+	string text = "Member access:";
+	if(memacc.declaration)
+		text += format(" %%%d", get_label(*memacc.declaration));
+	text += format(" .%s", memacc.member);
+	annotated_branch(text, *memacc.left);
 }
 
 void DumpTree::visit(UnaryExpression &unary)
@@ -149,6 +169,10 @@ void DumpTree::visit(Assignment &assign)
 {
 	append(format("Assignment: %s%s", assign.oper, (assign.self_referencing ? " (self-referencing)" : "")));
 	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));
+	}
 	assign.left->visit(*this);
 	last_branch();
 	assign.right->visit(*this);
@@ -196,9 +220,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();
@@ -241,7 +265,12 @@ void DumpTree::visit(VariableDeclaration &var)
 	if(!var.init_expression)
 		last_branch();
 	if(var.array)
-		annotated_branch("Array []", *var.array_size);
+	{
+		if(var.array_size)
+			annotated_branch("Array []", *var.array_size);
+		else
+			append("Array []");
+	}
 
 	last_branch();
 	if(var.init_expression)
@@ -251,7 +280,17 @@ void DumpTree::visit(VariableDeclaration &var)
 
 void DumpTree::visit(InterfaceBlock &block)
 {
-	annotated_branch(format("%s %s", block.interface, block.name), block.members);
+	string head;
+	if(!block.instance_name.empty())
+		head += format("%%%d ", get_label(block));
+	head += format("%s %s", block.interface, block.name);
+	if(!block.instance_name.empty())
+		head += format(" %s", block.instance_name);
+	if(block.array)
+		head += "[]";
+	if(block.linked_block)
+		head += " (linked)";
+	annotated_branch(head, block.members);
 }
 
 void DumpTree::visit(FunctionDeclaration &func)
@@ -261,7 +300,7 @@ void DumpTree::visit(FunctionDeclaration &func)
 	for(NodeArray<VariableDeclaration>::const_iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
 		(*i)->visit(*this);
 	if(func.definition)
-		append(format("Definition %%%d", get_label(*func.definition)));
+		append(format("Definition: %%%d", get_label(*func.definition)));
 	last_branch();
 	func.body.visit(*this);
 	end_sub();
@@ -300,6 +339,18 @@ void DumpTree::visit(Iteration &iter)
 	end_sub();
 }
 
+void DumpTree::visit(Passthrough &pass)
+{
+	append("passthrough");
+	if(pass.subscript)
+	{
+		begin_sub();
+		last_branch();
+		pass.subscript->visit(*this);
+		end_sub();
+	}
+}
+
 void DumpTree::visit(Return &ret)
 {
 	if(ret.expression)