X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fresolve.cpp;h=f2670b53e6805a78f7a2ce6627882299904ff254;hb=59347f76bc985e8c9c769d4a3eee672cba9c920b;hp=fec3cf143130a583c38a961b38b70087309b555e;hpb=fe980fbd898645eba1ac06a5061b3a48db4638b0;p=libs%2Fgl.git

diff --git a/source/glsl/resolve.cpp b/source/glsl/resolve.cpp
index fec3cf14..f2670b53 100644
--- a/source/glsl/resolve.cpp
+++ b/source/glsl/resolve.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <msp/core/raii.h>
 #include <msp/strings/utils.h>
+#include "reflect.h"
 #include "resolve.h"
 
 using namespace std;
@@ -459,43 +460,6 @@ bool ExpressionResolver::apply(Stage &s)
 	return r_any_resolved;
 }
 
-bool ExpressionResolver::is_scalar(BasicTypeDeclaration &type)
-{
-	return (type.kind==BasicTypeDeclaration::INT || type.kind==BasicTypeDeclaration::FLOAT);
-}
-
-bool ExpressionResolver::is_vector_or_matrix(BasicTypeDeclaration &type)
-{
-	return (type.kind==BasicTypeDeclaration::VECTOR || type.kind==BasicTypeDeclaration::MATRIX);
-}
-
-BasicTypeDeclaration *ExpressionResolver::get_element_type(BasicTypeDeclaration &type)
-{
-	if(is_vector_or_matrix(type) || type.kind==BasicTypeDeclaration::ARRAY)
-	{
-		BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type);
-		return (basic_base ? get_element_type(*basic_base) : 0);
-	}
-	else
-		return &type;
-}
-
-bool ExpressionResolver::can_convert(BasicTypeDeclaration &from, BasicTypeDeclaration &to)
-{
-	if(from.kind==BasicTypeDeclaration::INT && to.kind==BasicTypeDeclaration::FLOAT)
-		return from.size<=to.size;
-	else if(from.kind!=to.kind)
-		return false;
-	else if((from.kind==BasicTypeDeclaration::VECTOR || from.kind==BasicTypeDeclaration::MATRIX) && from.size==to.size)
-	{
-		BasicTypeDeclaration *from_base = dynamic_cast<BasicTypeDeclaration *>(from.base_type);
-		BasicTypeDeclaration *to_base = dynamic_cast<BasicTypeDeclaration *>(to.base_type);
-		return (from_base && to_base && can_convert(*from_base, *to_base));
-	}
-	else
-		return false;
-}
-
 ExpressionResolver::Compatibility ExpressionResolver::get_compatibility(BasicTypeDeclaration &left, BasicTypeDeclaration &right)
 {
 	if(&left==&right)
@@ -508,10 +472,10 @@ ExpressionResolver::Compatibility ExpressionResolver::get_compatibility(BasicTyp
 		return NOT_COMPATIBLE;
 }
 
-BasicTypeDeclaration *ExpressionResolver::find_type(BasicTypeDeclaration::Kind kind, unsigned size)
+BasicTypeDeclaration *ExpressionResolver::find_type(BasicTypeDeclaration::Kind kind, unsigned size, bool sign)
 {
 	for(vector<BasicTypeDeclaration *>::const_iterator i=basic_types.begin(); i!=basic_types.end(); ++i)
-		if((*i)->kind==kind && (*i)->size==size)
+		if((*i)->kind==kind && (*i)->size==size && (*i)->sign==sign)
 			return *i;
 	return 0;
 }
@@ -597,7 +561,9 @@ void ExpressionResolver::visit(Literal &literal)
 	if(literal.value.check_type<bool>())
 		resolve(literal, find_type(BasicTypeDeclaration::BOOL, 1), false);
 	else if(literal.value.check_type<int>())
-		resolve(literal, find_type(BasicTypeDeclaration::INT, 32), false);
+		resolve(literal, find_type(BasicTypeDeclaration::INT, 32, true), false);
+	else if(literal.value.check_type<unsigned>())
+		resolve(literal, find_type(BasicTypeDeclaration::INT, 32, false), false);
 	else if(literal.value.check_type<float>())
 		resolve(literal, find_type(BasicTypeDeclaration::FLOAT, 32), false);
 }
@@ -1138,6 +1104,29 @@ bool FunctionResolver::apply(Stage &s)
 	return r_any_resolved;
 }
 
+bool FunctionResolver::can_convert_arguments(const FunctionCall &call, const FunctionDeclaration &decl)
+{
+	if(decl.parameters.size()!=call.arguments.size())
+		return false;
+
+	for(unsigned j=0; j<call.arguments.size(); ++j)
+	{
+		const TypeDeclaration *arg_type = call.arguments[j]->type;
+		const TypeDeclaration *param_type = decl.parameters[j]->type_declaration;
+		if(arg_type==param_type)
+			continue;
+
+		const BasicTypeDeclaration *arg_basic = dynamic_cast<const BasicTypeDeclaration *>(arg_type);
+		const BasicTypeDeclaration *param_basic = dynamic_cast<const BasicTypeDeclaration *>(param_type);
+		if(arg_basic && param_basic && can_convert(*arg_basic, *param_basic))
+			continue;
+
+		return false;
+	}
+
+	return true;
+}
+
 void FunctionResolver::visit(FunctionCall &call)
 {
 	FunctionDeclaration *declaration = 0;
@@ -1159,6 +1148,21 @@ void FunctionResolver::visit(FunctionCall &call)
 		{
 			map<string, FunctionDeclaration *>::iterator i = stage->functions.find(format("%s(%s)", call.name, arg_types));
 			declaration = (i!=stage->functions.end() ? i->second : 0);
+
+			if(!declaration)
+			{
+				for(i=stage->functions.lower_bound(call.name+"("); (i!=stage->functions.end() && i->second->name==call.name); ++i)
+					if(can_convert_arguments(call, *i->second))
+					{
+						if(declaration)
+						{
+							declaration = 0;
+							break;
+						}
+						else
+							declaration = i->second;
+					}
+			}
 		}
 	}