diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/ir.h | 7 | ||||
| -rw-r--r-- | src/glsl/ir_function.cpp | 11 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/glsl/ir.h b/src/glsl/ir.h index 5878c051b15..1faae3c7259 100644 --- a/src/glsl/ir.h +++ b/src/glsl/ir.h @@ -566,6 +566,13 @@ public: /** * Find a signature that matches a set of actual parameters, taking implicit + * conversions into account. Also flags whether the match was exact. + */ + ir_function_signature *matching_signature(const exec_list *actual_param, + bool *match_is_exact); + + /** + * Find a signature that matches a set of actual parameters, taking implicit * conversions into account. */ ir_function_signature *matching_signature(const exec_list *actual_param); diff --git a/src/glsl/ir_function.cpp b/src/glsl/ir_function.cpp index 51d32b46f98..b34a5008168 100644 --- a/src/glsl/ir_function.cpp +++ b/src/glsl/ir_function.cpp @@ -118,6 +118,14 @@ parameter_lists_match(const exec_list *list_a, const exec_list *list_b) ir_function_signature * ir_function::matching_signature(const exec_list *actual_parameters) { + bool is_exact; + return matching_signature(actual_parameters, &is_exact); +} + +ir_function_signature * +ir_function::matching_signature(const exec_list *actual_parameters, + bool *is_exact) +{ ir_function_signature *match = NULL; bool multiple_inexact_matches = false; @@ -137,6 +145,7 @@ ir_function::matching_signature(const exec_list *actual_parameters) switch (parameter_lists_match(& sig->parameters, actual_parameters)) { case PARAMETER_LIST_EXACT_MATCH: + *is_exact = true; return sig; case PARAMETER_LIST_INEXACT_MATCH: if (match == NULL) @@ -159,6 +168,8 @@ ir_function::matching_signature(const exec_list *actual_parameters) * FINISHME: a "no matching signature" error; it should report that the * FINISHME: call is ambiguous. But reporting errors from here is hard. */ + *is_exact = false; + if (multiple_inexact_matches) return NULL; |