[Mesa-dev] [PATCH 1/6] i965/fs: Silence unused parameter warning

[Jordan Justen]

Series Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

On 2015-02-27 18:50:45, Ian Romanick wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
> 
> brw_fs_visitor.cpp:2162:56: warning: unused parameter 'offset_components' [-Wunused-parameter]
>                           fs_reg offset_value, unsigned offset_components,
>                                                         ^
> 
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> Cc: Jordan Justen <jordan.l.justen at intel.com>
> ---
>  src/mesa/drivers/dri/i965/brw_fs.h           | 2 +-
>  src/mesa/drivers/dri/i965/brw_fs_fp.cpp      | 2 +-
>  src/mesa/drivers/dri/i965/brw_fs_nir.cpp     | 2 +-
>  src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 6 ++----
>  4 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
> index 70098d8..b77251e 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs.h
> +++ b/src/mesa/drivers/dri/i965/brw_fs.h
> @@ -289,7 +289,7 @@ public:
>                       fs_reg shadow_c,
>                       fs_reg lod, fs_reg dpdy, int grad_components,
>                       fs_reg sample_index,
> -                     fs_reg offset, unsigned offset_components,
> +                     fs_reg offset,
>                       fs_reg mcs,
>                       int gather_component,
>                       bool is_cube_array,
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_fp.cpp b/src/mesa/drivers/dri/i965/brw_fs_fp.cpp
> index d22de0e..6d08bf7 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs_fp.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs_fp.cpp
> @@ -475,7 +475,7 @@ fs_visitor::emit_fragment_program_code()
>  
>           emit_texture(op, glsl_type::vec4_type, coordinate, coord_components,
>                        shadow_c, lod, dpdy, 0, sample_index,
> -                      reg_undef, 0, /* offset, components */
> +                      reg_undef, /* offset */
>                        reg_undef, /* mcs */
>                        0, /* gather component */
>                        false, /* is cube array */
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
> index f15d82f..7dfb295 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
> @@ -1740,7 +1740,7 @@ fs_visitor::nir_emit_texture(nir_tex_instr *instr)
>  
>     emit_texture(op, dest_type, coordinate, instr->coord_components,
>                  shadow_comparitor, lod, lod2, lod_components, sample_index,
> -                offset, offset_components, mcs, gather_component,
> +                offset, mcs, gather_component,
>                  is_cube_array, is_rect, sampler, sampler_reg, texunit);
>  
>     fs_reg dest = get_nir_dest(instr->dest);
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> index 7a697e8..230842a 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> @@ -2029,7 +2029,7 @@ fs_visitor::emit_texture(ir_texture_opcode op,
>                           fs_reg shadow_c,
>                           fs_reg lod, fs_reg lod2, int grad_components,
>                           fs_reg sample_index,
> -                         fs_reg offset_value, unsigned offset_components,
> +                         fs_reg offset_value,
>                           fs_reg mcs,
>                           int gather_component,
>                           bool is_cube_array,
> @@ -2195,7 +2195,6 @@ fs_visitor::visit(ir_texture *ir)
>     }
>  
>     fs_reg offset_value;
> -   int offset_components = 0;
>     if (ir->offset) {
>        ir_constant *const_offset = ir->offset->as_constant();
>        if (const_offset) {
> @@ -2210,7 +2209,6 @@ fs_visitor::visit(ir_texture *ir)
>           ir->offset->accept(this);
>           offset_value = this->result;
>        }
> -      offset_components = ir->offset->type->vector_elements;
>     }
>  
>     fs_reg lod, lod2, sample_index, mcs;
> @@ -2267,7 +2265,7 @@ fs_visitor::visit(ir_texture *ir)
>  
>     emit_texture(ir->op, ir->type, coordinate, coord_components,
>                  shadow_comparitor, lod, lod2, grad_components,
> -                sample_index, offset_value, offset_components, mcs,
> +                sample_index, offset_value, mcs,
>                  gather_component, is_cube_array, is_rect, sampler,
>                  sampler_reg, texunit);
>  }
> -- 
> 2.1.0
>