Mesa (master): glsl: Pass parse state to parameter_lists_match()

Chris Forbes chrisf at kemper.freedesktop.org
Wed Jun 4 07:43:27 UTC 2014


Module: Mesa
Branch: master
Commit: a78c663c2291d9f5acd7367766a2712038db2e78
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a78c663c2291d9f5acd7367766a2712038db2e78

Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Sun May  4 20:23:56 2014 +1200

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 at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/glsl/ir_function.cpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/glsl/ir_function.cpp b/src/glsl/ir_function.cpp
index 40cf589..4f0d9da 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;




More information about the mesa-commit mailing list