From: Ian Romanick Date: Tue, 26 Feb 2019 19:24:56 +0000 (-0800) Subject: intel/compiler: Silence unused parameter warning in brw_interpolation_map.c X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbf20a1ca366094509ddfb1eedc943524a92c29f;p=mesa.git intel/compiler: Silence unused parameter warning in brw_interpolation_map.c The parameter is never used, and it's not part of a common interface idiom. Remove it. src/intel/compiler/brw_interpolation_map.c: In function ‘brw_setup_vue_interpolation’: src/intel/compiler/brw_interpolation_map.c:62:59: warning: unused parameter ‘devinfo’ [-Wunused-parameter] const struct gen_device_info *devinfo) ^~~~~~~ Reviewed-by: Jason Ekstrand --- diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h index 7ae38e103c6..375705821c9 100644 --- a/src/intel/compiler/brw_compiler.h +++ b/src/intel/compiler/brw_compiler.h @@ -993,8 +993,7 @@ void brw_compute_tess_vue_map(struct brw_vue_map *const vue_map, /* brw_interpolation_map.c */ void brw_setup_vue_interpolation(struct brw_vue_map *vue_map, struct nir_shader *nir, - struct brw_wm_prog_data *prog_data, - const struct gen_device_info *devinfo); + struct brw_wm_prog_data *prog_data); enum shader_dispatch_mode { DISPATCH_MODE_4X1_SINGLE = 0, diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index c4c800c6c22..bbab80d6018 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -7758,9 +7758,8 @@ brw_compile_fs(const struct brw_compiler *compiler, void *log_data, brw_nir_lower_fs_inputs(shader, devinfo, key); brw_nir_lower_fs_outputs(shader); - if (devinfo->gen < 6) { - brw_setup_vue_interpolation(vue_map, shader, prog_data, devinfo); - } + if (devinfo->gen < 6) + brw_setup_vue_interpolation(vue_map, shader, prog_data); if (!key->multisample_fbo) NIR_PASS_V(shader, demote_sample_qualifiers); diff --git a/src/intel/compiler/brw_interpolation_map.c b/src/intel/compiler/brw_interpolation_map.c index 7b9f58eb6ee..454cc3e2c24 100644 --- a/src/intel/compiler/brw_interpolation_map.c +++ b/src/intel/compiler/brw_interpolation_map.c @@ -58,8 +58,7 @@ gen4_frag_prog_set_interp_modes(struct brw_wm_prog_data *prog_data, /* Set up interpolation modes for every element in the VUE */ void brw_setup_vue_interpolation(struct brw_vue_map *vue_map, nir_shader *nir, - struct brw_wm_prog_data *prog_data, - const struct gen_device_info *devinfo) + struct brw_wm_prog_data *prog_data) { /* Initialise interp_mode. INTERP_MODE_NONE == 0 */ memset(prog_data->interp_mode, 0, sizeof(prog_data->interp_mode));