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));
+
+ 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();
- visit(stage.content);
+ stage.content.visit(*this);
return formatted;
}
return label;
}
+string DumpTree::format_type(TypeDeclaration *type)
+{
+ return (type ? type->name : "?");
+}
+
template<typename T>
typename T::const_iterator DumpTree::increment(typename T::const_iterator &iter, const T &container)
{
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));
- bool labeled_body = (!block.types.empty() || !block.variables.empty());
+ bool labeled_body = !block.variables.empty();
if(labeled_body)
{
last_branch();
void DumpTree::visit(Literal &literal)
{
- append(format("Literal: %s", literal.token));
+ append(format("Literal: %s -> %s", literal.token, format_type(literal.type)));
}
void DumpTree::visit(ParenthesizedExpression &parexpr)
{
- annotated_branch("(expr)", *parexpr.expression);
+ annotated_branch(format("(expr) -> %s", format_type(parexpr.type)), *parexpr.expression);
}
void DumpTree::visit(VariableReference &var)
string text;
if(var.declaration)
text += format("%%%d ", get_label(*var.declaration));
- text += var.name;
+ text += format("%s (var) -> %s", var.name, format_type(var.type));
+ 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);
}
string text = "Member access:";
if(memacc.declaration)
text += format(" %%%d", get_label(*memacc.declaration));
- text += format(" .%s", memacc.member);
+ text += format(" .%s -> %s", memacc.member, format_type(memacc.type));
annotated_branch(text, *memacc.left);
}
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 -> %s", unary.oper->token, (unary.oper->type==Operator::PREFIX ? "pre" : "post"), format_type(unary.type));
+ annotated_branch(text, *unary.expression);
}
void DumpTree::visit(BinaryExpression &binary)
{
- append(format("Binary: %s%s", binary.oper, binary.after));
+ append(format("Binary: %s -> %s", (binary.oper->token[0]=='[' ? "[]" : binary.oper->token), format_type(binary.type)));
begin_sub();
binary.left->visit(*this);
last_branch();
void DumpTree::visit(Assignment &assign)
{
- append(format("Assignment: %s%s", assign.oper, (assign.self_referencing ? " (self-referencing)" : "")));
+ append(format("Assignment: %s%s -> %s", assign.oper->token, (assign.self_referencing ? " (self-referencing)" : ""), format_type(assign.type)));
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);
head += call.name;
if(call.constructor)
head += " (constructor)";
+ head += format(" -> %s", format_type(call.type));
append(head);
begin_sub();
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);
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)
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();
}