Mesa (master): glsl: apply_implicit_conversion is static again

[Andres Gomez]

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

Author: Andres Gomez <agomez at igalia.com>
Date:   Tue Aug  2 14:26:23 2016 +0300

glsl: apply_implicit_conversion is static again

Reviewed-by: Timothy Arceri <timothy.arceri at collabora.com>
Signed-off-by: Andres Gomez <agomez at igalia.com>

---

 src/compiler/glsl/ast_function.cpp | 4 ----
 src/compiler/glsl/ast_to_hir.cpp   | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/compiler/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp
index 9b1fa45..6493c4f 100644
--- a/src/compiler/glsl/ast_function.cpp
+++ b/src/compiler/glsl/ast_function.cpp
@@ -31,10 +31,6 @@
 static ir_rvalue *
 convert_component(ir_rvalue *src, const glsl_type *desired_type);
 
-bool
-apply_implicit_conversion(const glsl_type *to, ir_rvalue * &from,
-                          struct _mesa_glsl_parse_state *state);
-
 static unsigned
 process_parameters(exec_list *instructions, exec_list *actual_parameters,
 		   exec_list *parameters,
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index ec12ff8..f189075 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -280,7 +280,7 @@ get_implicit_conversion_operation(const glsl_type *to, const glsl_type *from,
  * If a conversion is possible (or unnecessary), \c true is returned.
  * Otherwise \c false is returned.
  */
-bool
+static bool
 apply_implicit_conversion(const glsl_type *to, ir_rvalue * &from,
                           struct _mesa_glsl_parse_state *state)
 {