diff options
author | Eric Engestrom <[email protected]> | 2019-06-19 12:47:19 +0100 |
---|---|---|
committer | Eric Engestrom <[email protected]> | 2019-07-31 09:41:05 +0100 |
commit | abc226cf41574454c79477c217e60e8ff1fddfad (patch) | |
tree | 4c01a31ebe12a2a03bef6c7902a4d0ca400110ce /src/compiler | |
parent | ab9c76769ad070490434aa7104d11958e1fc49d4 (diff) |
tree-wide: replace MAYBE_UNUSED with ASSERTED
Suggested-by: Jason Ekstrand <[email protected]>
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/glsl/ast_type.cpp | 4 | ||||
-rw-r--r-- | src/compiler/glsl/ir_validate.cpp | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_buffer_access.cpp | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_int_to_float.c | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir_serialize.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp index ebb224e121f..8026302f0ac 100644 --- a/src/compiler/glsl/ast_type.cpp +++ b/src/compiler/glsl/ast_type.cpp @@ -175,8 +175,8 @@ validate_ordering(YYLTYPE *loc, } static bool -validate_point_mode(MAYBE_UNUSED const ast_type_qualifier &qualifier, - MAYBE_UNUSED const ast_type_qualifier &new_qualifier) +validate_point_mode(ASSERTED const ast_type_qualifier &qualifier, + ASSERTED const ast_type_qualifier &new_qualifier) { /* Point mode can only be true if the flag is set. */ assert (!qualifier.flags.q.point_mode || !new_qualifier.flags.q.point_mode diff --git a/src/compiler/glsl/ir_validate.cpp b/src/compiler/glsl/ir_validate.cpp index 33c262c8948..9be4e721f1a 100644 --- a/src/compiler/glsl/ir_validate.cpp +++ b/src/compiler/glsl/ir_validate.cpp @@ -1052,7 +1052,7 @@ ir_validate::validate_ir(ir_instruction *ir, void *data) _mesa_set_add(ir_set, ir); } -MAYBE_UNUSED static void +ASSERTED static void check_node_type(ir_instruction *ir, void *data) { (void) data; diff --git a/src/compiler/glsl/lower_buffer_access.cpp b/src/compiler/glsl/lower_buffer_access.cpp index 52ffa887c48..a6e2f741ebe 100644 --- a/src/compiler/glsl/lower_buffer_access.cpp +++ b/src/compiler/glsl/lower_buffer_access.cpp @@ -233,7 +233,7 @@ lower_buffer_access::is_dereferenced_thing_row_major(const ir_rvalue *deref) * layouts at HIR generation time, but we don't do that for shared * variables, which are always column-major */ - MAYBE_UNUSED ir_variable *var = deref->variable_referenced(); + ASSERTED ir_variable *var = deref->variable_referenced(); assert((var->is_in_buffer_block() && !matrix) || var->data.mode == ir_var_shader_shared); return false; diff --git a/src/compiler/nir/nir_lower_int_to_float.c b/src/compiler/nir/nir_lower_int_to_float.c index f082b663302..d1e77daf1fe 100644 --- a/src/compiler/nir/nir_lower_int_to_float.c +++ b/src/compiler/nir/nir_lower_int_to_float.c @@ -28,7 +28,7 @@ static bool assert_ssa_def_is_not_int(nir_ssa_def *def, void *arg) { - MAYBE_UNUSED BITSET_WORD *int_types = arg; + ASSERTED BITSET_WORD *int_types = arg; assert(!BITSET_TEST(int_types, def->index)); return true; } diff --git a/src/compiler/nir/nir_serialize.c b/src/compiler/nir/nir_serialize.c index fb95b996cd9..0a953c8daf4 100644 --- a/src/compiler/nir/nir_serialize.c +++ b/src/compiler/nir/nir_serialize.c @@ -684,7 +684,7 @@ write_phi(write_ctx *ctx, const nir_phi_instr *phi) nir_foreach_phi_src(src, phi) { assert(src->src.is_ssa); size_t blob_offset = blob_reserve_intptr(ctx->blob); - MAYBE_UNUSED size_t blob_offset2 = blob_reserve_intptr(ctx->blob); + ASSERTED size_t blob_offset2 = blob_reserve_intptr(ctx->blob); assert(blob_offset + sizeof(uintptr_t) == blob_offset2); write_phi_fixup fixup = { .blob_offset = blob_offset, |