Resolve function calls where argument types need to be converted

This is a rather basic implementation and will reject a call if there's
multiple candidates, without considering conversion ranks.

diff --git a/source/glsl/resolve.cpp b/source/glsl/resolve.cpp
index 176b13c5f1f55ad13e1613be145676150ef93db5..3f959a7d03bad94db6fe4f7138b00f0fbb546bf7 100644 (file)
--- a/source/glsl/resolve.cpp
+++ b/source/glsl/resolve.cpp
@@ -1102,6 +1102,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;
@@ -1123,6 +1146,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;
+                                       }
+                       }
                }
        }
 

diff --git a/source/glsl/resolve.h b/source/glsl/resolve.h
index 2416502cf23f713e8f5f2f8a5de11391195250d2..69c877fc6e542e24a5fd9edaf382662e2a83243d 100644 (file)
--- a/source/glsl/resolve.h
+++ b/source/glsl/resolve.h
@@ -156,6 +156,8 @@ public:
        bool apply(Stage &);
 
 private:
+       static bool can_convert_arguments(const FunctionCall &, const FunctionDeclaration &);
+
        virtual void visit(FunctionCall &);
        virtual void visit(FunctionDeclaration &);
 };

diff --git a/tests/glsl/inexact_function_argument_type.glsl b/tests/glsl/inexact_function_argument_type.glsl
new file mode 100644 (file)
index 0000000..2bbece3
--- /dev/null
+++ b/tests/glsl/inexact_function_argument_type.glsl
@@ -0,0 +1,18 @@
+#pragma MSP stage(vertex)
+layout(location=0) in vec4 position;
+vec2 scale(vec2 v, float s)
+{
+       return v*s;
+}
+void main()
+{
+       gl_Position = vec4(scale(position.xy, 2), 0.0, 1.0);
+}
+
+/* Expected output: vertex
+layout(location=0) in vec4 position;
+void main()
+{
+       gl_Position = vec4(position.xy*float(2), 0.0, 1.0);
+}
+*/