X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=82a324dec52d8e7c9e92b8d8c56cb15264e423f3;hb=a0caabaed3aeb8947133d78986bfb4ae5ae3c893;hp=2bb2694609f89277b9d36efc50a0df5de0354d34;hpb=a209ca32465c61b38f3a57ee6577568f3994e8ab;p=libs%2Fgl.git

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index 2bb26946..82a324de 100644
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -4,6 +4,7 @@
 #include "error.h"
 #include "program.h"
 #include "programcompiler.h"
+#include "resources.h"
 #include "shader.h"
 
 using namespace std;
@@ -34,17 +35,20 @@ namespace GL {
 using namespace ProgramSyntax;
 
 ProgramCompiler::ProgramCompiler():
+	resources(0),
 	module(0)
 { }
 
 void ProgramCompiler::compile(const string &source)
 {
+	resources = 0;
 	module = &parser.parse(source);
 	process();
 }
 
-void ProgramCompiler::compile(IO::Base &io)
+void ProgramCompiler::compile(IO::Base &io, Resources *res)
 {
+	resources = res;
 	module = &parser.parse(io);
 	process();
 }
@@ -58,11 +62,11 @@ void ProgramCompiler::add_shaders(Program &program)
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 	{
 		if(i->type==VERTEX)
-			program.attach_shader_owned(new VertexShader(head+create_source(*i)));
+			program.attach_shader_owned(new VertexShader(head+apply<Formatter>(*i)));
 		else if(i->type==GEOMETRY)
-			program.attach_shader_owned(new GeometryShader(head+create_source(*i)));
+			program.attach_shader_owned(new GeometryShader(head+apply<Formatter>(*i)));
 		else if(i->type==FRAGMENT)
-			program.attach_shader_owned(new FragmentShader(head+create_source(*i)));
+			program.attach_shader_owned(new FragmentShader(head+apply<Formatter>(*i)));
 	}
 
 	program.bind_attribute(VERTEX4, "vertex");
@@ -102,6 +106,11 @@ Stage *ProgramCompiler::get_builtins(StageType type)
 
 void ProgramCompiler::process()
 {
+	list<Import *> imports = apply<NodeGatherer<Import> >(module->shared);
+	for(list<Import *>::iterator i=imports.end(); i!=imports.begin(); )
+		import((*--i)->module);
+	apply<NodeRemover>(module->shared, set<Node *>(imports.begin(), imports.end()));
+
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		generate(*i);
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
@@ -113,6 +122,39 @@ void ProgramCompiler::process()
 	}
 }
 
+void ProgramCompiler::import(const string &name)
+{
+	if(!resources)
+		throw runtime_error("no resources");
+	RefPtr<IO::Seekable> io = resources->open_raw(name+".glsl");
+	if(!io)
+		throw runtime_error(format("module %s not found", name));
+	ProgramParser import_parser;
+	Module &imported_module = import_parser.parse(*io);
+
+	inject_block(module->shared.content, imported_module.shared.content);
+	apply<DeclarationCombiner>(module->shared);
+	for(list<Stage>::iterator i=imported_module.stages.begin(); i!=imported_module.stages.end(); ++i)
+	{
+		list<Stage>::iterator j;
+		for(j=module->stages.begin(); (j!=module->stages.end() && j->type<i->type); ++j) ;
+		if(j==module->stages.end() || j->type>i->type)
+		{
+			j = module->stages.insert(j, *i);
+			list<Stage>::iterator k = j;
+			if(++k!=module->stages.end())
+				k->previous = &*j;
+			if(j!=module->stages.begin())
+				j->previous = &*--(k=j);
+		}
+		else
+		{
+			inject_block(j->content, i->content);
+			apply<DeclarationCombiner>(*j);
+		}
+	}
+}
+
 void ProgramCompiler::generate(Stage &stage)
 {
 	inject_block(stage.content, module->shared.content);
@@ -125,14 +167,10 @@ void ProgramCompiler::generate(Stage &stage)
 
 bool ProgramCompiler::optimize(Stage &stage)
 {
-	UnusedVariableLocator unused_locator;
-	unused_locator.apply(stage);
+	set<Node *> unused = apply<UnusedVariableLocator>(stage);
+	apply<NodeRemover>(stage, unused);
 
-	NodeRemover remover;
-	remover.to_remove = unused_locator.unused_nodes;
-	remover.apply(stage);
-
-	return !unused_locator.unused_nodes.empty();
+	return !unused.empty();
 }
 
 void ProgramCompiler::inject_block(Block &target, const Block &source)
@@ -143,17 +181,19 @@ void ProgramCompiler::inject_block(Block &target, const Block &source)
 }
 
 template<typename T>
-void ProgramCompiler::apply(Stage &stage)
+typename T::ResultType ProgramCompiler::apply(Stage &stage)
 {
 	T visitor;
 	visitor.apply(stage);
+	return visitor.get_result();
 }
 
-string ProgramCompiler::create_source(Stage &stage)
+template<typename T, typename A>
+typename T::ResultType ProgramCompiler::apply(Stage &stage, const A &arg)
 {
-	Formatter formatter;
-	formatter.apply(stage);
-	return formatter.formatted;
+	T visitor(arg);
+	visitor.apply(stage);
+	return visitor.get_result();
 }
 
 
@@ -171,7 +211,7 @@ void ProgramCompiler::Visitor::apply(Stage &s)
 ProgramCompiler::Formatter::Formatter():
 	indent(0),
 	parameter_list(false),
-	else_if(false)
+	else_if(0)
 { }
 
 void ProgramCompiler::Formatter::visit(Literal &literal)
@@ -209,14 +249,18 @@ void ProgramCompiler::Formatter::visit(UnaryExpression &unary)
 void ProgramCompiler::Formatter::visit(BinaryExpression &binary)
 {
 	binary.left->visit(*this);
-	if(binary.assignment)
-		formatted += format(" %s ", binary.oper);
-	else
-		formatted += binary.oper;
+	formatted += binary.oper;
 	binary.right->visit(*this);
 	formatted += binary.after;
 }
 
+void ProgramCompiler::Formatter::visit(Assignment &assign)
+{
+	assign.left->visit(*this);
+	formatted += format(" %s ", assign.oper);
+	assign.right->visit(*this);
+}
+
 void ProgramCompiler::Formatter::visit(FunctionCall &call)
 {
 	formatted += format("%s(", call.name);
@@ -237,31 +281,32 @@ void ProgramCompiler::Formatter::visit(ExpressionStatement &expr)
 
 void ProgramCompiler::Formatter::visit(Block &block)
 {
-	if(block.use_braces)
-	{
-		if(else_if)
-		{
-			formatted += '\n';
-			else_if = false;
-		}
-		formatted += format("%s{\n", string(indent*2, ' '));
-	}
+	if(else_if)
+		--else_if;
+
+	unsigned brace_indent = indent;
+	bool use_braces = (block.use_braces || (indent && block.body.size()!=1));
+	if(use_braces)
+		formatted += format("%s{\n", string(brace_indent*2, ' '));
 
-	bool change_indent = (!formatted.empty() && !else_if);
-	indent += change_indent;
+	SetForScope<unsigned> set(indent, indent+!formatted.empty());
 	string spaces(indent*2, ' ');
 	for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
 	{
 		if(i!=block.body.begin())
 			formatted += '\n';
-		if(!else_if)
-			formatted += spaces;
+		formatted += spaces;
 		(*i)->visit(*this);
+		else_if = 0;
 	}
-	indent -= change_indent;
 
-	if(block.use_braces)
-		formatted += format("\n%s}", string(indent*2, ' '));
+	if(use_braces)
+		formatted += format("\n%s}", string(brace_indent*2, ' '));
+}
+
+void ProgramCompiler::Formatter::visit(Import &import)
+{
+	formatted += format("import %s;", import.module);
 }
 
 void ProgramCompiler::Formatter::visit(Layout &layout)
@@ -329,7 +374,7 @@ void ProgramCompiler::Formatter::visit(FunctionDeclaration &func)
 		(*i)->visit(*this);
 	}
 	formatted += ')';
-	if(func.definition)
+	if(func.definition==&func)
 	{
 		formatted += '\n';
 		func.body.visit(*this);
@@ -341,10 +386,9 @@ void ProgramCompiler::Formatter::visit(FunctionDeclaration &func)
 void ProgramCompiler::Formatter::visit(Conditional &cond)
 {
 	if(else_if)
-	{
-		formatted += ' ';
-		else_if = false;
-	}
+		formatted.replace(formatted.rfind('\n'), string::npos, 1, ' ');
+
+	indent -= else_if;
 
 	formatted += "if(";
 	cond.condition->visit(*this);
@@ -353,8 +397,8 @@ void ProgramCompiler::Formatter::visit(Conditional &cond)
 	cond.body.visit(*this);
 	if(!cond.else_body.body.empty())
 	{
-		formatted += format("\n%selse", string(indent*2, ' '));
-		SetFlag set(else_if);
+		formatted += format("\n%selse\n", string(indent*2, ' '));
+		SetForScope<unsigned> set(else_if, 2);
 		cond.else_body.visit(*this);
 	}
 }
@@ -379,8 +423,61 @@ void ProgramCompiler::Formatter::visit(Return &ret)
 }
 
 
+ProgramCompiler::DeclarationCombiner::DeclarationCombiner():
+	toplevel(true),
+	remove_node(false)
+{ }
+
+void ProgramCompiler::DeclarationCombiner::visit(Block &block)
+{
+	if(!toplevel)
+		return;
+
+	SetForScope<bool> set(toplevel, false);
+	for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+	{
+		remove_node = false;
+		(*i)->visit(*this);
+		if(remove_node)
+			block.body.erase(i++);
+		else
+			++i;
+	}
+}
+
+void ProgramCompiler::DeclarationCombiner::visit(FunctionDeclaration &func)
+{
+	vector<FunctionDeclaration *> &decls = functions[func.name];
+	if(func.definition)
+	{
+		for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
+		{
+			(*i)->definition = func.definition;
+			(*i)->body.body.clear();
+		}
+	}
+	decls.push_back(&func);
+}
+
+void ProgramCompiler::DeclarationCombiner::visit(VariableDeclaration &var)
+{
+	VariableDeclaration *&ptr = variables[var.name];
+	if(ptr)
+	{
+		if(var.init_expression)
+			ptr->init_expression = var.init_expression;
+		remove_node = true;
+	}
+	else
+		ptr = &var;
+}
+
+
 ProgramCompiler::VariableResolver::VariableResolver():
-	anonymous(false)
+	anonymous(false),
+	record_target(false),
+	assignment_target(0),
+	self_referencing(false)
 { }
 
 void ProgramCompiler::VariableResolver::apply(Stage &s)
@@ -417,6 +514,19 @@ void ProgramCompiler::VariableResolver::visit(VariableReference &var)
 			break;
 		}
 	}
+
+	if(record_target)
+	{
+		if(assignment_target)
+		{
+			record_target = false;
+			assignment_target = 0;
+		}
+		else
+			assignment_target = var.declaration;
+	}
+	else if(var.declaration && var.declaration==assignment_target)
+		self_referencing = true;
 }
 
 void ProgramCompiler::VariableResolver::visit(MemberAccess &memacc)
@@ -441,7 +551,10 @@ void ProgramCompiler::VariableResolver::visit(BinaryExpression &binary)
 {
 	if(binary.oper=="[")
 	{
-		binary.right->visit(*this);
+		{
+			SetForScope<bool> set(record_target, false);
+			binary.right->visit(*this);
+		}
 		type = 0;
 		binary.left->visit(*this);
 	}
@@ -452,6 +565,21 @@ void ProgramCompiler::VariableResolver::visit(BinaryExpression &binary)
 	}
 }
 
+void ProgramCompiler::VariableResolver::visit(Assignment &assign)
+{
+	{
+		SetFlag set(record_target);
+		assignment_target = 0;
+		assign.left->visit(*this);
+	}
+
+	self_referencing = false;
+	assign.right->visit(*this);
+
+	assign.self_referencing = (self_referencing || assign.oper!="=");
+	assign.target_declaration = assignment_target;
+}
+
 void ProgramCompiler::VariableResolver::visit(StructDeclaration &strct)
 {
 	TraversingVisitor::visit(strct);
@@ -571,13 +699,12 @@ bool ProgramCompiler::InterfaceGenerator::generate_interface(VariableDeclaration
 
 void ProgramCompiler::InterfaceGenerator::insert_assignment(const string &left, ProgramSyntax::Expression *right)
 {
-	BinaryExpression *assign = new BinaryExpression;
+	Assignment *assign = new Assignment;
 	VariableReference *ref = new VariableReference;
 	ref->name = left;
 	assign->left = ref;
 	assign->oper = "=";
 	assign->right = right;
-	assign->assignment = true;
 
 	ExpressionStatement *stmt = new ExpressionStatement;
 	stmt->expression = assign;
@@ -714,40 +841,40 @@ void ProgramCompiler::VariableRenamer::visit(VariableDeclaration &var)
 
 ProgramCompiler::UnusedVariableLocator::UnusedVariableLocator():
 	aggregate(0),
-	assignment(false),
-	record_target(false),
-	assignment_target(0),
-	indeterminate_target(false),
-	self_referencing(false)
+	assignment(0),
+	assignment_target(false)
 { }
 
-void ProgramCompiler::UnusedVariableLocator::visit(VariableReference &var)
+void ProgramCompiler::UnusedVariableLocator::apply(Stage &s)
 {
-	if(record_target)
-	{
-		if(assignment_target)
-			indeterminate_target = true;
-		else
-			assignment_target = var.declaration;
-	}
-	else
-	{
-		unused_nodes.erase(var.declaration);
-
-		map<VariableDeclaration *, Node *>::iterator i = assignments.find(var.declaration);
-		if(i!=assignments.end())
-		{
-			unused_nodes.erase(i->second);
-			assignments.erase(i);
-		}
+	assignments.push_back(BlockAssignmentMap());
+	Visitor::apply(s);
+	assignments.pop_back();
+}
 
-		if(assignment && var.declaration==assignment_target)
-			self_referencing = true;
-	}
+void ProgramCompiler::UnusedVariableLocator::visit(VariableReference &var)
+{
+	unused_nodes.erase(var.declaration);
 
 	map<VariableDeclaration *, Node *>::iterator i = aggregates.find(var.declaration);
 	if(i!=aggregates.end())
 		unused_nodes.erase(i->second);
+
+	if(assignment_target)
+		return;
+
+	for(vector<BlockAssignmentMap>::iterator j=assignments.end(); j!=assignments.begin(); )
+	{
+		--j;
+		BlockAssignmentMap::iterator k = j->find(var.declaration);
+		if(k!=j->end())
+		{
+			for(vector<Node *>::iterator l=k->second.nodes.begin(); l!=k->second.nodes.end(); ++l)
+				unused_nodes.erase(*l);
+			j->erase(k);
+			break;
+		}
+	}
 }
 
 void ProgramCompiler::UnusedVariableLocator::visit(MemberAccess &memacc)
@@ -758,48 +885,44 @@ void ProgramCompiler::UnusedVariableLocator::visit(MemberAccess &memacc)
 
 void ProgramCompiler::UnusedVariableLocator::visit(BinaryExpression &binary)
 {
-	if(binary.assignment)
-	{
-		assignment = true;
-		{
-			SetFlag set(record_target);
-			binary.left->visit(*this);
-		}
-		if(binary.oper!="=")
-			self_referencing = true;
-		binary.right->visit(*this);
-	}
-	else if(record_target && binary.oper=="[")
+	if(binary.oper=="[")
 	{
 		binary.left->visit(*this);
-		SetForScope<bool> set(record_target, false);
+		SetForScope<bool> set(assignment_target, false);
 		binary.right->visit(*this);
 	}
 	else
 		TraversingVisitor::visit(binary);
 }
 
+void ProgramCompiler::UnusedVariableLocator::visit(Assignment &assign)
+{
+	{
+		SetForScope<bool> set(assignment_target, !assign.self_referencing);
+		assign.left->visit(*this);
+	}
+	assign.right->visit(*this);
+	assignment = &assign;
+}
+
+void ProgramCompiler::UnusedVariableLocator::record_assignment(VariableDeclaration &var, Node &node, bool self_ref)
+{
+	unused_nodes.insert(&node);
+	BlockAssignmentMap &block_assignments = assignments.back();
+	AssignmentList &var_assignments = block_assignments[&var];
+	if(!self_ref)
+		var_assignments.nodes.clear();
+	var_assignments.nodes.push_back(&node);
+	var_assignments.conditional = false;
+	var_assignments.self_referencing = self_ref;
+}
+
 void ProgramCompiler::UnusedVariableLocator::visit(ExpressionStatement &expr)
 {
-	assignment = false;
-	assignment_target = 0;
-	indeterminate_target = false;
-	self_referencing = false;
+	assignment = 0;
 	TraversingVisitor::visit(expr);
-	if(assignment && assignment_target && !indeterminate_target)
-	{
-		Node *&assign = assignments[assignment_target];
-		if(self_referencing)
-			unused_nodes.erase(assign);
-		else if(assign)
-			unused_nodes.insert(assign);
-		assign = &expr;
-		if(assignment_target->interface=="out" && (stage->type==FRAGMENT || assignment_target->linked_declaration))
-			unused_nodes.erase(assignment_target);
-		else
-			unused_nodes.insert(&expr);
-	}
-	assignment = false;
+	if(assignment && assignment->target_declaration)
+		record_assignment(*assignment->target_declaration, expr, assignment->self_referencing);
 }
 
 void ProgramCompiler::UnusedVariableLocator::visit(StructDeclaration &strct)
@@ -817,10 +940,7 @@ void ProgramCompiler::UnusedVariableLocator::visit(VariableDeclaration &var)
 	{
 		unused_nodes.insert(&var);
 		if(var.init_expression)
-		{
-			unused_nodes.insert(&*var.init_expression);
-			assignments[&var] = &*var.init_expression;
-		}
+			record_assignment(var, *var.init_expression, false);
 	}
 	unused_nodes.erase(var.type_declaration);
 	TraversingVisitor::visit(var);
@@ -833,6 +953,95 @@ void ProgramCompiler::UnusedVariableLocator::visit(InterfaceBlock &iface)
 	TraversingVisitor::visit(iface);
 }
 
+void ProgramCompiler::UnusedVariableLocator::visit(FunctionDeclaration &func)
+{
+	assignments.push_back(BlockAssignmentMap());
+
+	for(vector<NodePtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+		(*i)->visit(*this);
+	func.body.visit(*this);
+
+	BlockAssignmentMap &block_assignments = assignments.back();
+	for(map<string, VariableDeclaration *>::iterator i=func.body.variables.begin(); i!=func.body.variables.end(); ++i)
+		block_assignments.erase(i->second);
+	for(BlockAssignmentMap::iterator i=block_assignments.begin(); i!=block_assignments.end(); ++i)
+	{
+		if(i->first->interface=="out" && stage->type!=FRAGMENT && !i->first->linked_declaration)
+			continue;
+
+		for(vector<Node *>::iterator j=i->second.nodes.begin(); j!=i->second.nodes.end(); ++j)
+			unused_nodes.erase(*j);
+	}
+
+	assignments.pop_back();
+}
+
+void ProgramCompiler::UnusedVariableLocator::merge_down_assignments()
+{
+	BlockAssignmentMap &parent_assignments = assignments[assignments.size()-2];
+	BlockAssignmentMap &block_assignments = assignments.back();
+	for(BlockAssignmentMap::iterator i=block_assignments.begin(); i!=block_assignments.end(); ++i)
+	{
+		BlockAssignmentMap::iterator j = parent_assignments.find(i->first);
+		if(j==parent_assignments.end())
+			parent_assignments.insert(*i);
+		else if(i->second.self_referencing || i->second.conditional)
+		{
+			j->second.nodes.insert(j->second.nodes.end(), i->second.nodes.begin(), i->second.nodes.end());
+			j->second.conditional |= i->second.conditional;
+			j->second.self_referencing |= i->second.self_referencing;
+		}
+		else
+			j->second = i->second;
+	}
+	assignments.pop_back();
+}
+
+void ProgramCompiler::UnusedVariableLocator::visit(Conditional &cond)
+{
+	cond.condition->visit(*this);
+	assignments.push_back(BlockAssignmentMap());
+	cond.body.visit(*this);
+
+	BlockAssignmentMap if_assignments;
+	swap(assignments.back(), if_assignments);
+	cond.else_body.visit(*this);
+
+	BlockAssignmentMap &else_assignments = assignments.back();
+	for(BlockAssignmentMap::iterator i=else_assignments.begin(); i!=else_assignments.end(); ++i)
+	{
+		BlockAssignmentMap::iterator j = if_assignments.find(i->first);
+		if(j!=if_assignments.end())
+		{
+			i->second.nodes.insert(i->second.nodes.end(), j->second.nodes.begin(), j->second.nodes.end());
+			i->second.conditional |= j->second.conditional;
+			i->second.self_referencing |= j->second.self_referencing;
+			if_assignments.erase(j);
+		}
+		else
+			i->second.conditional = true;
+	}
+
+	for(BlockAssignmentMap::iterator i=if_assignments.begin(); i!=if_assignments.end(); ++i)
+	{
+		i->second.conditional = true;
+		else_assignments.insert(*i);
+	}
+
+	merge_down_assignments();
+}
+
+void ProgramCompiler::UnusedVariableLocator::visit(Iteration &iter)
+{
+	assignments.push_back(BlockAssignmentMap());
+	TraversingVisitor::visit(iter);
+	merge_down_assignments();
+}
+
+
+ProgramCompiler::NodeRemover::NodeRemover(const set<Node *> &r):
+	to_remove(r)
+{ }
 
 void ProgramCompiler::NodeRemover::visit(Block &block)
 {