From b9c326bc4dd8a78fa30a919a405be1d0b05a0bb6 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 24 Sep 2020 12:19:39 -0700 Subject: [PATCH] intel: Silence many unused parameter warnings in blorp_genX_exec.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit I considered a couple other options (including adding #if / #endif around UNUSED and adding an UNUSED_ON_SOME_GEN), but this seemed the best. There was also at least one other case of having UNUSED on a paramter that is sometimes unused (params in blorp_emit_color_calc_state). This header gets included in a lot of places (esp. in files that get built per-Gen), so the warnings are repeated a lot. In file included from src/mesa/drivers/dri/i965/genX_blorp_exec.c:33: src/intel/blorp/blorp_genX_exec.h: In function ‘emit_urb_config’: src/intel/blorp/blorp_genX_exec.h:193:48: warning: unused parameter ‘deref_block_size’ [-Wunused-parameter] 193 | enum gen_urb_deref_block_size *deref_block_size) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~ src/intel/blorp/blorp_genX_exec.h: In function ‘blorp_fill_vertex_buffer_state’: src/intel/blorp/blorp_genX_exec.h:350:52: warning: unused parameter ‘batch’ [-Wunused-parameter] 350 | blorp_fill_vertex_buffer_state(struct blorp_batch *batch, | ~~~~~~~~~~~~~~~~~~~~^~~~~ src/intel/blorp/blorp_genX_exec.h: In function ‘blorp_emit_surface_state’: src/intel/blorp/blorp_genX_exec.h:1403:42: warning: unused parameter ‘aux_op’ [-Wunused-parameter] 1403 | enum isl_aux_op aux_op, | ~~~~~~~~~~~~~~~~^~~~~~ src/intel/blorp/blorp_genX_exec.h: In function ‘blorp_update_clear_color’: src/intel/blorp/blorp_genX_exec.h:1867:46: warning: unused parameter ‘batch’ [-Wunused-parameter] 1867 | blorp_update_clear_color(struct blorp_batch *batch, | ~~~~~~~~~~~~~~~~~~~~^~~~~ Reviewed-by: Jason Ekstrand Part-of: --- src/intel/blorp/blorp_genX_exec.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h index a8e5edd..c37078a 100644 --- a/src/intel/blorp/blorp_genX_exec.h +++ b/src/intel/blorp/blorp_genX_exec.h @@ -190,7 +190,7 @@ _blorp_combine_address(struct blorp_batch *batch, void *location, static void emit_urb_config(struct blorp_batch *batch, const struct blorp_params *params, - enum gen_urb_deref_block_size *deref_block_size) + UNUSED enum gen_urb_deref_block_size *deref_block_size) { /* Once vertex fetcher has written full VUE entries with complete * header the space requirement is as follows per vertex (in bytes): @@ -347,8 +347,7 @@ blorp_emit_input_varying_data(struct blorp_batch *batch, } static void -blorp_fill_vertex_buffer_state(struct blorp_batch *batch, - struct GENX(VERTEX_BUFFER_STATE) *vb, +blorp_fill_vertex_buffer_state(struct GENX(VERTEX_BUFFER_STATE) *vb, unsigned idx, struct blorp_address addr, uint32_t size, uint32_t stride) @@ -388,11 +387,11 @@ blorp_emit_vertex_buffers(struct blorp_batch *batch, struct blorp_address addrs[2] = {}; uint32_t sizes[2]; blorp_emit_vertex_data(batch, params, &addrs[0], &sizes[0]); - blorp_fill_vertex_buffer_state(batch, vb, 0, addrs[0], sizes[0], + blorp_fill_vertex_buffer_state(vb, 0, addrs[0], sizes[0], 3 * sizeof(float)); blorp_emit_input_varying_data(batch, params, &addrs[1], &sizes[1]); - blorp_fill_vertex_buffer_state(batch, vb, 1, addrs[1], sizes[1], 0); + blorp_fill_vertex_buffer_state(vb, 1, addrs[1], sizes[1], 0); blorp_vf_invalidate_for_vb_48b_transitions(batch, addrs, sizes, num_vbs); @@ -688,7 +687,7 @@ blorp_emit_vs_config(struct blorp_batch *batch, static void blorp_emit_sf_config(struct blorp_batch *batch, const struct blorp_params *params, - enum gen_urb_deref_block_size urb_deref_block_size) + UNUSED enum gen_urb_deref_block_size urb_deref_block_size) { const struct brw_wm_prog_data *prog_data = params->wm_prog_data; @@ -1400,7 +1399,7 @@ blorp_emit_memcpy(struct blorp_batch *batch, static void blorp_emit_surface_state(struct blorp_batch *batch, const struct brw_blorp_surface_info *surface, - enum isl_aux_op aux_op, + UNUSED enum isl_aux_op aux_op, void *state, uint32_t state_offset, const bool color_write_disables[4], bool is_render_target) @@ -1864,7 +1863,7 @@ blorp_emit_gen8_hiz_op(struct blorp_batch *batch, #endif static void -blorp_update_clear_color(struct blorp_batch *batch, +blorp_update_clear_color(UNUSED struct blorp_batch *batch, const struct brw_blorp_surface_info *info, enum isl_aux_op op) { -- 2.7.4