X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fdebug.cpp;h=d49b9a5f142e8a09b29bcc304e7c29056b87f412;hb=e97feb2fdd27af970412eea6a03cc7270032a80b;hp=b3eabd75de3c2aacab570ef6531b4ba4ce556fa5;hpb=f08bd843fbe63a0bf5bcbc21308f2751d08f00c1;p=libs%2Fgl.git

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index b3eabd75..d49b9a5f 100644
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -10,8 +10,26 @@ 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));
+
+	for(std::map<string, TypeDeclaration *>::const_iterator i=stage.types.begin(); i!=stage.types.end(); ++i)
+		append(format("Type: %%%d %s", get_label(*i->second), i->first));
+
+	set<InterfaceBlock *> seen_interfaces;
+	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);
+			if(!i->second->instance_name.empty())
+				text += format(" %s", i->second->instance_name);
+			append(text);
+		}
+
+	for(std::map<string, FunctionDeclaration *>::const_iterator i=stage.functions.begin(); i!=stage.functions.end(); ++i)
+		append(format("Function: %%%d %s", get_label(*i->second), i->first));
+
 	last_branch();
 	stage.content.visit(*this);
 	return formatted;
@@ -78,16 +96,10 @@ void DumpTree::visit(Block &block)
 	append(format("Block %s", (block.use_braces ? "{}" : "(inline)")));
 	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));
-
 	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));
-
-	bool labeled_body = (!block.types.empty() || !block.variables.empty());
+	bool labeled_body = !block.variables.empty();
 	if(labeled_body)
 	{
 		last_branch();
@@ -120,7 +132,16 @@ 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);
 }
 
@@ -135,12 +156,13 @@ void DumpTree::visit(MemberAccess &memacc)
 
 void DumpTree::visit(UnaryExpression &unary)
 {
-	annotated_branch(format("Unary: %s, %sfix", unary.oper, (unary.prefix ? "pre" : "suff")), *unary.expression);
+	string text = format("Unary: %s, %sfix", unary.oper->token, (unary.oper->type==Operator::PREFIX ? "pre" : "post"));
+	annotated_branch(text, *unary.expression);
 }
 
 void DumpTree::visit(BinaryExpression &binary)
 {
-	append(format("Binary: %s%s", binary.oper, binary.after));
+	append(format("Binary: %s", (binary.oper->token[0]=='[' ? "[]" : binary.oper->token)));
 	begin_sub();
 	binary.left->visit(*this);
 	last_branch();
@@ -150,8 +172,10 @@ void DumpTree::visit(BinaryExpression &binary)
 
 void DumpTree::visit(Assignment &assign)
 {
-	append(format("Assignment: %s%s", assign.oper, (assign.self_referencing ? " (self-referencing)" : "")));
+	append(format("Assignment: %s%s", assign.oper->token, (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);
@@ -212,6 +236,45 @@ void DumpTree::visit(InterfaceLayout &layout)
 	annotated_branch(format("Layout: %s", layout.interface), layout.layout);
 }
 
+void DumpTree::visit(BasicTypeDeclaration &type)
+{
+	append(format("%%%d typedef %s", get_label(type), type.name));
+	begin_sub();
+	if(type.kind!=BasicTypeDeclaration::VECTOR && type.kind!=BasicTypeDeclaration::MATRIX)
+		last_branch();
+	if(type.base_type)
+		append(format("%s: %%%d %s", (type.kind==BasicTypeDeclaration::ALIAS ? "Alias of" : "Base"), get_label(*type.base_type), type.base_type->name));
+
+	last_branch();
+	if(type.kind==BasicTypeDeclaration::VECTOR)
+		append(format("Vector: %d", type.size));
+	else if(type.kind==BasicTypeDeclaration::MATRIX)
+		append(format("Matrix: %dx%d", type.size&0xFFFF, type.size>>16));
+	end_sub();
+}
+
+void DumpTree::visit(ImageTypeDeclaration &type)
+{
+	append(format("%%%d typedef %s", get_label(type), type.name));
+	begin_sub();
+
+	if(!type.shadow && !type.base_type)
+		last_branch();
+	static const char *dims[] = { "1D", "2D", "3D", "Cube" };
+	append(format("Dimensions: %s%s", dims[type.dimensions-1], (type.array ? " array" : "")));
+
+	if(!type.shadow)
+		last_branch();
+	if(type.base_type)
+		append(format("Element type: %%%d %s", get_label(*type.base_type), type.base_type->name));
+
+	last_branch();
+	if(type.shadow)
+		append("Shadow");
+
+	end_sub();
+}
+
 void DumpTree::visit(StructDeclaration &strct)
 {
 	annotated_branch(format("%%%d struct %s", get_label(strct), strct.name), strct.members);
@@ -231,11 +294,18 @@ 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)
+	if(var.source==BUILTIN_SOURCE)
+		decl += " (builtin)";
+	else if(var.linked_declaration)
 		decl += " (linked)";
 	append(decl);
 
 	begin_sub();
+	if(!var.layout && !var.array && !var.init_expression)
+		last_branch();
+	if(var.type_declaration)
+		append(format("Type: %%%d %s", get_label(*var.type_declaration), var.type_declaration->name));
+
 	if(!var.array && !var.init_expression)
 		last_branch();
 	if(var.layout)
@@ -259,19 +329,37 @@ 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.source==BUILTIN_SOURCE)
+		head += " (builtin)";
+	else if(block.linked_block)
+		head += " (linked)";
+	annotated_branch(head, block.members);
 }
 
 void DumpTree::visit(FunctionDeclaration &func)
 {
-	append(format("%%%d %s %s()", get_label(func), func.return_type, func.name));
+	string text = format("%%%d %s %s", get_label(func), func.return_type, func.name);
+	if(func.source==BUILTIN_SOURCE)
+		text += " (builtin)";
+	else if(!func.definition)
+		text += " (undefined)";
+	append(text);
 	begin_sub();
 	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)));
 	last_branch();
-	func.body.visit(*this);
+	if(func.definition==&func)
+		func.body.visit(*this);
+	else if(func.definition)
+		append(format("Definition: %%%d", get_label(*func.definition)));
 	end_sub();
 }