diff options
Diffstat (limited to 'src/compiler')
60 files changed, 168 insertions, 199 deletions
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index 3b2ec155bf6..00e787aacfe 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -1306,10 +1306,10 @@ nir_visitor::visit(ir_call *ir) assert(ir->return_deref); if (ir->return_deref->type->is_integer_64()) { nir_ssa_dest_init(&instr->instr, &instr->dest, - ir->return_deref->type->vector_elements, 64, NULL); + ir->return_deref->type->vector_elements, 64); } else { nir_ssa_dest_init(&instr->instr, &instr->dest, - ir->return_deref->type->vector_elements, 32, NULL); + ir->return_deref->type->vector_elements, 32); } nir_builder_instr_insert(&b, &instr->instr); break; @@ -1334,7 +1334,7 @@ nir_visitor::visit(ir_call *ir) /* Set the intrinsic destination. */ if (ir->return_deref) { - nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 32, NULL); + nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 32); } /* Set the intrinsic parameters. */ @@ -1390,8 +1390,7 @@ nir_visitor::visit(ir_call *ir) } else num_components = ir->return_deref->type->vector_elements; - nir_ssa_dest_init(&instr->instr, &instr->dest, - num_components, 32, NULL); + nir_ssa_dest_init(&instr->instr, &instr->dest, num_components, 32); } if (op == nir_intrinsic_image_deref_size) { @@ -1532,7 +1531,7 @@ nir_visitor::visit(ir_call *ir) break; } case nir_intrinsic_shader_clock: - nir_ssa_dest_init(&instr->instr, &instr->dest, 2, 32, NULL); + nir_ssa_dest_init(&instr->instr, &instr->dest, 2, 32); nir_intrinsic_set_memory_scope(instr, NIR_SCOPE_SUBGROUP); nir_builder_instr_insert(&b, &instr->instr); break; @@ -1583,8 +1582,8 @@ nir_visitor::visit(ir_call *ir) /* Setup destination register */ unsigned bit_size = type->is_boolean() ? 32 : glsl_get_bit_size(type); - nir_ssa_dest_init(&instr->instr, &instr->dest, - type->vector_elements, bit_size, NULL); + nir_ssa_dest_init(&instr->instr, &instr->dest, type->vector_elements, + bit_size); nir_builder_instr_insert(&b, &instr->instr); @@ -1649,8 +1648,7 @@ nir_visitor::visit(ir_call *ir) assert(ir->return_deref); unsigned bit_size = glsl_get_bit_size(ir->return_deref->type); nir_ssa_dest_init(&instr->instr, &instr->dest, - ir->return_deref->type->vector_elements, - bit_size, NULL); + ir->return_deref->type->vector_elements, bit_size); nir_intrinsic_set_atomic_op(instr, atomic_op); nir_builder_instr_insert(&b, &instr->instr); break; @@ -1660,7 +1658,7 @@ nir_visitor::visit(ir_call *ir) FALLTHROUGH; case nir_intrinsic_vote_any: case nir_intrinsic_vote_all: { - nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 1, NULL); + nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 1); ir_rvalue *value = (ir_rvalue *) ir->actual_parameters.get_head(); instr->src[0] = nir_src_for_ssa(evaluate_rvalue(value)); @@ -1671,7 +1669,7 @@ nir_visitor::visit(ir_call *ir) case nir_intrinsic_ballot: { nir_ssa_dest_init(&instr->instr, &instr->dest, - ir->return_deref->type->vector_elements, 64, NULL); + ir->return_deref->type->vector_elements, 64); instr->num_components = ir->return_deref->type->vector_elements; ir_rvalue *value = (ir_rvalue *) ir->actual_parameters.get_head(); @@ -1682,7 +1680,7 @@ nir_visitor::visit(ir_call *ir) } case nir_intrinsic_read_invocation: { nir_ssa_dest_init(&instr->instr, &instr->dest, - ir->return_deref->type->vector_elements, 32, NULL); + ir->return_deref->type->vector_elements, 32); instr->num_components = ir->return_deref->type->vector_elements; ir_rvalue *value = (ir_rvalue *) ir->actual_parameters.get_head(); @@ -1696,7 +1694,7 @@ nir_visitor::visit(ir_call *ir) } case nir_intrinsic_read_first_invocation: { nir_ssa_dest_init(&instr->instr, &instr->dest, - ir->return_deref->type->vector_elements, 32, NULL); + ir->return_deref->type->vector_elements, 32); instr->num_components = ir->return_deref->type->vector_elements; ir_rvalue *value = (ir_rvalue *) ir->actual_parameters.get_head(); @@ -1706,12 +1704,12 @@ nir_visitor::visit(ir_call *ir) break; } case nir_intrinsic_is_helper_invocation: { - nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 1, NULL); + nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 1); nir_builder_instr_insert(&b, &instr->instr); break; } case nir_intrinsic_is_sparse_texels_resident: { - nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 1, NULL); + nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 1); ir_rvalue *value = (ir_rvalue *) ir->actual_parameters.get_head(); instr->src[0] = nir_src_for_ssa(evaluate_rvalue(value)); @@ -1880,7 +1878,7 @@ nir_visitor::add_instr(nir_instr *instr, unsigned num_components, nir_dest *dest = get_instr_dest(instr); if (dest) - nir_ssa_dest_init(instr, dest, num_components, bit_size, NULL); + nir_ssa_dest_init(instr, dest, num_components, bit_size); nir_builder_instr_insert(&b, instr); diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index 2a1e2397b5a..231147b74ef 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -1799,8 +1799,7 @@ nir_ssa_def_init(nir_instr *instr, nir_ssa_def *def, /* note: does *not* take ownership of 'name' */ void nir_ssa_dest_init(nir_instr *instr, nir_dest *dest, - unsigned num_components, unsigned bit_size, - const char *name) + unsigned num_components, unsigned bit_size) { dest->is_ssa = true; nir_ssa_def_init(instr, &dest->ssa, num_components, bit_size); diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 8ac06bd5ed3..e5a37fb47fa 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -4450,8 +4450,7 @@ void nir_instr_rewrite_dest(nir_instr *instr, nir_dest *dest, nir_dest new_dest); void nir_ssa_dest_init(nir_instr *instr, nir_dest *dest, - unsigned num_components, unsigned bit_size, - const char *name); + unsigned num_components, unsigned bit_size); void nir_ssa_def_init(nir_instr *instr, nir_ssa_def *def, unsigned num_components, unsigned bit_size); static inline void @@ -4461,7 +4460,7 @@ nir_ssa_dest_init_for_type(nir_instr *instr, nir_dest *dest, { assert(glsl_type_is_vector_or_scalar(type)); nir_ssa_dest_init(instr, dest, glsl_get_components(type), - glsl_get_bit_size(type), name); + glsl_get_bit_size(type)); } void nir_ssa_def_rewrite_uses(nir_ssa_def *def, nir_ssa_def *new_ssa); void nir_ssa_def_rewrite_uses_src(nir_ssa_def *def, nir_src new_src); diff --git a/src/compiler/nir/nir_builder.c b/src/compiler/nir/nir_builder.c index 5db10dd974f..f2dd1ee84a5 100644 --- a/src/compiler/nir/nir_builder.c +++ b/src/compiler/nir/nir_builder.c @@ -116,7 +116,7 @@ nir_builder_alu_instr_finish_and_insert(nir_builder *build, nir_alu_instr *instr } nir_ssa_dest_init(&instr->instr, &instr->dest.dest, num_components, - bit_size, NULL); + bit_size); instr->dest.write_mask = nir_component_mask(num_components); nir_builder_instr_insert(build, &instr->instr); @@ -310,10 +310,8 @@ nir_build_tex_deref_instr(nir_builder *build, nir_texop op, } assert(src_idx == num_srcs); - nir_ssa_dest_init(&tex->instr, &tex->dest, - nir_tex_instr_dest_size(tex), - nir_alu_type_get_type_size(tex->dest_type), - NULL); + nir_ssa_dest_init(&tex->instr, &tex->dest, nir_tex_instr_dest_size(tex), + nir_alu_type_get_type_size(tex->dest_type)); nir_builder_instr_insert(build, &tex->instr); return &tex->dest.ssa; @@ -337,7 +335,7 @@ nir_vec_scalars(nir_builder *build, nir_ssa_scalar *comp, unsigned num_component * can't re-guess the num_components when num_components == 1 (nir_op_mov). */ nir_ssa_dest_init(&instr->instr, &instr->dest.dest, num_components, - comp[0].def->bit_size, NULL); + comp[0].def->bit_size); instr->dest.write_mask = nir_component_mask(num_components); nir_builder_instr_insert(build, &instr->instr); @@ -394,8 +392,7 @@ nir_load_system_value(nir_builder *build, nir_intrinsic_op op, int index, load->num_components = num_components; load->const_index[0] = index; - nir_ssa_dest_init(&load->instr, &load->dest, - num_components, bit_size, NULL); + nir_ssa_dest_init(&load->instr, &load->dest, num_components, bit_size); nir_builder_instr_insert(build, &load->instr); return &load->dest.ssa; } @@ -482,8 +479,8 @@ nir_if_phi(nir_builder *build, nir_ssa_def *then_def, nir_ssa_def *else_def) assert(then_def->num_components == else_def->num_components); assert(then_def->bit_size == else_def->bit_size); - nir_ssa_dest_init(&phi->instr, &phi->dest, - then_def->num_components, then_def->bit_size, NULL); + nir_ssa_dest_init(&phi->instr, &phi->dest, then_def->num_components, + then_def->bit_size); nir_builder_instr_insert(build, &phi->instr); diff --git a/src/compiler/nir/nir_builder.h b/src/compiler/nir/nir_builder.h index ad367d114ce..943bde09a8a 100644 --- a/src/compiler/nir/nir_builder.h +++ b/src/compiler/nir/nir_builder.h @@ -495,7 +495,7 @@ nir_mov_alu(nir_builder *build, nir_alu_src src, unsigned num_components) nir_alu_instr *mov = nir_alu_instr_create(build->shader, nir_op_mov); nir_ssa_dest_init(&mov->instr, &mov->dest.dest, num_components, - nir_src_bit_size(src.src), NULL); + nir_src_bit_size(src.src)); mov->exact = build->exact; mov->dest.write_mask = (1 << num_components) - 1; mov->src[0] = src; @@ -1220,7 +1220,7 @@ nir_build_deref_var(nir_builder *build, nir_variable *var) deref->var = var; nir_ssa_dest_init(&deref->instr, &deref->dest, 1, - nir_get_ptr_bitsize(build->shader), NULL); + nir_get_ptr_bitsize(build->shader)); nir_builder_instr_insert(build, &deref->instr); @@ -1247,7 +1247,7 @@ nir_build_deref_array(nir_builder *build, nir_deref_instr *parent, nir_ssa_dest_init(&deref->instr, &deref->dest, parent->dest.ssa.num_components, - parent->dest.ssa.bit_size, NULL); + parent->dest.ssa.bit_size); nir_builder_instr_insert(build, &deref->instr); @@ -1285,7 +1285,7 @@ nir_build_deref_ptr_as_array(nir_builder *build, nir_deref_instr *parent, nir_ssa_dest_init(&deref->instr, &deref->dest, parent->dest.ssa.num_components, - parent->dest.ssa.bit_size, NULL); + parent->dest.ssa.bit_size); nir_builder_instr_insert(build, &deref->instr); @@ -1307,7 +1307,7 @@ nir_build_deref_array_wildcard(nir_builder *build, nir_deref_instr *parent) nir_ssa_dest_init(&deref->instr, &deref->dest, parent->dest.ssa.num_components, - parent->dest.ssa.bit_size, NULL); + parent->dest.ssa.bit_size); nir_builder_instr_insert(build, &deref->instr); @@ -1330,7 +1330,7 @@ nir_build_deref_struct(nir_builder *build, nir_deref_instr *parent, nir_ssa_dest_init(&deref->instr, &deref->dest, parent->dest.ssa.num_components, - parent->dest.ssa.bit_size, NULL); + parent->dest.ssa.bit_size); nir_builder_instr_insert(build, &deref->instr); @@ -1350,8 +1350,8 @@ nir_build_deref_cast(nir_builder *build, nir_ssa_def *parent, deref->parent = nir_src_for_ssa(parent); deref->cast.ptr_stride = ptr_stride; - nir_ssa_dest_init(&deref->instr, &deref->dest, - parent->num_components, parent->bit_size, NULL); + nir_ssa_dest_init(&deref->instr, &deref->dest, parent->num_components, + parent->bit_size); nir_builder_instr_insert(build, &deref->instr); @@ -1374,7 +1374,7 @@ nir_alignment_deref_cast(nir_builder *build, nir_deref_instr *parent, nir_ssa_dest_init(&deref->instr, &deref->dest, parent->dest.ssa.num_components, - parent->dest.ssa.bit_size, NULL); + parent->dest.ssa.bit_size); nir_builder_instr_insert(build, &deref->instr); @@ -1589,8 +1589,7 @@ nir_load_global(nir_builder *build, nir_ssa_def *addr, unsigned align, load->num_components = num_components; load->src[0] = nir_src_for_ssa(addr); nir_intrinsic_set_align(load, align, 0); - nir_ssa_dest_init(&load->instr, &load->dest, - num_components, bit_size, NULL); + nir_ssa_dest_init(&load->instr, &load->dest, num_components, bit_size); nir_builder_instr_insert(build, &load->instr); return &load->dest.ssa; } @@ -1621,8 +1620,7 @@ nir_load_global_constant(nir_builder *build, nir_ssa_def *addr, unsigned align, load->num_components = num_components; load->src[0] = nir_src_for_ssa(addr); nir_intrinsic_set_align(load, align, 0); - nir_ssa_dest_init(&load->instr, &load->dest, - num_components, bit_size, NULL); + nir_ssa_dest_init(&load->instr, &load->dest, num_components, bit_size); nir_builder_instr_insert(build, &load->instr); return &load->dest.ssa; } @@ -1749,7 +1747,7 @@ nir_load_barycentric(nir_builder *build, nir_intrinsic_op op, { unsigned num_components = op == nir_intrinsic_load_barycentric_model ? 3 : 2; nir_intrinsic_instr *bary = nir_intrinsic_instr_create(build->shader, op); - nir_ssa_dest_init(&bary->instr, &bary->dest, num_components, 32, NULL); + nir_ssa_dest_init(&bary->instr, &bary->dest, num_components, 32); nir_intrinsic_set_interp_mode(bary, interp_mode); nir_builder_instr_insert(build, &bary->instr); return &bary->dest.ssa; diff --git a/src/compiler/nir/nir_builder_opcodes_h.py b/src/compiler/nir/nir_builder_opcodes_h.py index 48cd4dc29ce..ec9875b2ab2 100644 --- a/src/compiler/nir/nir_builder_opcodes_h.py +++ b/src/compiler/nir/nir_builder_opcodes_h.py @@ -120,9 +120,9 @@ _nir_build_${name}(nir_builder *build${intrinsic_decl_list(opcode)}) % endif % if opcode.has_dest: % if opcode.dest_components == 0: - nir_ssa_dest_init(&intrin->instr, &intrin->dest, intrin->num_components, ${get_intrinsic_bitsize(opcode)}, NULL); + nir_ssa_dest_init(&intrin->instr, &intrin->dest, intrin->num_components, ${get_intrinsic_bitsize(opcode)}); % else: - nir_ssa_dest_init(&intrin->instr, &intrin->dest, ${opcode.dest_components}, ${get_intrinsic_bitsize(opcode)}, NULL); + nir_ssa_dest_init(&intrin->instr, &intrin->dest, ${opcode.dest_components}, ${get_intrinsic_bitsize(opcode)}); % endif % endif % for i in range(opcode.num_srcs): diff --git a/src/compiler/nir/nir_builtin_builder.c b/src/compiler/nir/nir_builtin_builder.c index d7d0ba66e8e..07fd444603c 100644 --- a/src/compiler/nir/nir_builtin_builder.c +++ b/src/compiler/nir/nir_builtin_builder.c @@ -375,8 +375,8 @@ nir_get_texture_size(nir_builder *b, nir_tex_instr *tex) txs->src[idx].src = nir_src_for_ssa(nir_imm_int(b, 0)); txs->src[idx].src_type = nir_tex_src_lod; - nir_ssa_dest_init(&txs->instr, &txs->dest, - nir_tex_instr_dest_size(txs), 32, NULL); + nir_ssa_dest_init(&txs->instr, &txs->dest, nir_tex_instr_dest_size(txs), + 32); nir_builder_instr_insert(b, &txs->instr); return &txs->dest.ssa; @@ -427,7 +427,7 @@ nir_get_texture_lod(nir_builder *b, nir_tex_instr *tex) } } - nir_ssa_dest_init(&tql->instr, &tql->dest, 2, 32, NULL); + nir_ssa_dest_init(&tql->instr, &tql->dest, 2, 32); nir_builder_instr_insert(b, &tql->instr); /* The LOD is the y component of the result */ diff --git a/src/compiler/nir/nir_clone.c b/src/compiler/nir/nir_clone.c index a18f27feea2..84e1e40acec 100644 --- a/src/compiler/nir/nir_clone.c +++ b/src/compiler/nir/nir_clone.c @@ -257,7 +257,7 @@ __clone_dst(clone_state *state, nir_instr *ninstr, ndst->is_ssa = dst->is_ssa; if (dst->is_ssa) { nir_ssa_dest_init(ninstr, ndst, dst->ssa.num_components, - dst->ssa.bit_size, NULL); + dst->ssa.bit_size); if (likely(state->remap_table)) add_remap(state, &ndst->ssa, &dst->ssa); } else { diff --git a/src/compiler/nir/nir_convert_ycbcr.c b/src/compiler/nir/nir_convert_ycbcr.c index 14013b6bdbf..8b1cc071be7 100644 --- a/src/compiler/nir/nir_convert_ycbcr.c +++ b/src/compiler/nir/nir_convert_ycbcr.c @@ -172,8 +172,8 @@ get_texture_size(struct ycbcr_state *state, nir_deref_instr *texture) tex->src[0].src_type = nir_tex_src_texture_deref; tex->src[0].src = nir_src_for_ssa(&texture->dest.ssa); - nir_ssa_dest_init(&tex->instr, &tex->dest, - nir_tex_instr_dest_size(tex), 32, NULL); + nir_ssa_dest_init(&tex->instr, &tex->dest, nir_tex_instr_dest_size(tex), + 32); nir_builder_instr_insert(b, &tex->instr); state->image_size = nir_i2f32(b, &tex->dest.ssa); @@ -273,7 +273,7 @@ create_plane_tex_instr_implicit(struct ycbcr_state *state, nir_ssa_dest_init(&tex->instr, &tex->dest, old_tex->dest.ssa.num_components, - nir_dest_bit_size(old_tex->dest), NULL); + nir_dest_bit_size(old_tex->dest)); nir_builder_instr_insert(b, &tex->instr); return &tex->dest.ssa; diff --git a/src/compiler/nir/nir_deref.c b/src/compiler/nir/nir_deref.c index 35c594b5599..27b8cab4bbb 100644 --- a/src/compiler/nir/nir_deref.c +++ b/src/compiler/nir/nir_deref.c @@ -788,9 +788,7 @@ rematerialize_deref_in_block(nir_deref_instr *deref, } nir_ssa_dest_init(&new_deref->instr, &new_deref->dest, - deref->dest.ssa.num_components, - deref->dest.ssa.bit_size, - NULL); + deref->dest.ssa.num_components, deref->dest.ssa.bit_size); nir_builder_instr_insert(b, &new_deref->instr); return new_deref; diff --git a/src/compiler/nir/nir_from_ssa.c b/src/compiler/nir/nir_from_ssa.c index a903073d829..7c663ac8512 100644 --- a/src/compiler/nir/nir_from_ssa.c +++ b/src/compiler/nir/nir_from_ssa.c @@ -402,7 +402,7 @@ isolate_phi_nodes_block(nir_shader *shader, nir_block *block, void *dead_ctx) nir_parallel_copy_entry); nir_ssa_dest_init(&pcopy->instr, &entry->dest, phi->dest.ssa.num_components, - phi->dest.ssa.bit_size, NULL); + phi->dest.ssa.bit_size); entry->dest.ssa.divergent = nir_src_is_divergent(src->src); exec_list_push_tail(&pcopy->entries, &entry->node); @@ -416,8 +416,7 @@ isolate_phi_nodes_block(nir_shader *shader, nir_block *block, void *dead_ctx) nir_parallel_copy_entry *entry = rzalloc(dead_ctx, nir_parallel_copy_entry); nir_ssa_dest_init(&block_pcopy->instr, &entry->dest, - phi->dest.ssa.num_components, phi->dest.ssa.bit_size, - NULL); + phi->dest.ssa.num_components, phi->dest.ssa.bit_size); entry->dest.ssa.divergent = phi->dest.ssa.divergent; exec_list_push_tail(&block_pcopy->entries, &entry->node); diff --git a/src/compiler/nir/nir_lower_alu_width.c b/src/compiler/nir/nir_lower_alu_width.c index a2e519e1e5b..aedca323166 100644 --- a/src/compiler/nir/nir_lower_alu_width.c +++ b/src/compiler/nir/nir_lower_alu_width.c @@ -91,8 +91,7 @@ static void nir_alu_ssa_dest_init(nir_alu_instr *alu, unsigned num_components, unsigned bit_size) { - nir_ssa_dest_init(&alu->instr, &alu->dest.dest, num_components, - bit_size, NULL); + nir_ssa_dest_init(&alu->instr, &alu->dest.dest, num_components, bit_size); alu->dest.write_mask = (1 << num_components) - 1; } diff --git a/src/compiler/nir/nir_lower_atomics_to_ssbo.c b/src/compiler/nir/nir_lower_atomics_to_ssbo.c index 4a951b73f29..90b722b8405 100644 --- a/src/compiler/nir/nir_lower_atomics_to_ssbo.c +++ b/src/compiler/nir/nir_lower_atomics_to_ssbo.c @@ -181,8 +181,7 @@ lower_instr(nir_intrinsic_instr *instr, unsigned ssbo_offset, nir_builder *b, un } nir_ssa_dest_init(&new_instr->instr, &new_instr->dest, - instr->dest.ssa.num_components, - instr->dest.ssa.bit_size, NULL); + instr->dest.ssa.num_components, instr->dest.ssa.bit_size); nir_instr_insert_before(&instr->instr, &new_instr->instr); nir_instr_remove(&instr->instr); diff --git a/src/compiler/nir/nir_lower_bit_size.c b/src/compiler/nir/nir_lower_bit_size.c index bd70e912bc9..2b221bfe5cd 100644 --- a/src/compiler/nir/nir_lower_bit_size.c +++ b/src/compiler/nir/nir_lower_bit_size.c @@ -322,10 +322,10 @@ split_phi(nir_builder *b, nir_phi_instr *phi) nir_phi_instr_add_src(lowered[1], src->pred, nir_src_for_ssa(y)); } - nir_ssa_dest_init(&lowered[0]->instr, &lowered[0]->dest, - num_components, 32, NULL); - nir_ssa_dest_init(&lowered[1]->instr, &lowered[1]->dest, - num_components, 32, NULL); + nir_ssa_dest_init(&lowered[0]->instr, &lowered[0]->dest, num_components, + 32); + nir_ssa_dest_init(&lowered[1]->instr, &lowered[1]->dest, num_components, + 32); b->cursor = nir_before_instr(&phi->instr); nir_builder_instr_insert(b, &lowered[0]->instr); diff --git a/src/compiler/nir/nir_lower_bitmap.c b/src/compiler/nir/nir_lower_bitmap.c index 51e3f98f47b..c93d2f43a44 100644 --- a/src/compiler/nir/nir_lower_bitmap.c +++ b/src/compiler/nir/nir_lower_bitmap.c @@ -88,7 +88,7 @@ lower_bitmap(nir_shader *shader, nir_builder *b, nir_src_for_ssa(nir_channels(b, texcoord, (1 << tex->coord_components) - 1)); - nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); + nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32); nir_builder_instr_insert(b, &tex->instr); /* kill if tex != 0.0.. take .x or .w channel according to format: */ diff --git a/src/compiler/nir/nir_lower_drawpixels.c b/src/compiler/nir/nir_lower_drawpixels.c index ac5490cc9c3..0198d909113 100644 --- a/src/compiler/nir/nir_lower_drawpixels.c +++ b/src/compiler/nir/nir_lower_drawpixels.c @@ -136,7 +136,7 @@ lower_color(nir_builder *b, lower_drawpixels_state *state, nir_intrinsic_instr * nir_src_for_ssa(nir_channels(b, texcoord, (1 << tex->coord_components) - 1)); - nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); + nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32); nir_builder_instr_insert(b, &tex->instr); def = &tex->dest.ssa; @@ -176,7 +176,7 @@ lower_color(nir_builder *b, lower_drawpixels_state *state, nir_intrinsic_instr * tex->src[2].src_type = nir_tex_src_coord; tex->src[2].src = nir_src_for_ssa(nir_channels(b, def, 0x3)); - nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); + nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32); nir_builder_instr_insert(b, &tex->instr); def_xy = &tex->dest.ssa; @@ -190,7 +190,7 @@ lower_color(nir_builder *b, lower_drawpixels_state *state, nir_intrinsic_instr * tex->src[0].src_type = nir_tex_src_coord; tex->src[0].src = nir_src_for_ssa(nir_channels(b, def, 0xc)); - nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); + nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32); nir_builder_instr_insert(b, &tex->instr); def_zw = &tex->dest.ssa; diff --git a/src/compiler/nir/nir_lower_fb_read.c b/src/compiler/nir/nir_lower_fb_read.c index a6a8789525c..ce4dff452ec 100644 --- a/src/compiler/nir/nir_lower_fb_read.c +++ b/src/compiler/nir/nir_lower_fb_read.c @@ -78,7 +78,7 @@ nir_lower_fb_read_instr(nir_builder *b, nir_instr *instr, UNUSED void *cb_data) tex->src[2].src = nir_src_for_ssa(nir_imm_intN_t(b, io.location - FRAG_RESULT_DATA0, 32)); tex->src[2].src_type = nir_tex_src_texture_handle; - nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); + nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32); nir_builder_instr_insert(b, &tex->instr); nir_ssa_def_rewrite_uses(&intr->dest.ssa, &tex->dest.ssa); diff --git a/src/compiler/nir/nir_lower_image.c b/src/compiler/nir/nir_lower_image.c index 15b8cd1cd70..0b3f112040a 100644 --- a/src/compiler/nir/nir_lower_image.c +++ b/src/compiler/nir/nir_lower_image.c @@ -149,7 +149,7 @@ lower_image_samples_identical_to_fragment_mask_load(nir_builder *b, nir_intrinsi break; } - nir_ssa_dest_init(&fmask_load->instr, &fmask_load->dest, 1, 32, NULL); + nir_ssa_dest_init(&fmask_load->instr, &fmask_load->dest, 1, 32); nir_builder_instr_insert(b, &fmask_load->instr); nir_ssa_def *samples_identical = nir_ieq_imm(b, &fmask_load->dest.ssa, 0); diff --git a/src/compiler/nir/nir_lower_indirect_derefs.c b/src/compiler/nir/nir_lower_indirect_derefs.c index 1ffb990ea1c..b6d4106d511 100644 --- a/src/compiler/nir/nir_lower_indirect_derefs.c +++ b/src/compiler/nir/nir_lower_indirect_derefs.c @@ -102,7 +102,7 @@ emit_load_store_deref(nir_builder *b, nir_intrinsic_instr *orig_instr, nir_ssa_dest_init(&load->instr, &load->dest, orig_instr->dest.ssa.num_components, - orig_instr->dest.ssa.bit_size, NULL); + orig_instr->dest.ssa.bit_size); nir_builder_instr_insert(b, &load->instr); *dest = &load->dest.ssa; } else { diff --git a/src/compiler/nir/nir_lower_input_attachments.c b/src/compiler/nir/nir_lower_input_attachments.c index 869b1d99345..33e8e21c3c4 100644 --- a/src/compiler/nir/nir_lower_input_attachments.c +++ b/src/compiler/nir/nir_lower_input_attachments.c @@ -141,7 +141,8 @@ try_lower_input_load(nir_builder *b, nir_intrinsic_instr *load, tex->texture_non_uniform = nir_intrinsic_access(load) & ACCESS_NON_UNIFORM; - nir_ssa_dest_init(&tex->instr, &tex->dest, nir_tex_instr_dest_size(tex), 32, NULL); + nir_ssa_dest_init(&tex->instr, &tex->dest, nir_tex_instr_dest_size(tex), + 32); nir_builder_instr_insert(b, &tex->instr); if (tex->is_sparse) { diff --git a/src/compiler/nir/nir_lower_int64.c b/src/compiler/nir/nir_lower_int64.c index eb1dc1e3409..f19f659803d 100644 --- a/src/compiler/nir/nir_lower_int64.c +++ b/src/compiler/nir/nir_lower_int64.c @@ -1160,7 +1160,7 @@ split_64bit_subgroup_op(nir_builder *b, const nir_intrinsic_instr *intrin) sizeof(intrin->const_index)); nir_ssa_dest_init(&split->instr, &split->dest, - intrin->dest.ssa.num_components, 32, NULL); + intrin->dest.ssa.num_components, 32); nir_builder_instr_insert(b, &split->instr); res[i] = &split->dest.ssa; @@ -1176,7 +1176,7 @@ build_vote_ieq(nir_builder *b, nir_ssa_def *x) nir_intrinsic_instr_create(b->shader, nir_intrinsic_vote_ieq); vote->src[0] = nir_src_for_ssa(x); vote->num_components = x->num_components; - nir_ssa_dest_init(&vote->instr, &vote->dest, 1, 1, NULL); + nir_ssa_dest_init(&vote->instr, &vote->dest, 1, 1); nir_builder_instr_insert(b, &vote->instr); return &vote->dest.ssa; } @@ -1200,8 +1200,8 @@ build_scan_intrinsic(nir_builder *b, nir_intrinsic_op scan_op, nir_intrinsic_set_reduction_op(scan, reduction_op); if (scan_op == nir_intrinsic_reduce) nir_intrinsic_set_cluster_size(scan, cluster_size); - nir_ssa_dest_init(&scan->instr, &scan->dest, - val->num_components, val->bit_size, NULL); + nir_ssa_dest_init(&scan->instr, &scan->dest, val->num_components, + val->bit_size); nir_builder_instr_insert(b, &scan->instr); return &scan->dest.ssa; } diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index b4e8f93b49b..a3a94a4a733 100644 --- a/src/compiler/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c @@ -327,8 +327,7 @@ emit_load(struct lower_io_state *state, load->src[0] = nir_src_for_ssa(offset); } - nir_ssa_dest_init(&load->instr, &load->dest, - num_components, bit_size, NULL); + nir_ssa_dest_init(&load->instr, &load->dest, num_components, bit_size); nir_builder_instr_insert(b, &load->instr); return &load->dest.ssa; @@ -549,7 +548,7 @@ lower_interpolate_at(nir_intrinsic_instr *intrin, struct lower_io_state *state, nir_intrinsic_instr *bary_setup = nir_intrinsic_instr_create(state->builder.shader, bary_op); - nir_ssa_dest_init(&bary_setup->instr, &bary_setup->dest, 2, 32, NULL); + nir_ssa_dest_init(&bary_setup->instr, &bary_setup->dest, 2, 32); nir_intrinsic_set_interp_mode(bary_setup, var->data.interpolation); if (intrin->intrinsic == nir_intrinsic_interp_deref_at_sample || @@ -1476,8 +1475,7 @@ build_explicit_io_load(nir_builder *b, nir_intrinsic_instr *intrin, assert(intrin->dest.is_ssa); load->num_components = num_components; - nir_ssa_dest_init(&load->instr, &load->dest, num_components, - bit_size, NULL); + nir_ssa_dest_init(&load->instr, &load->dest, num_components, bit_size); assert(bit_size % 8 == 0); @@ -1784,8 +1782,8 @@ build_explicit_io_atomic(nir_builder *b, nir_intrinsic_instr *intrin, nir_intrinsic_set_access(atomic, nir_intrinsic_access(intrin)); assert(intrin->dest.ssa.num_components == 1); - nir_ssa_dest_init(&atomic->instr, &atomic->dest, - 1, intrin->dest.ssa.bit_size, NULL); + nir_ssa_dest_init(&atomic->instr, &atomic->dest, 1, + intrin->dest.ssa.bit_size); assert(atomic->dest.ssa.bit_size % 8 == 0); diff --git a/src/compiler/nir/nir_lower_io_arrays_to_elements.c b/src/compiler/nir/nir_lower_io_arrays_to_elements.c index 901da66962b..9599924681a 100644 --- a/src/compiler/nir/nir_lower_io_arrays_to_elements.c +++ b/src/compiler/nir/nir_lower_io_arrays_to_elements.c @@ -176,7 +176,7 @@ lower_array(nir_builder *b, nir_intrinsic_instr *intr, nir_variable *var, if (intr->intrinsic != nir_intrinsic_store_deref) { nir_ssa_dest_init(&element_intr->instr, &element_intr->dest, - intr->num_components, intr->dest.ssa.bit_size, NULL); + intr->num_components, intr->dest.ssa.bit_size); if (intr->intrinsic == nir_intrinsic_interp_deref_at_offset || intr->intrinsic == nir_intrinsic_interp_deref_at_sample || diff --git a/src/compiler/nir/nir_lower_io_to_scalar.c b/src/compiler/nir/nir_lower_io_to_scalar.c index cc9f738a114..083f8a140a0 100644 --- a/src/compiler/nir/nir_lower_io_to_scalar.c +++ b/src/compiler/nir/nir_lower_io_to_scalar.c @@ -52,8 +52,8 @@ lower_load_input_to_scalar(nir_builder *b, nir_intrinsic_instr *intr) for (unsigned i = 0; i < intr->num_components; i++) { nir_intrinsic_instr *chan_intr = nir_intrinsic_instr_create(b->shader, intr->intrinsic); - nir_ssa_dest_init(&chan_intr->instr, &chan_intr->dest, - 1, intr->dest.ssa.bit_size, NULL); + nir_ssa_dest_init(&chan_intr->instr, &chan_intr->dest, 1, + intr->dest.ssa.bit_size); chan_intr->num_components = 1; nir_intrinsic_set_base(chan_intr, nir_intrinsic_base(intr)); @@ -87,8 +87,8 @@ lower_load_to_scalar(nir_builder *b, nir_intrinsic_instr *intr) for (unsigned i = 0; i < intr->num_components; i++) { nir_intrinsic_instr *chan_intr = nir_intrinsic_instr_create(b->shader, intr->intrinsic); - nir_ssa_dest_init(&chan_intr->instr, &chan_intr->dest, - 1, intr->dest.ssa.bit_size, NULL); + nir_ssa_dest_init(&chan_intr->instr, &chan_intr->dest, 1, + intr->dest.ssa.bit_size); chan_intr->num_components = 1; nir_intrinsic_set_align_offset(chan_intr, @@ -351,8 +351,8 @@ lower_load_to_scalar_early(nir_builder *b, nir_intrinsic_instr *intr, nir_intrinsic_instr *chan_intr = nir_intrinsic_instr_create(b->shader, intr->intrinsic); - nir_ssa_dest_init(&chan_intr->instr, &chan_intr->dest, - 1, intr->dest.ssa.bit_size, NULL); + nir_ssa_dest_init(&chan_intr->instr, &chan_intr->dest, 1, + intr->dest.ssa.bit_size); chan_intr->num_components = 1; nir_deref_instr *deref = nir_build_deref_var(b, chan_var); diff --git a/src/compiler/nir/nir_lower_io_to_temporaries.c b/src/compiler/nir/nir_lower_io_to_temporaries.c index f767fab0eff..181cb77e730 100644 --- a/src/compiler/nir/nir_lower_io_to_temporaries.c +++ b/src/compiler/nir/nir_lower_io_to_temporaries.c @@ -209,7 +209,7 @@ emit_interp(nir_builder *b, nir_deref_instr **old_interp_deref, new_interp->num_components = interp->num_components; nir_ssa_dest_init(&new_interp->instr, &new_interp->dest, interp->dest.ssa.num_components, - interp->dest.ssa.bit_size, NULL); + interp->dest.ssa.bit_size); nir_builder_instr_insert(b, &new_interp->instr); nir_store_deref(b, temp_deref, &new_interp->dest.ssa, diff --git a/src/compiler/nir/nir_lower_locals_to_regs.c b/src/compiler/nir/nir_lower_locals_to_regs.c index f906f045118..0982e44bc5a 100644 --- a/src/compiler/nir/nir_lower_locals_to_regs.c +++ b/src/compiler/nir/nir_lower_locals_to_regs.c @@ -210,7 +210,7 @@ lower_locals_to_regs_block(nir_block *block, if (intrin->dest.is_ssa) { nir_ssa_dest_init(&mov->instr, &mov->dest.dest, intrin->num_components, - intrin->dest.ssa.bit_size, NULL); + intrin->dest.ssa.bit_size); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, &mov->dest.dest.ssa); } else { diff --git a/src/compiler/nir/nir_lower_mem_access_bit_sizes.c b/src/compiler/nir/nir_lower_mem_access_bit_sizes.c index 16269f6e76a..5ca3bcd4bb9 100644 --- a/src/compiler/nir/nir_lower_mem_access_bit_sizes.c +++ b/src/compiler/nir/nir_lower_mem_access_bit_sizes.c @@ -60,8 +60,7 @@ dup_mem_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin, if (info->has_dest) { assert(intrin->dest.is_ssa); - nir_ssa_dest_init(&dup->instr, &dup->dest, - num_components, bit_size, NULL); + nir_ssa_dest_init(&dup->instr, &dup->dest, num_components, bit_size); } else { nir_intrinsic_set_write_mask(dup, (1 << num_components) - 1); } diff --git a/src/compiler/nir/nir_lower_phis_to_scalar.c b/src/compiler/nir/nir_lower_phis_to_scalar.c index 7d86256f21a..a006917a0c2 100644 --- a/src/compiler/nir/nir_lower_phis_to_scalar.c +++ b/src/compiler/nir/nir_lower_phis_to_scalar.c @@ -205,14 +205,13 @@ lower_phis_to_scalar_block(nir_block *block, nir_alu_instr *vec = nir_alu_instr_create(state->shader, vec_op); nir_ssa_dest_init(&vec->instr, &vec->dest.dest, - phi->dest.ssa.num_components, - bit_size, NULL); + phi->dest.ssa.num_components, bit_size); vec->dest.write_mask = (1 << phi->dest.ssa.num_components) - 1; for (unsigned i = 0; i < phi->dest.ssa.num_components; i++) { nir_phi_instr *new_phi = nir_phi_instr_create(state->shader); nir_ssa_dest_init(&new_phi->instr, &new_phi->dest, 1, - phi->dest.ssa.bit_size, NULL); + phi->dest.ssa.bit_size); vec->src[i].src = nir_src_for_ssa(&new_phi->dest.ssa); @@ -220,7 +219,7 @@ lower_phis_to_scalar_block(nir_block *block, /* We need to insert a mov to grab the i'th component of src */ nir_alu_instr *mov = nir_alu_instr_create(state->shader, nir_op_mov); - nir_ssa_dest_init(&mov->instr, &mov->dest.dest, 1, bit_size, NULL); + nir_ssa_dest_init(&mov->instr, &mov->dest.dest, 1, bit_size); mov->dest.write_mask = 1; nir_src_copy(&mov->src[0].src, &src->src, &mov->instr); mov->src[0].swizzle[0] = i; diff --git a/src/compiler/nir/nir_lower_readonly_images_to_tex.c b/src/compiler/nir/nir_lower_readonly_images_to_tex.c index a06d5e6e131..c5dab873d66 100644 --- a/src/compiler/nir/nir_lower_readonly_images_to_tex.c +++ b/src/compiler/nir/nir_lower_readonly_images_to_tex.c @@ -152,7 +152,7 @@ lower_readonly_image_instr_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin assert(num_srcs == 3); tex->dest_type = nir_intrinsic_dest_type(intrin); - nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); + nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32); break; } @@ -165,8 +165,7 @@ lower_readonly_image_instr_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin assert(num_srcs == 2); tex->dest_type = nir_type_uint32; - nir_ssa_dest_init(&tex->instr, &tex->dest, - coord_components, 32, NULL); + nir_ssa_dest_init(&tex->instr, &tex->dest, coord_components, 32); break; } diff --git a/src/compiler/nir/nir_lower_regs_to_ssa.c b/src/compiler/nir/nir_lower_regs_to_ssa.c index 46fc263e42b..74d88b20009 100644 --- a/src/compiler/nir/nir_lower_regs_to_ssa.c +++ b/src/compiler/nir/nir_lower_regs_to_ssa.c @@ -95,8 +95,7 @@ rewrite_dest(nir_dest *dest, void *_state) return true; list_del(&dest->reg.def_link); - nir_ssa_dest_init(instr, dest, reg->num_components, - reg->bit_size, NULL); + nir_ssa_dest_init(instr, dest, reg->num_components, reg->bit_size); nir_phi_builder_value_set_block_def(value, instr->block, &dest->ssa); @@ -179,7 +178,7 @@ rewrite_alu_instr(nir_alu_instr *alu, struct regs_to_ssa_state *state) alu->dest.write_mask = (1 << num_components) - 1; list_del(&alu->dest.dest.reg.def_link); nir_ssa_dest_init(&alu->instr, &alu->dest.dest, num_components, - reg->bit_size, NULL); + reg->bit_size); nir_op vecN_op = nir_op_vec(reg->num_components); @@ -200,7 +199,7 @@ rewrite_alu_instr(nir_alu_instr *alu, struct regs_to_ssa_state *state) } nir_ssa_dest_init(&vec->instr, &vec->dest.dest, reg->num_components, - reg->bit_size, NULL); + reg->bit_size); nir_instr_insert(nir_after_instr(&alu->instr), &vec->instr); nir_phi_builder_value_set_block_def(value, alu->instr.block, diff --git a/src/compiler/nir/nir_lower_ssbo.c b/src/compiler/nir/nir_lower_ssbo.c index 54e2ed4c34b..d46e4d8e693 100644 --- a/src/compiler/nir/nir_lower_ssbo.c +++ b/src/compiler/nir/nir_lower_ssbo.c @@ -66,7 +66,7 @@ nir_load_ssbo_prop(nir_builder *b, nir_intrinsic_op op, nir_intrinsic_instr *load = nir_intrinsic_instr_create(b->shader, op); load->num_components = 1; nir_src_copy(&load->src[0], idx, &load->instr); - nir_ssa_dest_init(&load->instr, &load->dest, 1, bitsize, NULL); + nir_ssa_dest_init(&load->instr, &load->dest, 1, bitsize); nir_builder_instr_insert(b, &load->instr); return &load->dest.ssa; } @@ -117,7 +117,7 @@ lower_ssbo_instr(nir_builder *b, nir_intrinsic_instr *intr) } else { nir_ssa_dest_init(&global->instr, &global->dest, intr->dest.ssa.num_components, - intr->dest.ssa.bit_size, NULL); + intr->dest.ssa.bit_size); if (is_atomic) { nir_src_copy(&global->src[1], &intr->src[2], &global->instr); diff --git a/src/compiler/nir/nir_lower_subgroups.c b/src/compiler/nir/nir_lower_subgroups.c index 9ace7f25481..93bbef4a614 100644 --- a/src/compiler/nir/nir_lower_subgroups.c +++ b/src/compiler/nir/nir_lower_subgroups.c @@ -40,7 +40,7 @@ lower_subgroups_64bit_split_intrinsic(nir_builder *b, nir_intrinsic_instr *intri comp = nir_unpack_64_2x32_split_y(b, intrin->src[0].ssa); nir_intrinsic_instr *intr = nir_intrinsic_instr_create(b->shader, intrin->intrinsic); - nir_ssa_dest_init(&intr->instr, &intr->dest, 1, 32, NULL); + nir_ssa_dest_init(&intr->instr, &intr->dest, 1, 32); intr->const_index[0] = intrin->const_index[0]; intr->const_index[1] = intrin->const_index[1]; intr->src[0] = nir_src_for_ssa(comp); @@ -117,8 +117,8 @@ lower_subgroup_op_to_scalar(nir_builder *b, nir_intrinsic_instr *intrin, for (unsigned i = 0; i < intrin->num_components; i++) { nir_intrinsic_instr *chan_intrin = nir_intrinsic_instr_create(b->shader, intrin->intrinsic); - nir_ssa_dest_init(&chan_intrin->instr, &chan_intrin->dest, - 1, intrin->dest.ssa.bit_size, NULL); + nir_ssa_dest_init(&chan_intrin->instr, &chan_intrin->dest, 1, + intrin->dest.ssa.bit_size); chan_intrin->num_components = 1; /* value */ @@ -153,8 +153,8 @@ lower_vote_eq_to_scalar(nir_builder *b, nir_intrinsic_instr *intrin) for (unsigned i = 0; i < intrin->num_components; i++) { nir_intrinsic_instr *chan_intrin = nir_intrinsic_instr_create(b->shader, intrin->intrinsic); - nir_ssa_dest_init(&chan_intrin->instr, &chan_intrin->dest, - 1, intrin->dest.ssa.bit_size, NULL); + nir_ssa_dest_init(&chan_intrin->instr, &chan_intrin->dest, 1, + intrin->dest.ssa.bit_size); chan_intrin->num_components = 1; chan_intrin->src[0] = nir_src_for_ssa(nir_channel(b, value, i)); nir_builder_instr_insert(b, &chan_intrin->instr); @@ -213,7 +213,7 @@ lower_shuffle_to_swizzle(nir_builder *b, nir_intrinsic_instr *intrin, nir_intrinsic_set_swizzle_mask(swizzle, (mask << 10) | 0x1f); nir_ssa_dest_init(&swizzle->instr, &swizzle->dest, intrin->dest.ssa.num_components, - intrin->dest.ssa.bit_size, NULL); + intrin->dest.ssa.bit_size); if (options->lower_to_scalar && swizzle->num_components > 1) { return lower_subgroup_op_to_scalar(b, swizzle, options->lower_shuffle_to_32bit); @@ -309,7 +309,7 @@ lower_to_shuffle(nir_builder *b, nir_intrinsic_instr *intrin, shuffle->src[1] = nir_src_for_ssa(index); nir_ssa_dest_init(&shuffle->instr, &shuffle->dest, intrin->dest.ssa.num_components, - intrin->dest.ssa.bit_size, NULL); + intrin->dest.ssa.bit_size); bool lower_to_32bit = options->lower_shuffle_to_32bit && is_shuffle; if (options->lower_to_scalar && shuffle->num_components > 1) { @@ -588,7 +588,7 @@ lower_dynamic_quad_broadcast(nir_builder *b, nir_intrinsic_instr *intrin, nir_src_copy(&qbcst->src[0], &intrin->src[0], &qbcst->instr); nir_ssa_dest_init(&qbcst->instr, &qbcst->dest, intrin->dest.ssa.num_components, - intrin->dest.ssa.bit_size, NULL); + intrin->dest.ssa.bit_size); nir_ssa_def *qbcst_dst = NULL; diff --git a/src/compiler/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c index 639d8a256d5..3522c520e47 100644 --- a/src/compiler/nir/nir_lower_tex.c +++ b/src/compiler/nir/nir_lower_tex.c @@ -329,7 +329,7 @@ sample_plane(nir_builder *b, nir_tex_instr *tex, int plane, plane_tex->sampler_index = tex->sampler_index; nir_ssa_dest_init(&plane_tex->instr, &plane_tex->dest, 4, - nir_dest_bit_size(tex->dest), NULL); + nir_dest_bit_size(tex->dest)); nir_builder_instr_insert(b, &plane_tex->instr); @@ -824,8 +824,9 @@ lower_tex_to_txd(nir_builder *b, nir_tex_instr *tex) txd->src[tex->num_srcs + 1].src = nir_src_for_ssa(dfdy); txd->src[tex->num_srcs + 1].src_type = nir_tex_src_ddy; - nir_ssa_dest_init(&txd->instr, &txd->dest, nir_dest_num_components(tex->dest), - nir_dest_bit_size(tex->dest), NULL); + nir_ssa_dest_init(&txd->instr, &txd->dest, + nir_dest_num_components(tex->dest), + nir_dest_bit_size(tex->dest)); nir_builder_instr_insert(b, &txd->instr); nir_ssa_def_rewrite_uses(&tex->dest.ssa, &txd->dest.ssa); nir_instr_remove(&tex->instr); @@ -864,8 +865,9 @@ lower_txb_to_txl(nir_builder *b, nir_tex_instr *tex) txl->src[tex->num_srcs - 1].src = nir_src_for_ssa(lod); txl->src[tex->num_srcs - 1].src_type = nir_tex_src_lod; - nir_ssa_dest_init(&txl->instr, &txl->dest, nir_dest_num_components(tex->dest), - nir_dest_bit_size(tex->dest), NULL); + nir_ssa_dest_init(&txl->instr, &txl->dest, + nir_dest_num_components(tex->dest), + nir_dest_bit_size(tex->dest)); nir_builder_instr_insert(b, &txl->instr); nir_ssa_def_rewrite_uses(&tex->dest.ssa, &txl->dest.ssa); nir_instr_remove(&tex->instr); @@ -1176,7 +1178,7 @@ lower_tg4_offsets(nir_builder *b, nir_tex_instr *tex) tex_copy->src[tex_copy->num_srcs - 1] = src; nir_ssa_dest_init(&tex_copy->instr, &tex_copy->dest, - nir_tex_instr_dest_size(tex), 32, NULL); + nir_tex_instr_dest_size(tex), 32); nir_builder_instr_insert(b, &tex_copy->instr); @@ -1298,7 +1300,7 @@ nir_lower_ms_txf_to_fragment_fetch(nir_builder *b, nir_tex_instr *tex) fmask_fetch->is_array = tex->is_array; fmask_fetch->texture_non_uniform = tex->texture_non_uniform; fmask_fetch->dest_type = nir_type_uint32; - nir_ssa_dest_init(&fmask_fetch->instr, &fmask_fetch->dest, 1, 32, NULL); + nir_ssa_dest_init(&fmask_fetch->instr, &fmask_fetch->dest, 1, 32); fmask_fetch->num_srcs = 0; for (unsigned i = 0; i < tex->num_srcs; i++) { @@ -1331,7 +1333,7 @@ nir_lower_samples_identical_to_fragment_fetch(nir_builder *b, nir_tex_instr *tex nir_tex_instr *fmask_fetch = nir_instr_as_tex(nir_instr_clone(b->shader, &tex->instr)); fmask_fetch->op = nir_texop_fragment_mask_fetch_amd; fmask_fetch->dest_type = nir_type_uint32; - nir_ssa_dest_init(&fmask_fetch->instr, &fmask_fetch->dest, 1, 32, NULL); + nir_ssa_dest_init(&fmask_fetch->instr, &fmask_fetch->dest, 1, 32); nir_builder_instr_insert(b, &fmask_fetch->instr); nir_ssa_def_rewrite_uses(&tex->dest.ssa, nir_ieq_imm(b, &fmask_fetch->dest.ssa, 0)); diff --git a/src/compiler/nir/nir_lower_tex_shadow.c b/src/compiler/nir/nir_lower_tex_shadow.c index f7f04dc3e2e..10a7e51a671 100644 --- a/src/compiler/nir/nir_lower_tex_shadow.c +++ b/src/compiler/nir/nir_lower_tex_shadow.c @@ -98,7 +98,7 @@ nir_lower_tex_shadow_impl(nir_builder *b, nir_instr *instr, void *options) } /* NIR expects a vec4 result from the above texture instructions */ - nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); + nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32); nir_ssa_def *tex_r = nir_channel(b, &tex->dest.ssa, 0); nir_ssa_def *cmp = tex->src[comp_index].src.ssa; diff --git a/src/compiler/nir/nir_lower_vars_to_ssa.c b/src/compiler/nir/nir_lower_vars_to_ssa.c index 4e439a16997..4987d33d88f 100644 --- a/src/compiler/nir/nir_lower_vars_to_ssa.c +++ b/src/compiler/nir/nir_lower_vars_to_ssa.c @@ -610,7 +610,7 @@ rename_variables(struct lower_variables_state *state) mov->dest.write_mask = (1 << intrin->num_components) - 1; nir_ssa_dest_init(&mov->instr, &mov->dest.dest, intrin->num_components, - intrin->dest.ssa.bit_size, NULL); + intrin->dest.ssa.bit_size); nir_instr_insert_before(&intrin->instr, &mov->instr); nir_instr_remove(&intrin->instr); diff --git a/src/compiler/nir/nir_opt_comparison_pre.c b/src/compiler/nir/nir_opt_comparison_pre.c index d8b08ff706f..33e6c51a597 100644 --- a/src/compiler/nir/nir_opt_comparison_pre.c +++ b/src/compiler/nir/nir_opt_comparison_pre.c @@ -202,7 +202,7 @@ rewrite_compare_instruction(nir_builder *bld, nir_alu_instr *orig_cmp, mov_add->dest.write_mask = orig_add->dest.write_mask; nir_ssa_dest_init(&mov_add->instr, &mov_add->dest.dest, orig_add->dest.dest.ssa.num_components, - orig_add->dest.dest.ssa.bit_size, NULL); + orig_add->dest.dest.ssa.bit_size); mov_add->src[0].src = nir_src_for_ssa(fadd); nir_builder_instr_insert(bld, &mov_add->instr); @@ -211,7 +211,7 @@ rewrite_compare_instruction(nir_builder *bld, nir_alu_instr *orig_cmp, mov_cmp->dest.write_mask = orig_cmp->dest.write_mask; nir_ssa_dest_init(&mov_cmp->instr, &mov_cmp->dest.dest, orig_cmp->dest.dest.ssa.num_components, - orig_cmp->dest.dest.ssa.bit_size, NULL); + orig_cmp->dest.dest.ssa.bit_size); mov_cmp->src[0].src = nir_src_for_ssa(cmp); nir_builder_instr_insert(bld, &mov_cmp->instr); diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c index c1b4d2132e2..b1115ef5601 100644 --- a/src/compiler/nir/nir_opt_if.c +++ b/src/compiler/nir/nir_opt_if.c @@ -522,8 +522,8 @@ opt_split_alu_of_phi(nir_builder *b, nir_loop *loop) nir_phi_instr_add_src(phi, prev_block, nir_src_for_ssa(prev_value)); nir_phi_instr_add_src(phi, continue_block, nir_src_for_ssa(alu_copy)); - nir_ssa_dest_init(&phi->instr, &phi->dest, - alu_copy->num_components, alu_copy->bit_size, NULL); + nir_ssa_dest_init(&phi->instr, &phi->dest, alu_copy->num_components, + alu_copy->bit_size); b->cursor = nir_after_phis(header_block); nir_builder_instr_insert(b, &phi->instr); @@ -684,11 +684,9 @@ opt_simplify_bcsel_of_phi(nir_builder *b, nir_loop *loop) nir_phi_get_src_from_block(nir_instr_as_phi(bcsel->src[continue_src].src.ssa->parent_instr), continue_block)->src); - nir_ssa_dest_init(&phi->instr, - &phi->dest, + nir_ssa_dest_init(&phi->instr, &phi->dest, nir_dest_num_components(bcsel->dest.dest), - nir_dest_bit_size(bcsel->dest.dest), - NULL); + nir_dest_bit_size(bcsel->dest.dest)); b->cursor = nir_after_phis(header_block); nir_builder_instr_insert(b, &phi->instr); @@ -1208,7 +1206,7 @@ clone_alu_and_replace_src_defs(nir_builder *b, const nir_alu_instr *alu, nir_ssa_dest_init(&nalu->instr, &nalu->dest.dest, alu->dest.dest.ssa.num_components, - alu->dest.dest.ssa.bit_size, NULL); + alu->dest.dest.ssa.bit_size); nalu->dest.saturate = alu->dest.saturate; nalu->dest.write_mask = alu->dest.write_mask; diff --git a/src/compiler/nir/nir_opt_peephole_select.c b/src/compiler/nir/nir_opt_peephole_select.c index 857c1dd0064..5ec9a54df72 100644 --- a/src/compiler/nir/nir_opt_peephole_select.c +++ b/src/compiler/nir/nir_opt_peephole_select.c @@ -461,8 +461,7 @@ nir_opt_peephole_select_block(nir_block *block, nir_shader *shader, } nir_ssa_dest_init(&sel->instr, &sel->dest.dest, - phi->dest.ssa.num_components, - phi->dest.ssa.bit_size, NULL); + phi->dest.ssa.num_components, phi->dest.ssa.bit_size); sel->dest.write_mask = (1 << phi->dest.ssa.num_components) - 1; nir_ssa_def_rewrite_uses(&phi->dest.ssa, diff --git a/src/compiler/nir/nir_opt_phi_precision.c b/src/compiler/nir/nir_opt_phi_precision.c index f23d32096dc..10aa245faf1 100644 --- a/src/compiler/nir/nir_opt_phi_precision.c +++ b/src/compiler/nir/nir_opt_phi_precision.c @@ -227,8 +227,7 @@ try_move_narrowing_dst(nir_builder *b, nir_phi_instr *phi) nir_phi_instr *new_phi = nir_phi_instr_create(b->shader); nir_ssa_dest_init(&new_phi->instr, &new_phi->dest, phi->dest.ssa.num_components, - nir_alu_type_get_type_size(nir_op_infos[op].output_type), - NULL); + nir_alu_type_get_type_size(nir_op_infos[op].output_type)); /* Push the conversion into the new phi sources: */ nir_foreach_phi_src (src, phi) { @@ -379,8 +378,7 @@ try_move_widening_src(nir_builder *b, nir_phi_instr *phi) /* construct replacement phi instruction: */ nir_phi_instr *new_phi = nir_phi_instr_create(b->shader); nir_ssa_dest_init(&new_phi->instr, &new_phi->dest, - phi->dest.ssa.num_components, - bit_size, NULL); + phi->dest.ssa.num_components, bit_size); /* Remove the widening conversions from the phi sources: */ nir_foreach_phi_src (src, phi) { diff --git a/src/compiler/nir/nir_opt_uniform_atomics.c b/src/compiler/nir/nir_opt_uniform_atomics.c index d9a512c4c0f..d8e713ca731 100644 --- a/src/compiler/nir/nir_opt_uniform_atomics.c +++ b/src/compiler/nir/nir_opt_uniform_atomics.c @@ -275,7 +275,8 @@ optimize_and_rewrite_atomic(nir_builder *b, nir_intrinsic_instr *intrin) nir_ssa_def old_result = intrin->dest.ssa; list_replace(&intrin->dest.ssa.uses, &old_result.uses); - nir_ssa_dest_init(&intrin->instr, &intrin->dest, 1, intrin->dest.ssa.bit_size, NULL); + nir_ssa_dest_init(&intrin->instr, &intrin->dest, 1, + intrin->dest.ssa.bit_size); nir_ssa_def *result = optimize_atomic(b, intrin, return_prev); diff --git a/src/compiler/nir/nir_opt_vectorize.c b/src/compiler/nir/nir_opt_vectorize.c index f36cd89237a..fc37e3845e9 100644 --- a/src/compiler/nir/nir_opt_vectorize.c +++ b/src/compiler/nir/nir_opt_vectorize.c @@ -206,8 +206,8 @@ instr_try_combine(struct set *instr_set, nir_instr *instr1, nir_instr *instr2) b.cursor = nir_after_instr(instr1); nir_alu_instr *new_alu = nir_alu_instr_create(b.shader, alu1->op); - nir_ssa_dest_init(&new_alu->instr, &new_alu->dest.dest, - total_components, alu1->dest.dest.ssa.bit_size, NULL); + nir_ssa_dest_init(&new_alu->instr, &new_alu->dest.dest, total_components, + alu1->dest.dest.ssa.bit_size); new_alu->dest.write_mask = (1 << total_components) - 1; new_alu->instr.pass_flags = alu1->instr.pass_flags; diff --git a/src/compiler/nir/nir_phi_builder.c b/src/compiler/nir/nir_phi_builder.c index 0a9e81fa270..3f13e6b68a2 100644 --- a/src/compiler/nir/nir_phi_builder.c +++ b/src/compiler/nir/nir_phi_builder.c @@ -233,7 +233,7 @@ nir_phi_builder_value_get_block_def(struct nir_phi_builder_value *val, */ nir_phi_instr *phi = nir_phi_instr_create(val->builder->shader); nir_ssa_dest_init(&phi->instr, &phi->dest, val->num_components, - val->bit_size, NULL); + val->bit_size); phi->instr.block = dom; exec_list_push_tail(&val->phis, &phi->instr.node); def = &phi->dest.ssa; diff --git a/src/compiler/nir/nir_repair_ssa.c b/src/compiler/nir/nir_repair_ssa.c index 443fa894879..592a7460232 100644 --- a/src/compiler/nir/nir_repair_ssa.c +++ b/src/compiler/nir/nir_repair_ssa.c @@ -126,8 +126,8 @@ repair_ssa_def(nir_ssa_def *def, void *void_state) cast->parent = nir_src_for_ssa(block_def); cast->cast.ptr_stride = nir_deref_instr_array_stride(deref); - nir_ssa_dest_init(&cast->instr, &cast->dest, - def->num_components, def->bit_size, NULL); + nir_ssa_dest_init(&cast->instr, &cast->dest, def->num_components, + def->bit_size); nir_instr_insert(nir_before_instr(src->parent_instr), &cast->instr); block_def = &cast->dest.ssa; diff --git a/src/compiler/nir/nir_search.c b/src/compiler/nir/nir_search.c index 68e22762118..897fcecea7f 100644 --- a/src/compiler/nir/nir_search.c +++ b/src/compiler/nir/nir_search.c @@ -451,7 +451,7 @@ construct_value(nir_builder *build, nir_alu_instr *alu = nir_alu_instr_create(build->shader, op); nir_ssa_dest_init(&alu->instr, &alu->dest.dest, num_components, - dst_bit_size, NULL); + dst_bit_size); alu->dest.write_mask = (1 << num_components) - 1; alu->dest.saturate = false; diff --git a/src/compiler/nir/nir_serialize.c b/src/compiler/nir/nir_serialize.c index b94665a77b4..faf17700af5 100644 --- a/src/compiler/nir/nir_serialize.c +++ b/src/compiler/nir/nir_serialize.c @@ -771,7 +771,7 @@ read_dest(read_ctx *ctx, nir_dest *dst, nir_instr *instr, num_components = blob_read_uint32(ctx->blob); else num_components = decode_num_components_in_3bits(dest.ssa.num_components); - nir_ssa_dest_init(instr, dst, num_components, bit_size, NULL); + nir_ssa_dest_init(instr, dst, num_components, bit_size); dst->ssa.divergent = dest.ssa.divergent; read_add_object(ctx, &dst->ssa); } else { diff --git a/src/compiler/nir/nir_split_64bit_vec3_and_vec4.c b/src/compiler/nir/nir_split_64bit_vec3_and_vec4.c index 0ca5cd66a6a..ac6c7c1edc8 100644 --- a/src/compiler/nir/nir_split_64bit_vec3_and_vec4.c +++ b/src/compiler/nir/nir_split_64bit_vec3_and_vec4.c @@ -228,8 +228,7 @@ split_phi(nir_builder *b, nir_phi_instr *phi) nir_alu_instr *vec = nir_alu_instr_create(b->shader, vec_op); nir_ssa_dest_init(&vec->instr, &vec->dest.dest, - phi->dest.ssa.num_components, - 64, NULL); + phi->dest.ssa.num_components, 64); vec->dest.write_mask = (1 << phi->dest.ssa.num_components) - 1; int num_comp[2] = {2, phi->dest.ssa.num_components - 2}; @@ -239,7 +238,7 @@ split_phi(nir_builder *b, nir_phi_instr *phi) for (unsigned i = 0; i < 2; i++) { new_phi[i] = nir_phi_instr_create(b->shader); nir_ssa_dest_init(&new_phi[i]->instr, &new_phi[i]->dest, num_comp[i], - phi->dest.ssa.bit_size, NULL); + phi->dest.ssa.bit_size); nir_foreach_phi_src(src, phi) { /* Insert at the end of the predecessor but before the jump diff --git a/src/compiler/nir/nir_to_lcssa.c b/src/compiler/nir/nir_to_lcssa.c index 49a43a2006e..41ecc69314a 100644 --- a/src/compiler/nir/nir_to_lcssa.c +++ b/src/compiler/nir/nir_to_lcssa.c @@ -227,8 +227,8 @@ convert_loop_exit_for_ssa(nir_ssa_def *def, void *void_state) /* Initialize a phi-instruction */ nir_phi_instr *phi = nir_phi_instr_create(state->shader); - nir_ssa_dest_init(&phi->instr, &phi->dest, - def->num_components, def->bit_size, "LCSSA-phi"); + nir_ssa_dest_init(&phi->instr, &phi->dest, def->num_components, + def->bit_size); /* Create a phi node with as many sources pointing to the same ssa_def as * the block has predecessors. @@ -253,8 +253,7 @@ convert_loop_exit_for_ssa(nir_ssa_def *def, void *void_state) cast->cast.ptr_stride = nir_deref_instr_array_stride(instr); nir_ssa_dest_init(&cast->instr, &cast->dest, - phi->dest.ssa.num_components, - phi->dest.ssa.bit_size, NULL); + phi->dest.ssa.num_components, phi->dest.ssa.bit_size); nir_instr_insert(nir_after_phis(state->block_after_loop), &cast->instr); dest = &cast->dest.ssa; } diff --git a/src/compiler/nir/tests/dce_tests.cpp b/src/compiler/nir/tests/dce_tests.cpp index d5d5662ccb0..bcd230e32f5 100644 --- a/src/compiler/nir/tests/dce_tests.cpp +++ b/src/compiler/nir/tests/dce_tests.cpp @@ -51,8 +51,8 @@ nir_phi_instr *create_one_source_phi(nir_shader *shader, nir_block *pred, { nir_phi_instr *phi = nir_phi_instr_create(shader); nir_phi_instr_add_src(phi, pred, nir_src_for_ssa(def)); - nir_ssa_dest_init(&phi->instr, &phi->dest, - def->num_components, def->bit_size, NULL); + nir_ssa_dest_init(&phi->instr, &phi->dest, def->num_components, + def->bit_size); return phi; } diff --git a/src/compiler/nir/tests/load_store_vectorizer_tests.cpp b/src/compiler/nir/tests/load_store_vectorizer_tests.cpp index 1fdf665085e..260d76aed91 100644 --- a/src/compiler/nir/tests/load_store_vectorizer_tests.cpp +++ b/src/compiler/nir/tests/load_store_vectorizer_tests.cpp @@ -185,7 +185,7 @@ nir_load_store_vectorize_test::get_resource(uint32_t binding, bool ssbo) nir_intrinsic_instr *res = nir_intrinsic_instr_create( b->shader, nir_intrinsic_vulkan_resource_index); - nir_ssa_dest_init(&res->instr, &res->dest, 1, 32, NULL); + nir_ssa_dest_init(&res->instr, &res->dest, 1, 32); res->num_components = 1; res->src[0] = nir_src_for_ssa(nir_imm_zero(b, 1, 32)); nir_intrinsic_set_desc_type( @@ -220,7 +220,7 @@ nir_load_store_vectorize_test::create_indirect_load( return NULL; } nir_intrinsic_instr *load = nir_intrinsic_instr_create(b->shader, intrinsic); - nir_ssa_dest_init(&load->instr, &load->dest, components, bit_size, NULL); + nir_ssa_dest_init(&load->instr, &load->dest, components, bit_size); load->num_components = components; if (res) { load->src[0] = nir_src_for_ssa(res); @@ -281,7 +281,7 @@ nir_load_store_vectorize_test::create_indirect_store( return; } nir_intrinsic_instr *store = nir_intrinsic_instr_create(b->shader, intrinsic); - nir_ssa_dest_init(&store->instr, &store->dest, components, bit_size, NULL); + nir_ssa_dest_init(&store->instr, &store->dest, components, bit_size); store->num_components = components; if (res) { store->src[0] = nir_src_for_ssa(value); @@ -1222,7 +1222,7 @@ TEST_F(nir_load_store_vectorize_test, shared_load_distant_64bit) { nir_variable *var = nir_variable_create(b->shader, nir_var_mem_shared, glsl_array_type(glsl_uint_type(), 4, 0), "var"); nir_deref_instr *deref = nir_build_deref_var(b, var); - nir_ssa_dest_init(&deref->instr, &deref->dest, 1, 64, NULL); + nir_ssa_dest_init(&deref->instr, &deref->dest, 1, 64); create_shared_load(nir_build_deref_array_imm(b, deref, 0x100000000), 0x1); create_shared_load(nir_build_deref_array_imm(b, deref, 0x200000001), 0x2); diff --git a/src/compiler/nir/tests/loop_analyze_tests.cpp b/src/compiler/nir/tests/loop_analyze_tests.cpp index 8454f5ef3ac..dba30fd71c5 100644 --- a/src/compiler/nir/tests/loop_analyze_tests.cpp +++ b/src/compiler/nir/tests/loop_analyze_tests.cpp @@ -83,9 +83,8 @@ loop_builder(nir_builder *b, loop_builder_param p) nir_loop *loop = nir_push_loop(b); { - nir_ssa_dest_init(&phi->instr, &phi->dest, - ssa_0->num_components, ssa_0->bit_size, - NULL); + nir_ssa_dest_init(&phi->instr, &phi->dest, ssa_0->num_components, + ssa_0->bit_size); nir_phi_instr_add_src(phi, ssa_0->parent_instr->block, nir_src_for_ssa(ssa_0)); @@ -154,9 +153,8 @@ loop_builder_invert(nir_builder *b, loop_builder_invert_param p) nir_loop *loop = nir_push_loop(b); { - nir_ssa_dest_init(&phi->instr, &phi->dest, - ssa_0->num_components, ssa_0->bit_size, - NULL); + nir_ssa_dest_init(&phi->instr, &phi->dest, ssa_0->num_components, + ssa_0->bit_size); nir_phi_instr_add_src(phi, ssa_0->parent_instr->block, nir_src_for_ssa(ssa_0)); diff --git a/src/compiler/nir/tests/loop_unroll_tests.cpp b/src/compiler/nir/tests/loop_unroll_tests.cpp index 7260909ebce..a5f3141f2fe 100644 --- a/src/compiler/nir/tests/loop_unroll_tests.cpp +++ b/src/compiler/nir/tests/loop_unroll_tests.cpp @@ -116,7 +116,7 @@ loop_unroll_test_helper(nir_builder *bld, nir_ssa_def *init, nir_block *head_block = nir_loop_first_block(loop); nir_phi_instr *phi = nir_phi_instr_create(bld->shader); - nir_ssa_dest_init(&phi->instr, &phi->dest, 1, 32, NULL); + nir_ssa_dest_init(&phi->instr, &phi->dest, 1, 32); nir_phi_instr_add_src(phi, top_block, nir_src_for_ssa(init)); diff --git a/src/compiler/nir/tests/lower_returns_tests.cpp b/src/compiler/nir/tests/lower_returns_tests.cpp index 83b9fcd231c..27ee3c72679 100644 --- a/src/compiler/nir/tests/lower_returns_tests.cpp +++ b/src/compiler/nir/tests/lower_returns_tests.cpp @@ -58,8 +58,8 @@ nir_phi_instr *create_one_source_phi(nir_shader *shader, nir_block *pred, nir_phi_instr_add_src(phi, pred, nir_src_for_ssa(def)); - nir_ssa_dest_init(&phi->instr, &phi->dest, - def->num_components, def->bit_size, NULL); + nir_ssa_dest_init(&phi->instr, &phi->dest, def->num_components, + def->bit_size); return phi; } diff --git a/src/compiler/nir/tests/mod_analysis_tests.cpp b/src/compiler/nir/tests/mod_analysis_tests.cpp index 7f3f308ebfb..768152d7e85 100644 --- a/src/compiler/nir/tests/mod_analysis_tests.cpp +++ b/src/compiler/nir/tests/mod_analysis_tests.cpp @@ -69,7 +69,7 @@ nir_mod_analysis_test::nir_imul_vec2y(nir_builder *b, nir_ssa_def *src0, nir_ssa instr->src[1].src = nir_src_for_ssa(src1); instr->src[1].swizzle[0] = 1; - nir_ssa_dest_init(&instr->instr, &instr->dest.dest, 1, 32, NULL); + nir_ssa_dest_init(&instr->instr, &instr->dest.dest, 1, 32); instr->dest.write_mask = 1; nir_builder_instr_insert(b, &instr->instr); diff --git a/src/compiler/nir/tests/opt_if_tests.cpp b/src/compiler/nir/tests/opt_if_tests.cpp index 7757248d1dc..0291a8bcb4c 100644 --- a/src/compiler/nir/tests/opt_if_tests.cpp +++ b/src/compiler/nir/tests/opt_if_tests.cpp @@ -126,7 +126,7 @@ TEST_F(nir_opt_if_test, opt_if_simplification_single_source_phi_after_if) nir_phi_instr_add_src(phi, then_block, nir_src_for_ssa(one)); nir_ssa_dest_init(&phi->instr, &phi->dest, - one->num_components, one->bit_size, NULL); + one->num_components, one->bit_size); nir_builder_instr_insert(&bld, &phi->instr); @@ -148,7 +148,7 @@ TEST_F(nir_opt_if_test, opt_if_alu_of_phi_progress) nir_loop *loop = nir_push_loop(&bld); { nir_ssa_dest_init(&phi->instr, &phi->dest, - x->num_components, x->bit_size, NULL); + x->num_components, x->bit_size); nir_phi_instr_add_src(phi, x->parent_instr->block, nir_src_for_ssa(x)); diff --git a/src/compiler/nir/tests/opt_shrink_vectors_tests.cpp b/src/compiler/nir/tests/opt_shrink_vectors_tests.cpp index a9b86d76218..89c5ce268ff 100644 --- a/src/compiler/nir/tests/opt_shrink_vectors_tests.cpp +++ b/src/compiler/nir/tests/opt_shrink_vectors_tests.cpp @@ -300,8 +300,7 @@ TEST_F(nir_opt_shrink_vectors_test, opt_shrink_phis_loop_simple) nir_loop *loop = nir_push_loop(&bld); nir_ssa_dest_init(&phi->instr, &phi->dest, - v->num_components, v->bit_size, - NULL); + v->num_components, v->bit_size); nir_phi_instr_add_src(phi, v->parent_instr->block, nir_src_for_ssa(v)); @@ -410,8 +409,7 @@ TEST_F(nir_opt_shrink_vectors_test, opt_shrink_phis_loop_swizzle) nir_loop *loop = nir_push_loop(&bld); nir_ssa_dest_init(&phi->instr, &phi->dest, - v->num_components, v->bit_size, - NULL); + v->num_components, v->bit_size); nir_phi_instr_add_src(phi, v->parent_instr->block, nir_src_for_ssa(v)); @@ -521,8 +519,7 @@ TEST_F(nir_opt_shrink_vectors_test, opt_shrink_phis_loop_phi_out) nir_loop *loop = nir_push_loop(&bld); nir_ssa_dest_init(&phi->instr, &phi->dest, - v->num_components, v->bit_size, - NULL); + v->num_components, v->bit_size); nir_phi_instr_add_src(phi, v->parent_instr->block, nir_src_for_ssa(v)); diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 41e3719f4f0..648ceabf4ab 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -3195,7 +3195,7 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode, instr->dest_type = dest_type; nir_ssa_dest_init(&instr->instr, &instr->dest, - nir_tex_instr_dest_size(instr), 32, NULL); + nir_tex_instr_dest_size(instr), 32); vtn_assert(glsl_get_vector_elements(ret_type->type) == nir_tex_instr_result_size(instr)); @@ -3676,8 +3676,7 @@ vtn_handle_image(struct vtn_builder *b, SpvOp opcode, bit_size = MIN2(bit_size, 32); nir_ssa_dest_init(&intrin->instr, &intrin->dest, - nir_intrinsic_dest_components(intrin), - bit_size, NULL); + nir_intrinsic_dest_components(intrin), bit_size); nir_builder_instr_insert(&b->nb, &intrin->instr); @@ -3942,12 +3941,11 @@ vtn_handle_atomics(struct vtn_builder *b, SpvOp opcode, if (opcode == SpvOpAtomicFlagTestAndSet) { /* map atomic flag to a 32-bit atomic integer. */ - nir_ssa_dest_init(&atomic->instr, &atomic->dest, - 1, 32, NULL); + nir_ssa_dest_init(&atomic->instr, &atomic->dest, 1, 32); } else { nir_ssa_dest_init(&atomic->instr, &atomic->dest, glsl_get_vector_elements(type->type), - glsl_get_bit_size(type->type), NULL); + glsl_get_bit_size(type->type)); vtn_push_nir_ssa(b, w[2], &atomic->dest.ssa); } @@ -3967,8 +3965,7 @@ create_vec(struct vtn_builder *b, unsigned num_components, unsigned bit_size) { nir_op op = nir_op_vec(num_components); nir_alu_instr *vec = nir_alu_instr_create(b->shader, op); - nir_ssa_dest_init(&vec->instr, &vec->dest.dest, num_components, - bit_size, NULL); + nir_ssa_dest_init(&vec->instr, &vec->dest.dest, num_components, bit_size); vec->dest.write_mask = (1 << num_components) - 1; return vec; @@ -5761,7 +5758,7 @@ vtn_handle_ray_intrinsic(struct vtn_builder *b, SpvOp opcode, nir_intrinsic_report_ray_intersection); intrin->src[0] = nir_src_for_ssa(vtn_ssa_value(b, w[3])->def); intrin->src[1] = nir_src_for_ssa(vtn_ssa_value(b, w[4])->def); - nir_ssa_dest_init(&intrin->instr, &intrin->dest, 1, 1, NULL); + nir_ssa_dest_init(&intrin->instr, &intrin->dest, 1, 1); nir_builder_instr_insert(&b->nb, &intrin->instr); vtn_push_nir_ssa(b, w[2], &intrin->dest.ssa); break; diff --git a/src/compiler/spirv/vtn_amd.c b/src/compiler/spirv/vtn_amd.c index 85df179d91c..12dd3a04e5e 100644 --- a/src/compiler/spirv/vtn_amd.c +++ b/src/compiler/spirv/vtn_amd.c @@ -214,7 +214,7 @@ vtn_handle_amd_shader_explicit_vertex_parameter_instruction(struct vtn_builder * intrin->num_components = glsl_get_vector_elements(deref->type); nir_ssa_dest_init(&intrin->instr, &intrin->dest, glsl_get_vector_elements(deref->type), - glsl_get_bit_size(deref->type), NULL); + glsl_get_bit_size(deref->type)); nir_builder_instr_insert(&b->nb, &intrin->instr); diff --git a/src/compiler/spirv/vtn_glsl450.c b/src/compiler/spirv/vtn_glsl450.c index e13ea280850..04c8a30e480 100644 --- a/src/compiler/spirv/vtn_glsl450.c +++ b/src/compiler/spirv/vtn_glsl450.c @@ -683,7 +683,7 @@ handle_glsl450_interpolation(struct vtn_builder *b, enum GLSLstd450 opcode, intrin->num_components = glsl_get_vector_elements(deref->type); nir_ssa_dest_init(&intrin->instr, &intrin->dest, glsl_get_vector_elements(deref->type), - glsl_get_bit_size(deref->type), NULL); + glsl_get_bit_size(deref->type)); nir_builder_instr_insert(&b->nb, &intrin->instr); diff --git a/src/compiler/spirv/vtn_subgroup.c b/src/compiler/spirv/vtn_subgroup.c index 5fac2ae683e..d3b552132f3 100644 --- a/src/compiler/spirv/vtn_subgroup.c +++ b/src/compiler/spirv/vtn_subgroup.c @@ -97,7 +97,7 @@ vtn_handle_subgroup(struct vtn_builder *b, SpvOp opcode, nir_intrinsic_instr *ballot = nir_intrinsic_instr_create(b->nb.shader, nir_intrinsic_ballot); ballot->src[0] = nir_src_for_ssa(vtn_get_nir_ssa(b, w[3 + has_scope])); - nir_ssa_dest_init(&ballot->instr, &ballot->dest, 4, 32, NULL); + nir_ssa_dest_init(&ballot->instr, &ballot->dest, 4, 32); ballot->num_components = 4; nir_builder_instr_insert(&b->nb, &ballot->instr); vtn_push_nir_ssa(b, w[2], &ballot->dest.ssa); diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index b0384a44f2a..d752f35b885 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -251,7 +251,7 @@ vtn_variable_resource_index(struct vtn_builder *b, struct vtn_variable *var, nir_address_format addr_format = vtn_mode_to_address_format(b, var->mode); nir_ssa_dest_init(&instr->instr, &instr->dest, nir_address_format_num_components(addr_format), - nir_address_format_bit_size(addr_format), NULL); + nir_address_format_bit_size(addr_format)); instr->num_components = instr->dest.ssa.num_components; nir_builder_instr_insert(&b->nb, &instr->instr); @@ -274,7 +274,7 @@ vtn_resource_reindex(struct vtn_builder *b, enum vtn_variable_mode mode, nir_address_format addr_format = vtn_mode_to_address_format(b, mode); nir_ssa_dest_init(&instr->instr, &instr->dest, nir_address_format_num_components(addr_format), - nir_address_format_bit_size(addr_format), NULL); + nir_address_format_bit_size(addr_format)); instr->num_components = instr->dest.ssa.num_components; nir_builder_instr_insert(&b->nb, &instr->instr); @@ -296,7 +296,7 @@ vtn_descriptor_load(struct vtn_builder *b, enum vtn_variable_mode mode, nir_address_format addr_format = vtn_mode_to_address_format(b, mode); nir_ssa_dest_init(&desc_load->instr, &desc_load->dest, nir_address_format_num_components(addr_format), - nir_address_format_bit_size(addr_format), NULL); + nir_address_format_bit_size(addr_format)); desc_load->num_components = desc_load->dest.ssa.num_components; nir_builder_instr_insert(&b->nb, &desc_load->instr); |