From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 25 Feb 2021 19:16:54 +0000 (+0200)
Subject: Tweak debug output
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=a666a62ba1db594a03b499e45886dab3a5a0f2a4

Tweak debug output
---

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index b3eabd75..018408c7 100644
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -10,8 +10,9 @@ 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);
+	append(format("Version: %d.%02d", stage.required_features.glsl_version.major, stage.required_features.glsl_version.minor));
 	last_branch();
 	stage.content.visit(*this);
 	return formatted;
@@ -79,13 +80,13 @@ 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));
 
 	for(std::set<InterfaceBlock *>::const_iterator i=block.interfaces.begin(); i!=block.interfaces.end(); ++i)
-		append(format("Interface %%%d %s %s", get_label(*i->second), i->second->interface, i->second->name));
+		append(format("Interface: %%%d %s %s", get_label(*i->second), i->second->interface, i->second->name));
 
 	bool labeled_body = (!block.types.empty() || !block.variables.empty());
 	if(labeled_body)
@@ -152,6 +153,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);
@@ -269,7 +274,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();