From fb6dc8e8945117cfc9f8e1d8a5f27137a6bb902d Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 23 May 2018 11:33:51 -0700 Subject: [PATCH] intel/compiler: Silence unused parameter warnings brw_nir.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit src/intel/compiler/brw_nir.c: In function ‘brw_nir_lower_vue_outputs’: src/intel/compiler/brw_nir.c:464:32: warning: unused parameter ‘is_scalar’ [-Wunused-parameter] bool is_scalar) ^~~~~~~~~ src/intel/compiler/brw_nir.c: In function ‘lower_bit_size_callback’: src/intel/compiler/brw_nir.c:610:57: warning: unused parameter ‘data’ [-Wunused-parameter] lower_bit_size_callback(const nir_alu_instr *alu, void *data) ^~~~ Signed-off-by: Ian Romanick Reviewed-by: Caio Marcelo de Oliveira Filho --- src/intel/compiler/brw_nir.c | 5 ++--- src/intel/compiler/brw_nir.h | 2 +- src/intel/compiler/brw_shader.cpp | 2 +- src/intel/compiler/brw_vec4.cpp | 2 +- src/intel/compiler/brw_vec4_gs_visitor.cpp | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c index f4aee3d41ee..f2553519fac 100644 --- a/src/intel/compiler/brw_nir.c +++ b/src/intel/compiler/brw_nir.c @@ -460,8 +460,7 @@ brw_nir_lower_fs_inputs(nir_shader *nir, } void -brw_nir_lower_vue_outputs(nir_shader *nir, - bool is_scalar) +brw_nir_lower_vue_outputs(nir_shader *nir) { nir_foreach_variable(var, &nir->outputs) { var->data.driver_location = var->data.location; @@ -593,7 +592,7 @@ brw_nir_optimize(nir_shader *nir, const struct brw_compiler *compiler, } static unsigned -lower_bit_size_callback(const nir_alu_instr *alu, void *data) +lower_bit_size_callback(const nir_alu_instr *alu, UNUSED void *data) { assert(alu->dest.dest.is_ssa); if (alu->dest.dest.ssa.bit_size != 16) diff --git a/src/intel/compiler/brw_nir.h b/src/intel/compiler/brw_nir.h index 03f52da08e5..19442b47eae 100644 --- a/src/intel/compiler/brw_nir.h +++ b/src/intel/compiler/brw_nir.h @@ -109,7 +109,7 @@ void brw_nir_lower_tes_inputs(nir_shader *nir, const struct brw_vue_map *vue); void brw_nir_lower_fs_inputs(nir_shader *nir, const struct gen_device_info *devinfo, const struct brw_wm_prog_key *key); -void brw_nir_lower_vue_outputs(nir_shader *nir, bool is_scalar); +void brw_nir_lower_vue_outputs(nir_shader *nir); void brw_nir_lower_tcs_outputs(nir_shader *nir, const struct brw_vue_map *vue, GLenum tes_primitive_mode); void brw_nir_lower_fs_outputs(nir_shader *nir); diff --git a/src/intel/compiler/brw_shader.cpp b/src/intel/compiler/brw_shader.cpp index 2dae827523f..804573fc631 100644 --- a/src/intel/compiler/brw_shader.cpp +++ b/src/intel/compiler/brw_shader.cpp @@ -1195,7 +1195,7 @@ brw_compile_tes(const struct brw_compiler *compiler, nir = brw_nir_apply_sampler_key(nir, compiler, &key->tex, is_scalar); brw_nir_lower_tes_inputs(nir, input_vue_map); - brw_nir_lower_vue_outputs(nir, is_scalar); + brw_nir_lower_vue_outputs(nir); nir = brw_postprocess_nir(nir, compiler, is_scalar); brw_compute_vue_map(devinfo, &prog_data->base.vue_map, diff --git a/src/intel/compiler/brw_vec4.cpp b/src/intel/compiler/brw_vec4.cpp index 44cb89c6e51..2e9ec6f5ef3 100644 --- a/src/intel/compiler/brw_vec4.cpp +++ b/src/intel/compiler/brw_vec4.cpp @@ -2827,7 +2827,7 @@ brw_compile_vs(const struct brw_compiler *compiler, void *log_data, prog_data->double_inputs_read = shader->info.vs.double_inputs; brw_nir_lower_vs_inputs(shader, key->gl_attrib_wa_flags); - brw_nir_lower_vue_outputs(shader, is_scalar); + brw_nir_lower_vue_outputs(shader); shader = brw_postprocess_nir(shader, compiler, is_scalar); prog_data->base.clip_distance_mask = diff --git a/src/intel/compiler/brw_vec4_gs_visitor.cpp b/src/intel/compiler/brw_vec4_gs_visitor.cpp index 02871eef204..c4c876a0d03 100644 --- a/src/intel/compiler/brw_vec4_gs_visitor.cpp +++ b/src/intel/compiler/brw_vec4_gs_visitor.cpp @@ -642,7 +642,7 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data, shader = brw_nir_apply_sampler_key(shader, compiler, &key->tex, is_scalar); brw_nir_lower_vue_inputs(shader, &c.input_vue_map); - brw_nir_lower_vue_outputs(shader, is_scalar); + brw_nir_lower_vue_outputs(shader); shader = brw_postprocess_nir(shader, compiler, is_scalar); prog_data->base.clip_distance_mask = -- 2.30.2