From 3f899b1fc2e04f4fe74c99ad3e8ebb900c257214 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sun, 28 Feb 2021 16:10:09 +0200 Subject: [PATCH] Debug output tweaks --- source/glsl/debug.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp index b913f5b4..50d2b985 100644 --- a/source/glsl/debug.cpp +++ b/source/glsl/debug.cpp @@ -174,9 +174,7 @@ 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); @@ -299,14 +297,18 @@ void DumpTree::visit(InterfaceBlock &block) 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.definition) + text += " (undefined)"; + append(text); begin_sub(); for(NodeArray::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) + append(format("Definition: %%%d", get_label(*func.definition))); + else + func.body.visit(*this); end_sub(); } -- 2.43.0