From ed3bfcde8987c646157f5450a24c2f5368b3ec9a Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 8 Mar 2021 00:03:25 +0200 Subject: [PATCH] Easier way of adding complex subtrees to GLSL debug dump --- source/glsl/debug.cpp | 109 +++++++++++++++++++----------------------- source/glsl/debug.h | 11 +++++ 2 files changed, 61 insertions(+), 59 deletions(-) diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp index 77b9025a..ed604fff 100644 --- a/source/glsl/debug.cpp +++ b/source/glsl/debug.cpp @@ -47,6 +47,25 @@ void DumpTree::append(const string &line) formatted += '\n'; } +void DumpTree::append_subtree(const vector &branches) +{ + begin_sub(); + for(vector::const_iterator i=branches.begin(); i!=branches.end(); ) + { + vector::const_iterator j = increment(i, branches); + if(!j->text.empty()) + { + if(j->node) + annotated_branch(j->text, *j->node); + else + append(j->text); + } + else + j->node->visit(*this); + } + end_sub(); +} + void DumpTree::begin_sub() { tree.back() = (tree.back()==BRANCH_LAST ? EMPTY : STRAIGHT); @@ -245,40 +264,30 @@ void DumpTree::visit(InterfaceLayout &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(); + vector branches; + if(type.base_type) + branches.push_back(format("%s: %%%d %s", (type.kind==BasicTypeDeclaration::ALIAS ? "Alias of" : "Base"), get_label(*type.base_type), type.base_type->name)); if(type.kind==BasicTypeDeclaration::VECTOR) - append(format("Vector: %d", type.size)); + branches.push_back(format("Vector: %d", type.size)); else if(type.kind==BasicTypeDeclaration::MATRIX) - append(format("Matrix: %dx%d", type.size&0xFFFF, type.size>>16)); - end_sub(); + branches.push_back(format("Matrix: %dx%d", type.size&0xFFFF, type.size>>16)); + append_subtree(branches); } 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)); + append(format("%%%d typedef %s", get_label(type), type.name)); - last_branch(); + vector branches; + branches.push_back(format("Dimensions: %s%s", dims[type.dimensions-1], (type.array ? " array" : ""))); + if(type.base_type) + branches.push_back(format("Element type: %%%d %s", get_label(*type.base_type), type.base_type->name)); if(type.shadow) - append("Shadow"); - - end_sub(); + branches.push_back("Shadow"); + append_subtree(branches); } void DumpTree::visit(StructDeclaration &strct) @@ -306,31 +315,21 @@ void DumpTree::visit(VariableDeclaration &var) decl += " (linked)"; append(decl); - begin_sub(); - if(!var.layout && !var.array && !var.init_expression) - last_branch(); + vector branches; 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(); + branches.push_back(format("Type: %%%d %s", get_label(*var.type_declaration), var.type_declaration->name)); if(var.layout) - var.layout->visit(*this); - - if(!var.init_expression) - last_branch(); + branches.push_back(var.layout.get()); if(var.array) { if(var.array_size) - annotated_branch("Array []", *var.array_size); + branches.push_back(Branch("Array []", var.array_size.get())); else - append("Array []"); + branches.push_back("Array []"); } - - last_branch(); if(var.init_expression) - var.init_expression->visit(*this); - end_sub(); + branches.push_back(var.init_expression.get()); + append_subtree(branches); } void DumpTree::visit(InterfaceBlock &block) @@ -358,6 +357,7 @@ void DumpTree::visit(FunctionDeclaration &func) else 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); @@ -372,24 +372,20 @@ void DumpTree::visit(FunctionDeclaration &func) void DumpTree::visit(Conditional &cond) { append("if()"); - begin_sub(); - cond.condition->visit(*this); - if(cond.else_body.body.empty()) - last_branch(); - cond.body.visit(*this); + + vector branches; + branches.push_back(cond.condition.get()); + branches.push_back(&cond.body); if(!cond.else_body.body.empty()) - { - last_branch(); - cond.else_body.visit(*this); - } - end_sub(); + branches.push_back(&cond.else_body); + append_subtree(branches); } void DumpTree::visit(Iteration &iter) { append("for()"); - begin_sub(); + begin_sub(); if(iter.init_statement) annotated_branch("Initialization", *iter.init_statement); if(iter.condition) @@ -398,20 +394,15 @@ void DumpTree::visit(Iteration &iter) annotated_branch("Loop", *iter.loop_expression); last_branch(); annotated_branch("Body", iter.body); - end_sub(); } void DumpTree::visit(Passthrough &pass) { - append("passthrough"); if(pass.subscript) - { - begin_sub(); - last_branch(); - pass.subscript->visit(*this); - end_sub(); - } + annotated_branch("passthrough[]", *pass.subscript); + else + append("passthrough;"); } void DumpTree::visit(Return &ret) diff --git a/source/glsl/debug.h b/source/glsl/debug.h index b2de993d..d873ea37 100644 --- a/source/glsl/debug.h +++ b/source/glsl/debug.h @@ -22,6 +22,16 @@ private: REACH = 0x2574 // ╴ }; + struct Branch + { + std::string text; + Node *node; + + Branch(const char *t, Node *n = 0): text(t), node(n) { } + Branch(const std::string &t, Node *n = 0): text(t), node(n) { } + Branch(Node *n): node(n) { } + }; + std::map node_labels; std::string formatted; std::vector tree; @@ -31,6 +41,7 @@ public: private: void append(const std::string &); + void append_subtree(const std::vector &); void begin_sub(); void last_branch(); void end_sub(); -- 2.43.0