X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;fp=source%2Fglsl%2Foptimize.cpp;h=7d605f1f12bc755812a3252172828a84d3720777;hp=0d428149dcc667ca6a7990c5d760a9ca22ea9aee;hb=4790c6a06072814b21f5b3f24b53c6936915308d;hpb=3e262649c1b98462bcaa2c66bc4fb4ee916dc9de

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 0d428149..7d605f1f 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);
@@ -69,9 +73,9 @@ InlineContentInjector::InlineContentInjector():
 	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)
 {
-	source_func = &src;
+	source_func = call.declaration->definition;
 
 	// Collect all declarations the inlined function depends on.
 	pass = DEPENDS;
@@ -89,7 +93,22 @@ const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &ta
 	staging_block.variables.clear();
 	remap_prefix = source_func->name;
 
-	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(0);
+		staging_block.body.back() = 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);
@@ -117,6 +136,10 @@ const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &ta
 	remap_prefix = target_func.name;
 	target_func.visit(*this);
 
+	// 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);
@@ -258,7 +281,7 @@ void FunctionInliner::visit(FunctionCall &call)
 
 	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())