X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=09a776afb7f60bb61d2bdc47d0a8f3fb9e470b3e;hb=30f676460bb6e87fd7ca2532e507b97965c4a407;hp=1f229991f7b2427e45b7fe511099dd2a894774c5;hpb=2a9f8f3803e1b57e0e5325454266d4e701b38cc5;p=libs%2Fgl.git

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 1f229991..09a776af 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -2,6 +2,7 @@
 #include <msp/core/hash.h>
 #include <msp/core/raii.h>
 #include <msp/strings/lexicalcast.h>
+#include <msp/strings/utils.h>
 #include "builtin.h"
 #include "generate.h"
 
@@ -590,11 +591,11 @@ void ExpressionResolver::convert_to(RefPtr<Expression> &expr, BasicTypeDeclarati
 
 bool ExpressionResolver::convert_to_element(RefPtr<Expression> &expr, BasicTypeDeclaration &elem_type)
 {
-	if(BasicTypeDeclaration *expr_type = dynamic_cast<BasicTypeDeclaration *>(expr->type))
+	if(BasicTypeDeclaration *expr_basic = dynamic_cast<BasicTypeDeclaration *>(expr->type))
 	{
 		BasicTypeDeclaration *to_type = &elem_type;
-		if(is_vector_or_matrix(*expr_type))
-			to_type = find_type(elem_type, expr_type->kind, expr_type->size);
+		if(is_vector_or_matrix(*expr_basic))
+			to_type = find_type(elem_type, expr_basic->kind, expr_basic->size);
 		if(to_type)
 		{
 			convert_to(expr, *to_type);
@@ -916,17 +917,47 @@ bool FunctionResolver::apply(Stage &s)
 
 void FunctionResolver::visit(FunctionCall &call)
 {
-	map<string, FunctionDeclaration *>::iterator i = stage->functions.find(call.name);
-	if(i!=stage->functions.end())
-		call.declaration = i->second;
+	string arg_types;
+	bool has_signature = true;
+	for(NodeArray<Expression>::const_iterator i=call.arguments.begin(); (has_signature && i!=call.arguments.end()); ++i)
+	{
+		if((*i)->type)
+			append(arg_types, ",", (*i)->type->name);
+		else
+			has_signature = false;
+	}
+
+	FunctionDeclaration *declaration = 0;
+	if(has_signature)
+	{
+		map<string, FunctionDeclaration *>::iterator i = stage->functions.find(format("%s(%s)", call.name, arg_types));
+		declaration = (i!=stage->functions.end() ? i->second : 0);
+	}
+	r_any_resolved |= (declaration!=call.declaration);
+	call.declaration = declaration;
 
 	TraversingVisitor::visit(call);
 }
 
 void FunctionResolver::visit(FunctionDeclaration &func)
 {
-	FunctionDeclaration *&stage_decl = stage->functions[func.name];
-	vector<FunctionDeclaration *> &decls = declarations[func.name];
+	if(func.signature.empty())
+	{
+		string param_types;
+		for(NodeArray<VariableDeclaration>::const_iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+		{
+			if((*i)->type_declaration)
+				append(param_types, ",", (*i)->type_declaration->name);
+			else
+				return;
+		}
+		func.signature = format("(%s)", param_types);
+		r_any_resolved = true;
+	}
+
+	string key = func.name+func.signature;
+	FunctionDeclaration *&stage_decl = stage->functions[key];
+	vector<FunctionDeclaration *> &decls = declarations[key];
 	if(func.definition==&func)
 	{
 		stage_decl = &func;
@@ -934,17 +965,19 @@ void FunctionResolver::visit(FunctionDeclaration &func)
 		// Set all previous declarations to use this definition.
 		for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
 		{
+			r_any_resolved |= (func.definition!=(*i)->definition);
 			(*i)->definition = func.definition;
 			(*i)->body.body.clear();
 		}
 	}
 	else
 	{
-		func.definition = 0;
+		FunctionDeclaration *definition = (stage_decl ? stage_decl->definition : 0);
+		r_any_resolved |= (definition!=func.definition);
+		func.definition = definition;
+
 		if(!stage_decl)
 			stage_decl = &func;
-		else
-			func.definition = stage_decl->definition;
 	}
 	decls.push_back(&func);