[Mesa-dev] [PATCH 01/20] glsl: Silence unused parameter warnings

[Anuj Phogat]

On Wed, Apr 29, 2015 at 4:25 PM, Ian Romanick <idr at freedesktop.org> wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
>
> I opted to comment out "last_field" because it was not obvious what the
> meaning of the dangling bool would be.  For the other parameters, the
> meaning was more intuitive without the name.
>
> link_uniform_blocks.cpp:70:65: warning: unused parameter 'name' [-Wunused-parameter]
>     virtual void enter_record(const glsl_type *type, const char *name,
>                                                                  ^
> link_uniform_blocks.cpp:77:65: warning: unused parameter 'name' [-Wunused-parameter]
>     virtual void leave_record(const glsl_type *type, const char *name,
>                                                                  ^
> link_uniform_blocks.cpp:93:62: warning: unused parameter 'record_type' [-Wunused-parameter]
>                              bool row_major, const glsl_type *record_type,
>                                                               ^
> link_uniform_blocks.cpp:94:34: warning: unused parameter 'last_field' [-Wunused-parameter]
>                              bool last_field)
>                                   ^
> link_uniforms.cpp:547:65: warning: unused parameter 'name' [-Wunused-parameter]
>     virtual void enter_record(const glsl_type *type, const char *name,
>                                                                  ^
> link_uniforms.cpp:556:65: warning: unused parameter 'name' [-Wunused-parameter]
>     virtual void leave_record(const glsl_type *type, const char *name,
>                                                                  ^
> link_uniforms.cpp:567:34: warning: unused parameter 'last_field' [-Wunused-parameter]
>                              bool last_field)
>                                   ^
>
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
>  src/glsl/link_uniform_blocks.cpp | 8 ++++----
>  src/glsl/link_uniforms.cpp       | 6 +++---
>  2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/src/glsl/link_uniform_blocks.cpp b/src/glsl/link_uniform_blocks.cpp
> index 6ca4110..898544b 100644
> --- a/src/glsl/link_uniform_blocks.cpp
> +++ b/src/glsl/link_uniform_blocks.cpp
> @@ -67,14 +67,14 @@ private:
>        assert(!"Should not get here.");
>     }
>
> -   virtual void enter_record(const glsl_type *type, const char *name,
> +   virtual void enter_record(const glsl_type *type, const char *,
>                               bool row_major) {
>        assert(type->is_record());
>        this->offset = glsl_align(
>              this->offset, type->std140_base_alignment(row_major));
>     }
>
> -   virtual void leave_record(const glsl_type *type, const char *name,
> +   virtual void leave_record(const glsl_type *type, const char *,
>                               bool row_major) {
>        assert(type->is_record());
>
> @@ -90,8 +90,8 @@ private:
>     }
>
>     virtual void visit_field(const glsl_type *type, const char *name,
> -                            bool row_major, const glsl_type *record_type,
> -                            bool last_field)
> +                            bool row_major, const glsl_type *,
> +                            bool /* last_field */)
>     {
>        assert(this->index < this->num_variables);
>
> diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
> index d5ca23a..2c928e1 100644
> --- a/src/glsl/link_uniforms.cpp
> +++ b/src/glsl/link_uniforms.cpp
> @@ -544,7 +544,7 @@ private:
>        assert(!"Should not get here.");
>     }
>
> -   virtual void enter_record(const glsl_type *type, const char *name,
> +   virtual void enter_record(const glsl_type *type, const char *,
>                               bool row_major) {
>        assert(type->is_record());
>        if (this->ubo_block_index == -1)
> @@ -553,7 +553,7 @@ private:
>              this->ubo_byte_offset, type->std140_base_alignment(row_major));
>     }
>
> -   virtual void leave_record(const glsl_type *type, const char *name,
> +   virtual void leave_record(const glsl_type *type, const char *,
>                               bool row_major) {
>        assert(type->is_record());
>        if (this->ubo_block_index == -1)
> @@ -564,7 +564,7 @@ private:
>
>     virtual void visit_field(const glsl_type *type, const char *name,
>                              bool row_major, const glsl_type *record_type,
> -                            bool last_field)
> +                            bool /* last_field */)
>     {
>        assert(!type->without_array()->is_record());
>        assert(!type->without_array()->is_interface());
> --
> 2.1.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>