X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=91d1de991515dc74dbb359d0385a0429ef855803;hp=ea2e956d023f1e02d66b44b7771186542076dd28;hb=7d66c70e15b84cbaf6b1973db07629f5bd3e5cdf;hpb=d18df036b247f7f0978b547bb8ea1d624af2c4b2

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index ea2e956d..91d1de99 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -173,17 +173,28 @@ void DeclarationValidator::visit(InterfaceBlock &iface)
 
 void DeclarationValidator::visit(FunctionDeclaration &func)
 {
+	string key = func.name+func.signature;
+	map<string, FunctionDeclaration *>::const_iterator i = overloaded_functions.find(key);
+	if(i==overloaded_functions.end())
+		overloaded_functions.insert(make_pair(key, &func));
+	else if(func.return_type_declaration && i->second->return_type_declaration!=func.return_type_declaration)
+	{
+		error(func, format("Conflicting return type '%s' for function '%s'", func.return_type_declaration->name, func.name));
+		if(i->second->return_type_declaration)
+			add_info(*i->second, format("Previously declared as returning '%s'", i->second->return_type_declaration->name));
+	}
+
 	if(Statement *previous = find_definition(func.name))
 	{
-		FunctionDeclaration *prev_func = dynamic_cast<FunctionDeclaration *>(previous);
-		if(prev_func && prev_func->definition==&func)
-			declarations[current_block][func.name] = &func;
-		else
+		if(!dynamic_cast<FunctionDeclaration *>(previous))
 			multiple_definition(format("'%s'", func.name), func, *previous);
 	}
 	else
 		record_definition(func.name, func);
 
+	if(func.definition==&func)
+		check_definition(func.name+func.signature, func);
+
 	TraversingVisitor::visit(func);
 }