From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 4 May 2014 08:23:56 +0000 (+1200)
Subject: glsl: Pass parse state to parameter_lists_match()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a78c663c2291d9f5acd7367766a2712038db2e78;p=mesa.git

glsl: Pass parse state to parameter_lists_match()

The available implicit conversions depend on the GLSL version we're
compiling.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/glsl/ir_function.cpp b/src/glsl/ir_function.cpp
index 40cf5894af8..4f0d9daa3c4 100644
--- a/src/glsl/ir_function.cpp
+++ b/src/glsl/ir_function.cpp
@@ -38,7 +38,8 @@ typedef enum {
  * \see matching_signature()
  */
 static parameter_list_match_t
-parameter_lists_match(const exec_list *list_a, const exec_list *list_b)
+parameter_lists_match(_mesa_glsl_parse_state *state,
+                      const exec_list *list_a, const exec_list *list_b)
 {
    const exec_node *node_a = list_a->head;
    const exec_node *node_b = list_b->head;
@@ -148,7 +149,7 @@ ir_function::matching_signature(_mesa_glsl_parse_state *state,
       if (sig->is_builtin() && !sig->is_builtin_available(state))
          continue;
 
-      switch (parameter_lists_match(& sig->parameters, actual_parameters)) {
+      switch (parameter_lists_match(state, & sig->parameters, actual_parameters)) {
       case PARAMETER_LIST_EXACT_MATCH:
 	 *is_exact = true;
 	 return sig;