X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=7b3f8f28c8ad00007b520446ed5c2cc1180c49d0;hp=6c49878b857603152d742383ab4fd1f611e6c1ac;hb=4fb346536bfefd612635a248f558b1f1471deae6;hpb=499c0515cde44b304d131ac7ac3b2030c9dbe11c

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 6c49878b..7b3f8f28 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -34,8 +34,12 @@ void InlineableFunctionLocator::visit(FunctionCall &call)
 
 void InlineableFunctionLocator::visit(FunctionDeclaration &func)
 {
+	bool has_out_params = false;
+	for(NodeArray<VariableDeclaration>::const_iterator i=func.parameters.begin(); (!has_out_params && i!=func.parameters.end()); ++i)
+		has_out_params = ((*i)->interface=="out");
+
 	unsigned &count = refcounts[func.definition];
-	if(count<=1 && func.parameters.empty())
+	if(count<=1 && !has_out_params)
 		inlineable.insert(func.definition);
 
 	SetForScope<FunctionDeclaration *> set(current_function, &func);
@@ -66,36 +70,73 @@ void InlineableFunctionLocator::visit(Return &ret)
 
 InlineContentInjector::InlineContentInjector():
 	source_func(0),
-	remap_names(false),
-	deps_only(false)
+	pass(DEPENDS)
 { }
 
-const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &target_func, Block &tgt_blk, const NodeList<Statement>::iterator &ins_pt, FunctionDeclaration &src)
+const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &target_func, Block &tgt_blk, const NodeList<Statement>::iterator &ins_pt, FunctionCall &call)
 {
-	target_block = &tgt_blk;
-	source_func = &src;
-	remap_prefix = source_func->name;
+	source_func = call.declaration->definition;
+
+	// Collect all declarations the inlined function depends on.
+	pass = DEPENDS;
+	source_func->visit(*this);
+
+	/* Populate referenced_names from the target function so we can rename
+	variables from the inlined function that would conflict. */
+	pass = REFERENCED;
+	target_func.visit(*this);
+
+	/* Inline and rename passes must be interleaved so used variable names are
+	known when inlining the return statement. */
+	pass = INLINE;
+	staging_block.parent = &tgt_blk;
+	staging_block.variables.clear();
 
-	vector<RefPtr<Statement> > inlined;
-	inlined.reserve(src.body.body.size());
-	for(NodeList<Statement>::iterator i=src.body.body.begin(); i!=src.body.body.end(); ++i)
+	std::vector<RefPtr<VariableDeclaration> > params;
+	params.reserve(source_func->parameters.size());
+	for(NodeArray<VariableDeclaration>::iterator i=source_func->parameters.begin(); i!=source_func->parameters.end(); ++i)
+	{
+		RefPtr<VariableDeclaration> var = (*i)->clone();
+		var->interface.clear();
+
+		SetForScope<Pass> set_pass(pass, RENAME);
+		var->visit(*this);
+
+		staging_block.body.push_back_nocopy(var);
+		params.push_back(var);
+	}
+
+	for(NodeList<Statement>::iterator i=source_func->body.body.begin(); i!=source_func->body.body.end(); ++i)
 	{
 		r_inlined_statement = 0;
 		(*i)->visit(*this);
 		if(!r_inlined_statement)
 			r_inlined_statement = (*i)->clone();
 
-		SetForScope<unsigned> set_remap(remap_names, 2);
+		SetForScope<Pass> set_pass(pass, RENAME);
 		r_inlined_statement->visit(*this);
-		inlined.push_back(r_inlined_statement);
+
+		staging_block.body.push_back_nocopy(r_inlined_statement);
 	}
 
-	SetForScope<unsigned> set_remap(remap_names, 1);
-	SetForScope<string> set_prefix(remap_prefix, target_func.name);
-	variable_map.clear();
+	/* Now collect names from the staging block.  Local variables that would
+	have conflicted with the target function were renamed earlier. */
+	pass = REFERENCED;
+	referenced_names.clear();
+	staging_block.variables.clear();
+	staging_block.visit(*this);
+
+	/* Rename variables in the target function so they don't interfere with
+	global identifiers used by the source function. */
+	pass = RENAME;
+	staging_block.parent = source_func->body.parent;
 	target_func.visit(*this);
 
-	tgt_blk.body.insert(ins_pt, inlined.begin(), inlined.end());
+	// Put the argument expressions in place after all renaming has been done.
+	for(unsigned i=0; i<source_func->parameters.size(); ++i)
+		params[i]->init_expression = call.arguments[i]->clone();
+
+	tgt_blk.body.splice(ins_pt, staging_block.body);
 
 	NodeReorderer().apply(stage, target_func, dependencies);
 
@@ -104,42 +145,38 @@ const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &ta
 
 void InlineContentInjector::visit(VariableReference &var)
 {
-	if(remap_names)
+	if(pass==RENAME)
 	{
-		map<string, VariableDeclaration *>::const_iterator i = variable_map.find(var.name);
-		if(i!=variable_map.end())
+		map<string, VariableDeclaration *>::const_iterator i = staging_block.variables.find(var.name);
+		if(i!=staging_block.variables.end())
 			var.name = i->second->name;
 	}
-	else if(var.declaration)
+	else if(pass==DEPENDS && var.declaration)
 	{
-		SetFlag set_deps(deps_only);
-		if(!variable_map.count(var.name))
-		{
-			dependencies.insert(var.declaration);
-			referenced_names.insert(var.name);
-		}
+		dependencies.insert(var.declaration);
 		var.declaration->visit(*this);
 	}
+	else if(pass==REFERENCED)
+		referenced_names.insert(var.name);
 }
 
 void InlineContentInjector::visit(InterfaceBlockReference &iface)
 {
-	if(!remap_names && iface.declaration)
+	if(pass==DEPENDS && iface.declaration)
 	{
-		SetFlag set_deps(deps_only);
 		dependencies.insert(iface.declaration);
-		referenced_names.insert(iface.name);
 		iface.declaration->visit(*this);
 	}
+	else if(pass==REFERENCED)
+		referenced_names.insert(iface.name);
 }
 
 void InlineContentInjector::visit(FunctionCall &call)
 {
-	if(!remap_names && call.declaration)
-	{
+	if(pass==DEPENDS && call.declaration)
 		dependencies.insert(call.declaration);
+	else if(pass==REFERENCED)
 		referenced_names.insert(call.name);
-	}
 	TraversingVisitor::visit(call);
 }
 
@@ -147,33 +184,39 @@ void InlineContentInjector::visit(VariableDeclaration &var)
 {
 	TraversingVisitor::visit(var);
 
-	if(remap_names)
+	if(pass==RENAME)
 	{
-		if(remap_names==2 || referenced_names.count(var.name))
+		/* Check against conflicts with the other context as well as variables
+		already renamed here. */
+		bool conflict = (staging_block.variables.count(var.name) || referenced_names.count(var.name));
+		staging_block.variables[var.name] = &var;
+		if(conflict)
 		{
-			string mapped_name = get_unused_variable_name(*target_block, var.name, remap_prefix);
-			variable_map[var.name] = &var;
-			var.name = mapped_name;
+			string mapped_name = get_unused_variable_name(staging_block, var.name);
+			if(mapped_name!=var.name)
+			{
+				staging_block.variables[mapped_name] = &var;
+				var.name = mapped_name;
+			}
 		}
 	}
-	else if(var.type_declaration)
+	else if(pass==DEPENDS && var.type_declaration)
 	{
-		SetFlag set_deps(deps_only);
 		dependencies.insert(var.type_declaration);
-		referenced_names.insert(var.type_declaration->name);
 		var.type_declaration->visit(*this);
 	}
+	else if(pass==REFERENCED)
+		referenced_names.insert(var.type);
 }
 
 void InlineContentInjector::visit(Return &ret)
 {
 	TraversingVisitor::visit(ret);
 
-	if(!remap_names && ret.expression)
+	if(pass==INLINE && ret.expression)
 	{
-		/* Create a new variable to hold the return value of the inlined
-		function. */
-		r_result_name = get_unused_variable_name(*target_block, "_return", source_func->name);
+		// Create a new variable to hold the return value of the inlined function.
+		r_result_name = get_unused_variable_name(staging_block, "_return");
 		RefPtr<VariableDeclaration> var = new VariableDeclaration;
 		var->source = ret.source;
 		var->line = ret.line;
@@ -225,23 +268,23 @@ void FunctionInliner::visit(Block &block)
 
 void FunctionInliner::visit(FunctionCall &call)
 {
+	for(NodeArray<Expression>::iterator i=call.arguments.begin(); (!r_inlined_here && i!=call.arguments.end()); ++i)
+		visit(*i);
+
 	if(r_inlined_here)
 		return;
 
-	for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
-		visit(*i);
-
 	FunctionDeclaration *def = call.declaration;
 	if(def)
 		def = def->definition;
 
 	if(def && inlineable.count(def))
 	{
-		string result_name = InlineContentInjector().apply(*stage, *current_function, *current_block, insert_point, *def);
+		string result_name = InlineContentInjector().apply(*stage, *current_function, *current_block, insert_point, call);
 
 		// This will later get removed by UnusedVariableRemover.
 		if(result_name.empty())
-			result_name = "msp_unused_from_inline";
+			result_name = "_msp_unused_from_inline";
 
 		RefPtr<VariableReference> ref = new VariableReference;
 		ref->name = result_name;
@@ -1076,7 +1119,7 @@ void UnusedVariableRemover::visit(VariableDeclaration &var)
 	/* Mark variables as output if they're used by the next stage or the
 	graphics API. */
 	if(interface_block)
-		var_info.output = (interface_block->interface=="out" && (interface_block->linked_block || !interface_block->name.compare(0, 3, "gl_")));
+		var_info.output = (interface_block->interface=="out" && (interface_block->linked_block || !interface_block->block_name.compare(0, 3, "gl_")));
 	else
 		var_info.output = (var.interface=="out" && (stage->type==Stage::FRAGMENT || var.linked_declaration || !var.name.compare(0, 3, "gl_")));
 
@@ -1098,7 +1141,7 @@ void UnusedVariableRemover::visit(InterfaceBlock &iface)
 	else
 	{
 		VariableInfo &var_info = variables[&iface];
-		var_info.output = (iface.interface=="out" && (iface.linked_block || !iface.name.compare(0, 3, "gl_")));
+		var_info.output = (iface.interface=="out" && (iface.linked_block || !iface.block_name.compare(0, 3, "gl_")));
 	}
 }