From: Andres Gomez Date: Tue, 2 Aug 2016 11:26:23 +0000 (+0300) Subject: glsl: apply_implicit_conversion is static again X-Git-Tag: upstream/17.1.0~7569 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f98a120f39fc228cf4d8d7cfe82fd9757c5d3ed;p=platform%2Fupstream%2Fmesa.git glsl: apply_implicit_conversion is static again Reviewed-by: Timothy Arceri Signed-off-by: Andres Gomez --- 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) {