Re: [Mesa-dev] [PATCH 16/19] glsl: Silence "unused parameter" warnings in ast_type.cpp

[Andres Gomez]

Ugh! Thanks for this.

This is

Reviewed-by: Andres Gomez 

Br.

On Thu, 2016-12-15 at 20:10 -0800, Ian Romanick wrote:
> From: Ian Romanick 
> 
> glsl/ast_type.cpp: In function ‘bool validate_point_mode(YYLTYPE*, 
> _mesa_glsl_parse_state*, const ast_type_qualifier&, const 
> ast_type_qualifier&)’:
> glsl/ast_type.cpp:173:30: warning: unused parameter ‘loc’ [-Wunused-parameter]
>  validate_point_mode(YYLTYPE *loc,
>   ^~~
> glsl/ast_type.cpp:174:45: warning: unused parameter ‘state’ 
> [-Wunused-parameter]
>  _mesa_glsl_parse_state *state,
>  ^
> 
> Signed-off-by: Ian Romanick 
> Cc: Andres Gomez 
> ---
>  src/compiler/glsl/ast_type.cpp | 10 --
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/src/compiler/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp
> index d68e6e2..e3f06a9 100644
> --- a/src/compiler/glsl/ast_type.cpp
> +++ b/src/compiler/glsl/ast_type.cpp
> @@ -170,10 +170,8 @@ validate_ordering(YYLTYPE *loc,
>  }
>  
>  static bool
> -validate_point_mode(YYLTYPE *loc,
> -_mesa_glsl_parse_state *state,
> -const ast_type_qualifier ,
> -const ast_type_qualifier _qualifier)
> +validate_point_mode(MAYBE_UNUSED const ast_type_qualifier ,
> +MAYBE_UNUSED const ast_type_qualifier _qualifier)
>  {
> /* Point mode can only be true if the flag is set. */
> assert (!qualifier.flags.q.point_mode || !new_qualifier.flags.q.point_mode
> @@ -367,7 +365,7 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
> }
>  
> if (q.flags.q.point_mode) {
> -  r &= validate_point_mode(loc, state, *this, q);
> +  r &= validate_point_mode(*this, q);
>this->flags.q.point_mode = 1;
>this->point_mode = q.point_mode;
> }
> @@ -607,7 +605,7 @@ ast_type_qualifier::validate_in_qualifier(YYLTYPE *loc,
> r &= validate_prim_type(loc, state, *state->in_qualifier, *this);
> r &= validate_vertex_spacing(loc, state, *state->in_qualifier, *this);
> r &= validate_ordering(loc, state, *state->in_qualifier, *this);
> -   r &= validate_point_mode(loc, state, *state->in_qualifier, *this);
> +   r &= validate_point_mode(*state->in_qualifier, *this);
>  
> return r;
>  }
> 
-- 
Br,

Andres
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 16/19] glsl: Silence "unused parameter" warnings in ast_type.cpp

[Ian Romanick]

From: Ian Romanick 

glsl/ast_type.cpp: In function ‘bool validate_point_mode(YYLTYPE*, 
_mesa_glsl_parse_state*, const ast_type_qualifier&, const ast_type_qualifier&)’:
glsl/ast_type.cpp:173:30: warning: unused parameter ‘loc’ [-Wunused-parameter]
 validate_point_mode(YYLTYPE *loc,
  ^~~
glsl/ast_type.cpp:174:45: warning: unused parameter ‘state’ [-Wunused-parameter]
 _mesa_glsl_parse_state *state,
 ^

Signed-off-by: Ian Romanick 
Cc: Andres Gomez 
---
 src/compiler/glsl/ast_type.cpp | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/compiler/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp
index d68e6e2..e3f06a9 100644
--- a/src/compiler/glsl/ast_type.cpp
+++ b/src/compiler/glsl/ast_type.cpp
@@ -170,10 +170,8 @@ validate_ordering(YYLTYPE *loc,
 }
 
 static bool
-validate_point_mode(YYLTYPE *loc,
-_mesa_glsl_parse_state *state,
-const ast_type_qualifier ,
-const ast_type_qualifier _qualifier)
+validate_point_mode(MAYBE_UNUSED const ast_type_qualifier ,
+MAYBE_UNUSED const ast_type_qualifier _qualifier)
 {
/* Point mode can only be true if the flag is set. */
assert (!qualifier.flags.q.point_mode || !new_qualifier.flags.q.point_mode
@@ -367,7 +365,7 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
}
 
if (q.flags.q.point_mode) {
-  r &= validate_point_mode(loc, state, *this, q);
+  r &= validate_point_mode(*this, q);
   this->flags.q.point_mode = 1;
   this->point_mode = q.point_mode;
}
@@ -607,7 +605,7 @@ ast_type_qualifier::validate_in_qualifier(YYLTYPE *loc,
r &= validate_prim_type(loc, state, *state->in_qualifier, *this);
r &= validate_vertex_spacing(loc, state, *state->in_qualifier, *this);
r &= validate_ordering(loc, state, *state->in_qualifier, *this);
-   r &= validate_point_mode(loc, state, *state->in_qualifier, *this);
+   r &= validate_point_mode(*state->in_qualifier, *this);
 
return r;
 }
-- 
2.7.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev