[Mesa-dev] [PATCH 4/5] glsl: apply_implicit_conversion is static again

Timothy Arceri timothy.arceri at collabora.com
Thu Aug 4 00:06:56 UTC 2016


Reviewed-by: Timothy Arceri <timothy.arceri at collabora.com>

On Wed, 2016-08-03 at 23:51 +0300, Andres Gomez wrote:
> 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 ccd070f..52cbf1f 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 0b54979..69e545c 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)
>  {


More information about the mesa-dev mailing list