OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiler: replace MAYBE_UNUSED with UNUSED

Browse Source 
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 <eric.engestrom@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Eric Engestrom
2019-06-22 15:21:44 +01:00
parent bac5760e7b
commit 5febd4d575
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/glsl_parser_extras.cpp
View File

@@ -598,7 +598,7 @@ struct _mesa_glsl_extension {
/** Checks if the context supports a user-facing extension */ /** Checks if the context supports a user-facing extension */
#define EXT(name_str, driver_cap, ...) \ #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) \ has_##name_str(const struct gl_context *ctx, gl_api api, uint8_t version) \
{ \ { \
return ctx->Extensions.driver_cap && (version >= \ return ctx->Extensions.driver_cap && (version >= \

4
src/compiler/nir/nir_constant_expressions.py
View File

@@ -384,9 +384,9 @@ struct ${type}${width}_vec {
% for name, op in sorted(opcodes.items()): % for name, op in sorted(opcodes.items()):
static void static void
evaluate_${name}(nir_const_value *_dst_val, 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, ${"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: % if op_bit_sizes(op) is not None:
switch (bit_size) { switch (bit_size) {

2
src/compiler/nir/nir_opt_loop_unroll.c
View File

@@ -491,7 +491,7 @@ complex_unroll_single_terminator(nir_loop *loop)
unsigned num_times_to_clone = loop->info->max_trip_count + 1; unsigned num_times_to_clone = loop->info->max_trip_count + 1;
nir_cf_list lp_body; 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, complex_unroll_loop_body(loop, terminator, &lp_header, &lp_body,
remap_table, num_times_to_clone); remap_table, num_times_to_clone);

2
src/compiler/nir/nir_search.c
View File

@@ -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) { switch (val->type) {
case nir_search_value_constant: { case nir_search_value_constant: {

2
src/compiler/spirv/vtn_cfg.c
View File

@@ -248,7 +248,7 @@ vtn_cfg_handle_prepass_instruction(struct vtn_builder *b, SpvOp opcode,
list_inithead(&b->func->body); list_inithead(&b->func->body);
b->func->control = w[3]; 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; 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); struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_function);
val->func = b->func; val->func = b->func;