diff options
-rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir_constant_expressions.py | 4 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_loop_unroll.c | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir_search.c | 2 | ||||
-rw-r--r-- | src/compiler/spirv/vtn_cfg.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index c6068ac9327..15f271234d5 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -598,7 +598,7 @@ struct _mesa_glsl_extension { /** Checks if the context supports a user-facing extension */ #define EXT(name_str, driver_cap, ...) \ -static MAYBE_UNUSED bool \ +static UNUSED bool \ has_##name_str(const struct gl_context *ctx, gl_api api, uint8_t version) \ { \ return ctx->Extensions.driver_cap && (version >= \ 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: { diff --git a/src/compiler/spirv/vtn_cfg.c b/src/compiler/spirv/vtn_cfg.c index db3c46a0de6..843966f86b5 100644 --- a/src/compiler/spirv/vtn_cfg.c +++ b/src/compiler/spirv/vtn_cfg.c @@ -248,7 +248,7 @@ vtn_cfg_handle_prepass_instruction(struct vtn_builder *b, SpvOp opcode, list_inithead(&b->func->body); b->func->control = w[3]; - MAYBE_UNUSED const struct glsl_type *result_type = + UNUSED const struct glsl_type *result_type = vtn_value(b, w[1], vtn_value_type_type)->type->type; struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_function); val->func = b->func; |