diff --git a/src/compiler/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp index aeeba5d5573..fb1d4218e33 100644 --- a/src/compiler/nir/glsl_to_nir.cpp +++ b/src/compiler/nir/glsl_to_nir.cpp @@ -2007,7 +2007,7 @@ nir_visitor::visit(ir_dereference_array *ir) } void -nir_visitor::visit(ir_barrier *ir) +nir_visitor::visit(ir_barrier *) { nir_intrinsic_instr *instr = nir_intrinsic_instr_create(this->shader, nir_intrinsic_barrier); diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index 71adcb36267..cf6ca522c8b 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -893,6 +893,8 @@ src_is_valid(const nir_src *src) static bool remove_use_cb(nir_src *src, void *state) { + (void) state; + if (src_is_valid(src)) list_del(&src->use_link); @@ -902,6 +904,8 @@ remove_use_cb(nir_src *src, void *state) static bool remove_def_cb(nir_dest *dest, void *state) { + (void) state; + if (!dest->is_ssa) list_del(&dest->reg.def_link); diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index d0f3dc72884..a8399245b0b 100644 --- a/src/compiler/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c @@ -144,8 +144,7 @@ get_io_offset(nir_builder *b, nir_deref_var *deref, } static nir_intrinsic_op -load_op(struct lower_io_state *state, - nir_variable_mode mode, bool per_vertex) +load_op(nir_variable_mode mode, bool per_vertex) { nir_intrinsic_op op; switch (mode) { @@ -270,7 +269,7 @@ nir_lower_io_block(nir_block *block, nir_intrinsic_instr *load = nir_intrinsic_instr_create(state->mem_ctx, - load_op(state, mode, per_vertex)); + load_op(mode, per_vertex)); load->num_components = intrin->num_components; nir_intrinsic_set_base(load, diff --git a/src/compiler/nir/nir_lower_vec_to_movs.c b/src/compiler/nir/nir_lower_vec_to_movs.c index b383fb8ccf2..711ddd38bda 100644 --- a/src/compiler/nir/nir_lower_vec_to_movs.c +++ b/src/compiler/nir/nir_lower_vec_to_movs.c @@ -118,7 +118,7 @@ has_replicated_dest(nir_alu_instr *alu) * can then call insert_mov as normal. */ static unsigned -try_coalesce(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader) +try_coalesce(nir_alu_instr *vec, unsigned start_idx) { assert(start_idx < nir_op_infos[vec->op].num_inputs); @@ -264,7 +264,7 @@ lower_vec_to_movs_block(nir_block *block, nir_function_impl *impl) continue; if (!(finished_write_mask & (1 << i))) - finished_write_mask |= try_coalesce(vec, i, shader); + finished_write_mask |= try_coalesce(vec, i); if (!(finished_write_mask & (1 << i))) finished_write_mask |= insert_mov(vec, i, shader);