From eee70e09bf2e24e6baec30a6569dfcb2155e467b Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sat, 22 Jun 2019 13:31:53 +0100 Subject: intel: replace MAYBE_UNUSED with UNUSED MAYBE_UNUSED is going away, so let's replace legitimate uses of it with UNUSED, which the former aliased to so far anyway. Signed-off-by: Eric Engestrom Reviewed-by: Matt Turner --- src/intel/blorp/blorp_genX_exec.h | 4 ++-- src/intel/perf/gen_perf.py | 2 +- src/intel/vulkan/genX_pipeline.c | 2 +- src/mesa/drivers/dri/i965/genX_blorp_exec.c | 2 +- src/mesa/drivers/dri/i965/genX_state_upload.c | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h index 7a74b1d9d50..379d7a59b64 100644 --- a/src/intel/blorp/blorp_genX_exec.h +++ b/src/intel/blorp/blorp_genX_exec.h @@ -1074,7 +1074,7 @@ blorp_emit_blend_state(struct blorp_batch *batch, static uint32_t blorp_emit_color_calc_state(struct blorp_batch *batch, - MAYBE_UNUSED const struct blorp_params *params) + UNUSED const struct blorp_params *params) { uint32_t offset; blorp_emit_dynamic(batch, GENX(COLOR_CALC_STATE), cc, 64, &offset) { @@ -1475,7 +1475,7 @@ blorp_emit_surface_states(struct blorp_batch *batch, uint32_t bind_offset = 0, surface_offsets[2]; void *surface_maps[2]; - MAYBE_UNUSED bool has_indirect_clear_color = false; + UNUSED bool has_indirect_clear_color = false; if (params->use_pre_baked_binding_table) { bind_offset = params->pre_baked_binding_table_offset; } else { diff --git a/src/intel/perf/gen_perf.py b/src/intel/perf/gen_perf.py index 8874845613a..ef3aca64f2e 100644 --- a/src/intel/perf/gen_perf.py +++ b/src/intel/perf/gen_perf.py @@ -278,7 +278,7 @@ def output_counter_read(gen, set, counter): read_eq = counter.get('equation') c("static " + ret_type) - c(counter.read_sym + "(MAYBE_UNUSED struct gen_perf *perf,\n") + c(counter.read_sym + "(UNUSED struct gen_perf *perf,\n") c_indent(len(counter.read_sym) + 1) c("const struct gen_perf_query_info *query,\n") c("const uint64_t *accumulator)\n") diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index ebfcbb28a95..68723378554 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -1781,7 +1781,7 @@ emit_3dstate_ps(struct anv_pipeline *pipeline, const VkPipelineColorBlendStateCreateInfo *blend, const VkPipelineMultisampleStateCreateInfo *multisample) { - MAYBE_UNUSED const struct gen_device_info *devinfo = &pipeline->device->info; + UNUSED const struct gen_device_info *devinfo = &pipeline->device->info; const struct anv_shader_bin *fs_bin = pipeline->shaders[MESA_SHADER_FRAGMENT]; diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c index a838fd6e020..8f06f5e9ef2 100644 --- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c +++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c @@ -255,7 +255,7 @@ blorp_flush_range(UNUSED struct blorp_batch *batch, UNUSED void *start, static void blorp_emit_urb_config(struct blorp_batch *batch, unsigned vs_entry_size, - MAYBE_UNUSED unsigned sf_entry_size) + UNUSED unsigned sf_entry_size) { assert(batch->blorp->driver_ctx == batch->driver_batch); struct brw_context *brw = batch->driver_batch; diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c index 035fbb5073a..7b64fd9badc 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c @@ -237,9 +237,9 @@ genX(emit_vertex_buffer_state)(struct brw_context *brw, unsigned buffer_nr, struct brw_bo *bo, unsigned start_offset, - MAYBE_UNUSED unsigned end_offset, + UNUSED unsigned end_offset, unsigned stride, - MAYBE_UNUSED unsigned step_rate) + UNUSED unsigned step_rate) { struct GENX(VERTEX_BUFFER_STATE) buf_state = { .VertexBufferIndex = buffer_nr, @@ -4900,8 +4900,8 @@ genX(emit_mi_report_perf_count)(struct brw_context *brw, * Emit a 3DSTATE_SAMPLER_STATE_POINTERS_{VS,HS,GS,DS,PS} packet. */ static void -genX(emit_sampler_state_pointers_xs)(MAYBE_UNUSED struct brw_context *brw, - MAYBE_UNUSED struct brw_stage_state *stage_state) +genX(emit_sampler_state_pointers_xs)(UNUSED struct brw_context *brw, + UNUSED struct brw_stage_state *stage_state) { #if GEN_GEN >= 7 static const uint16_t packet_headers[] = { @@ -5117,7 +5117,7 @@ genX(upload_default_color)(struct brw_context *brw, } static uint32_t -translate_wrap_mode(GLenum wrap, MAYBE_UNUSED bool using_nearest) +translate_wrap_mode(GLenum wrap, UNUSED bool using_nearest) { switch (wrap) { case GL_REPEAT: -- cgit v1.2.3