From 5febd4d575393fbd7b42db4446f064f4054416a4 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sat, 22 Jun 2019 15:21:44 +0100 Subject: compiler: 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/compiler/nir/nir_constant_expressions.py | 4 ++-- src/compiler/nir/nir_opt_loop_unroll.c | 2 +- src/compiler/nir/nir_search.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/compiler/nir') diff --git a/src/compiler/nir/nir_constant_expressions.py b/src/compiler/nir/nir_constant_expressions.py index ed420c300f2..fca14602855 100644 --- a/src/compiler/nir/nir_constant_expressions.py +++ b/src/compiler/nir/nir_constant_expressions.py @@ -384,9 +384,9 @@ struct ${type}${width}_vec { % for name, op in sorted(opcodes.items()): static void evaluate_${name}(nir_const_value *_dst_val, - MAYBE_UNUSED unsigned num_components, + UNUSED unsigned num_components, ${"UNUSED" if op_bit_sizes(op) is None else ""} unsigned bit_size, - MAYBE_UNUSED nir_const_value **_src) + UNUSED nir_const_value **_src) { % if op_bit_sizes(op) is not None: switch (bit_size) { diff --git a/src/compiler/nir/nir_opt_loop_unroll.c b/src/compiler/nir/nir_opt_loop_unroll.c index c0198390749..55075824507 100644 --- a/src/compiler/nir/nir_opt_loop_unroll.c +++ b/src/compiler/nir/nir_opt_loop_unroll.c @@ -491,7 +491,7 @@ complex_unroll_single_terminator(nir_loop *loop) unsigned num_times_to_clone = loop->info->max_trip_count + 1; nir_cf_list lp_body; - MAYBE_UNUSED nir_cf_node *unroll_loc = + UNUSED nir_cf_node *unroll_loc = complex_unroll_loop_body(loop, terminator, &lp_header, &lp_body, remap_table, num_times_to_clone); diff --git a/src/compiler/nir/nir_search.c b/src/compiler/nir/nir_search.c index c62de4ad7fe..437f2bf39a7 100644 --- a/src/compiler/nir/nir_search.c +++ b/src/compiler/nir/nir_search.c @@ -549,7 +549,7 @@ construct_value(nir_builder *build, } } -MAYBE_UNUSED static void dump_value(const nir_search_value *val) +UNUSED static void dump_value(const nir_search_value *val) { switch (val->type) { case nir_search_value_constant: { -- cgit v1.2.3