diff options
Diffstat (limited to 'src/gallium')
19 files changed, 53 insertions, 55 deletions
diff --git a/src/gallium/auxiliary/nir/nir_draw_helpers.c b/src/gallium/auxiliary/nir/nir_draw_helpers.c index 2b362433f77..fcf11eb5fa4 100644 --- a/src/gallium/auxiliary/nir/nir_draw_helpers.c +++ b/src/gallium/auxiliary/nir/nir_draw_helpers.c @@ -79,7 +79,7 @@ nir_lower_pstipple_block(nir_block *block, tex->sampler_index = state->stip_tex->data.binding; tex->src[0].src_type = nir_tex_src_coord; tex->src[0].src = nir_src_for_ssa(texcoord); - 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); diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c index 823a3626aa6..13ef7ed1dd7 100644 --- a/src/gallium/auxiliary/nir/tgsi_to_nir.c +++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c @@ -766,7 +766,7 @@ ttn_src_for_file_and_index(struct ttn_compile *c, unsigned file, unsigned index, } load->src[srcn++] = nir_src_for_ssa(offset); - nir_ssa_dest_init(&load->instr, &load->dest, 4, 32, NULL); + nir_ssa_dest_init(&load->instr, &load->dest, 4, 32); nir_builder_instr_insert(b, &load->instr); src = nir_src_for_ssa(&load->dest.ssa); @@ -1574,8 +1574,7 @@ ttn_tex(struct ttn_compile *c, nir_alu_dest dest, nir_ssa_def **src) assert(src_number == instr->num_srcs); nir_ssa_dest_init(&instr->instr, &instr->dest, - nir_tex_instr_dest_size(instr), - 32, NULL); + nir_tex_instr_dest_size(instr), 32); nir_builder_instr_insert(b, &instr->instr); /* Resolve the writemask on the texture op. */ @@ -1635,11 +1634,11 @@ ttn_txq(struct ttn_compile *c, nir_alu_dest dest, nir_ssa_def **src) txs->src[1].src = nir_src_for_ssa(ttn_channel(b, src[0], X)); txs->src[1].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); - nir_ssa_dest_init(&qlv->instr, &qlv->dest, 1, 32, NULL); + nir_ssa_dest_init(&qlv->instr, &qlv->dest, 1, 32); nir_builder_instr_insert(b, &qlv->instr); ttn_move_dest_masked(b, dest, &txs->dest.ssa, TGSI_WRITEMASK_XYZ); @@ -1797,7 +1796,7 @@ ttn_mem(struct ttn_compile *c, nir_alu_dest dest, nir_ssa_def **src) if (tgsi_inst->Instruction.Opcode == TGSI_OPCODE_LOAD) { nir_ssa_dest_init(&instr->instr, &instr->dest, instr->num_components, - 32, NULL); + 32); nir_builder_instr_insert(b, &instr->instr); ttn_move_dest(b, dest, &instr->dest.ssa); } else { diff --git a/src/gallium/drivers/crocus/crocus_program.c b/src/gallium/drivers/crocus/crocus_program.c index 2d655d4ed14..a2d67052fc3 100644 --- a/src/gallium/drivers/crocus/crocus_program.c +++ b/src/gallium/drivers/crocus/crocus_program.c @@ -497,8 +497,7 @@ crocus_setup_uniforms(ASSERTED const struct intel_device_info *devinfo, nir_intrinsic_set_range(load_ubo, ~0); nir_ssa_dest_init(&load_ubo->instr, &load_ubo->dest, intrin->dest.ssa.num_components, - intrin->dest.ssa.bit_size, - NULL); + intrin->dest.ssa.bit_size); nir_builder_instr_insert(&b, &load_ubo->instr); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, @@ -636,7 +635,7 @@ crocus_setup_uniforms(ASSERTED const struct intel_device_info *devinfo, nir_intrinsic_set_align(load, 4, 0); nir_intrinsic_set_range_base(load, 0); nir_intrinsic_set_range(load, ~0); - nir_ssa_dest_init(&load->instr, &load->dest, comps, 32, NULL); + nir_ssa_dest_init(&load->instr, &load->dest, comps, 32); nir_builder_instr_insert(&b, &load->instr); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, &load->dest.ssa); diff --git a/src/gallium/drivers/d3d12/d3d12_blit.cpp b/src/gallium/drivers/d3d12/d3d12_blit.cpp index e31755da0b7..474d4c7bb52 100644 --- a/src/gallium/drivers/d3d12/d3d12_blit.cpp +++ b/src/gallium/drivers/d3d12/d3d12_blit.cpp @@ -681,7 +681,7 @@ get_stencil_resolve_fs(struct d3d12_context *ctx, bool no_flip) txs->is_array = false; txs->dest_type = nir_type_int; - nir_ssa_dest_init(&txs->instr, &txs->dest, 2, 32, "tex"); + nir_ssa_dest_init(&txs->instr, &txs->dest, 2, 32); nir_builder_instr_insert(&b, &txs->instr); pos_src = nir_vec4(&b, @@ -709,7 +709,7 @@ get_stencil_resolve_fs(struct d3d12_context *ctx, bool no_flip) tex->is_array = false; tex->coord_components = 2; - nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, "tex"); + nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32); nir_builder_instr_insert(&b, &tex->instr); nir_store_var(&b, stencil_out, nir_channel(&b, &tex->dest.ssa, 1), 0x1); diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c index dd39af16f07..4c3630d7df3 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c @@ -720,7 +720,7 @@ insert_vec_mov(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader) } mov->dest.write_mask = (1 << num_components) - 1; - nir_ssa_dest_init(&mov->instr, &mov->dest.dest, num_components, 32, NULL); + nir_ssa_dest_init(&mov->instr, &mov->dest.dest, num_components, 32); /* replace vec srcs with inserted mov */ for (unsigned i = 0, j = 0; i < 4; i++) { diff --git a/src/gallium/drivers/etnaviv/etnaviv_nir.c b/src/gallium/drivers/etnaviv/etnaviv_nir.c index 57bc2bc8d59..a78a76d9f71 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_nir.c +++ b/src/gallium/drivers/etnaviv/etnaviv_nir.c @@ -134,7 +134,7 @@ etna_lower_io(nir_shader *shader, struct etna_shader_variant *v) vec->src[i].src = nir_src_for_ssa(src1->ssa); vec->dest.write_mask = 0xf; - nir_ssa_dest_init(&vec->instr, &vec->dest.dest, 4, 32, NULL); + nir_ssa_dest_init(&vec->instr, &vec->dest.dest, 4, 32); nir_tex_instr_remove_src(tex, src1_idx); nir_instr_rewrite_src(&tex->instr, coord, nir_src_for_ssa(&vec->dest.dest.ssa)); @@ -190,7 +190,7 @@ etna_lower_alu_impl(nir_function_impl *impl, bool has_new_transcendentals) mul->src[1].swizzle[0] = 1; mul->dest.write_mask = 1; - nir_ssa_dest_init(&mul->instr, &mul->dest.dest, 1, 32, NULL); + nir_ssa_dest_init(&mul->instr, &mul->dest.dest, 1, 32); ssa->num_components = 2; diff --git a/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c b/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c index ecff28e525e..3c0dba02920 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c +++ b/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c @@ -47,8 +47,8 @@ lima_nir_duplicate_intrinsic(nir_builder *b, nir_intrinsic_instr *itr, else dupl->src[0].reg = itr->src[0].reg; - nir_ssa_dest_init(&dupl->instr, &dupl->dest, - dupl->num_components, itr->dest.ssa.bit_size, NULL); + nir_ssa_dest_init(&dupl->instr, &dupl->dest, dupl->num_components, + itr->dest.ssa.bit_size); dupl->instr.pass_flags = 1; nir_builder_instr_insert(b, &dupl->instr); @@ -80,8 +80,8 @@ lima_nir_duplicate_intrinsic(nir_builder *b, nir_intrinsic_instr *itr, else dupl->src[0].reg = itr->src[0].reg; - nir_ssa_dest_init(&dupl->instr, &dupl->dest, - dupl->num_components, itr->dest.ssa.bit_size, NULL); + nir_ssa_dest_init(&dupl->instr, &dupl->dest, dupl->num_components, + itr->dest.ssa.bit_size); dupl->instr.pass_flags = 1; nir_builder_instr_insert(b, &dupl->instr); diff --git a/src/gallium/drivers/lima/ir/lima_nir_lower_uniform_to_scalar.c b/src/gallium/drivers/lima/ir/lima_nir_lower_uniform_to_scalar.c index f9d593f0417..c0089270339 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_lower_uniform_to_scalar.c +++ b/src/gallium/drivers/lima/ir/lima_nir_lower_uniform_to_scalar.c @@ -35,8 +35,8 @@ lower_load_uniform_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) * 4 + i); diff --git a/src/gallium/drivers/lima/ir/lima_nir_split_load_input.c b/src/gallium/drivers/lima/ir/lima_nir_split_load_input.c index 802a083882f..497496a9b47 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_split_load_input.c +++ b/src/gallium/drivers/lima/ir/lima_nir_split_load_input.c @@ -76,9 +76,7 @@ lima_nir_split_load_input_instr(nir_builder *b, b->shader, intrin->intrinsic); nir_ssa_dest_init(&new_intrin->instr, &new_intrin->dest, - nir_dest_num_components(alu->dest.dest), - ssa->bit_size, - NULL); + nir_dest_num_components(alu->dest.dest), ssa->bit_size); new_intrin->num_components = nir_dest_num_components(alu->dest.dest); nir_intrinsic_set_base(new_intrin, nir_intrinsic_base(intrin)); nir_intrinsic_set_component(new_intrin, nir_intrinsic_component(intrin) + swizzle); diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp index 216d93534a4..272dac310da 100644 --- a/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp @@ -1112,7 +1112,7 @@ LowerTexToBackend::lower_txf_ms(nir_tex_instr *tex) } auto fetch_sample = nir_instr_as_tex(nir_instr_clone(b->shader, &tex->instr)); - nir_ssa_dest_init(&fetch_sample->instr, &fetch_sample->dest, 4, 32, "sample_index"); + nir_ssa_dest_init(&fetch_sample->instr, &fetch_sample->dest, 4, 32); int used_coord_mask = 0; nir_ssa_def *backend1 = prep_src(new_coord, used_coord_mask); diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp index f35a62f1bf0..04c056b2b82 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp @@ -550,7 +550,8 @@ r600_lower_shared_io_impl(nir_function *func) nir_intrinsic_instr_create(b.shader, nir_intrinsic_load_local_shared_r600); load->num_components = nir_dest_num_components(op->dest); load->src[0] = nir_src_for_ssa(addr); - nir_ssa_dest_init(&load->instr, &load->dest, load->num_components, 32, NULL); + nir_ssa_dest_init(&load->instr, &load->dest, load->num_components, + 32); nir_ssa_def_rewrite_uses(&op->dest.ssa, &load->dest.ssa); nir_builder_instr_insert(&b, &load->instr); } else { @@ -601,11 +602,9 @@ r600_lower_fs_pos_input_impl(nir_builder *b, nir_instr *instr, void *_options) (void)_options; auto old_ir = nir_instr_as_intrinsic(instr); auto load = nir_intrinsic_instr_create(b->shader, nir_intrinsic_load_input); - nir_ssa_dest_init(&load->instr, - &load->dest, + nir_ssa_dest_init(&load->instr, &load->dest, old_ir->dest.ssa.num_components, - old_ir->dest.ssa.bit_size, - NULL); + old_ir->dest.ssa.bit_size); nir_intrinsic_set_io_semantics(load, nir_intrinsic_io_semantics(old_ir)); nir_intrinsic_set_base(load, nir_intrinsic_base(old_ir)); diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp index 7234c5a89b1..69e3f41e2ef 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp @@ -249,9 +249,9 @@ class LowerSplit64op : public NirLowerInstruction { auto phi_lo = nir_phi_instr_create(b->shader); auto phi_hi = nir_phi_instr_create(b->shader); nir_ssa_dest_init( - &phi_lo->instr, &phi_lo->dest, phi->dest.ssa.num_components * 2, 32, ""); + &phi_lo->instr, &phi_lo->dest, phi->dest.ssa.num_components * 2, 32); nir_ssa_dest_init( - &phi_hi->instr, &phi_hi->dest, phi->dest.ssa.num_components * 2, 32, ""); + &phi_hi->instr, &phi_hi->dest, phi->dest.ssa.num_components * 2, 32); nir_foreach_phi_src(s, phi) { auto lo = nir_unpack_32_2x16_split_x(b, nir_ssa_for_src(b, s->src, 1)); @@ -590,7 +590,7 @@ LowerSplit64BitVar::split_double_load_uniform(nir_intrinsic_instr *intr) nir_intrinsic_set_range(load2, nir_intrinsic_range(intr)); load2->num_components = second_components; - nir_ssa_dest_init(&load2->instr, &load2->dest, second_components, 64, nullptr); + nir_ssa_dest_init(&load2->instr, &load2->dest, second_components, 64); nir_builder_instr_insert(b, &load2->instr); intr->dest.ssa.num_components = intr->num_components = 2; @@ -618,7 +618,7 @@ LowerSplit64BitVar::split_double_load_ssbo(nir_intrinsic_instr *intr) auto new_src0 = nir_src_for_ssa(nir_iadd_imm(b, intr->src[0].ssa, 1)); nir_instr_rewrite_src(&load2->instr, &load2->src[0], new_src0); load2->num_components = second_components; - nir_ssa_dest_init(&load2->instr, &load2->dest, second_components, 64, nullptr); + nir_ssa_dest_init(&load2->instr, &load2->dest, second_components, 64); nir_intrinsic_set_dest_type(load2, nir_intrinsic_dest_type(intr)); nir_builder_instr_insert(b, &load2->instr); @@ -644,7 +644,7 @@ LowerSplit64BitVar::split_double_load_ubo(nir_intrinsic_instr *intr) load2->num_components = second_components; - nir_ssa_dest_init(&load2->instr, &load2->dest, second_components, 64, nullptr); + nir_ssa_dest_init(&load2->instr, &load2->dest, second_components, 64); nir_builder_instr_insert(b, &load2->instr); intr->dest.ssa.num_components = intr->num_components = 2; diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp index 9fe9d4c8b27..6bc3bdee14b 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp @@ -490,7 +490,7 @@ NirLowerFSOutToVector::create_combined_vector(nir_builder *b, k += s->num_components; } - nir_ssa_dest_init(&instr->instr, &instr->dest.dest, num_comp, 32, NULL); + nir_ssa_dest_init(&instr->instr, &instr->dest.dest, num_comp, 32); instr->dest.write_mask = (1 << num_comp) - 1; nir_builder_instr_insert(b, &instr->instr); return &instr->dest.dest.ssa; diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp index 0e1a6eed1e0..c2bf260083b 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp @@ -55,7 +55,7 @@ static nir_ssa_def * emit_load_param_base(nir_builder *b, nir_intrinsic_op op) { nir_intrinsic_instr *result = nir_intrinsic_instr_create(b->shader, op); - nir_ssa_dest_init(&result->instr, &result->dest, 4, 32, NULL); + nir_ssa_dest_init(&result->instr, &result->dest, 4, 32); nir_builder_instr_insert(b, &result->instr); return &result->dest.ssa; } @@ -286,7 +286,7 @@ r600_load_rel_patch_id(nir_builder *b) { auto patch_id = nir_intrinsic_instr_create(b->shader, nir_intrinsic_load_tcs_rel_patch_id_r600); - nir_ssa_dest_init(&patch_id->instr, &patch_id->dest, 1, 32, NULL); + nir_ssa_dest_init(&patch_id->instr, &patch_id->dest, 1, 32); nir_builder_instr_insert(b, &patch_id->instr); return &patch_id->dest.ssa; } @@ -454,7 +454,7 @@ r600_lower_tess_io_impl(nir_builder *b, nir_instr *instr, enum pipe_prim_type pr nir_intrinsic_instr_create(b->shader, nir_intrinsic_load_local_shared_r600); tf->num_components = ncomps; tf->src[0] = nir_src_for_ssa(addr_outer); - nir_ssa_dest_init(&tf->instr, &tf->dest, tf->num_components, 32, NULL); + nir_ssa_dest_init(&tf->instr, &tf->dest, tf->num_components, 32); nir_builder_instr_insert(b, &tf->instr); if (ncomps < 4) { auto undef = nir_ssa_undef(b, 1, 32); @@ -551,7 +551,7 @@ r600_append_tcs_TF_emission(nir_shader *shader, enum pipe_prim_type prim_type) auto invocation_id = nir_intrinsic_instr_create(b->shader, nir_intrinsic_load_invocation_id); - nir_ssa_dest_init(&invocation_id->instr, &invocation_id->dest, 1, 32, NULL); + nir_ssa_dest_init(&invocation_id->instr, &invocation_id->dest, 1, 32); nir_builder_instr_insert(b, &invocation_id->instr); nir_push_if(b, nir_ieq_imm(b, &invocation_id->dest.ssa, 0)); @@ -566,14 +566,14 @@ r600_append_tcs_TF_emission(nir_shader *shader, enum pipe_prim_type prim_type) tf_outer->num_components = outer_comps; tf_outer->src[0] = nir_src_for_ssa(addr_outer); nir_ssa_dest_init( - &tf_outer->instr, &tf_outer->dest, tf_outer->num_components, 32, NULL); + &tf_outer->instr, &tf_outer->dest, tf_outer->num_components, 32); nir_builder_instr_insert(b, &tf_outer->instr); std::vector<nir_ssa_def *> tf_out; auto tf_out_base = nir_intrinsic_instr_create(b->shader, nir_intrinsic_load_tcs_tess_factor_base_r600); - nir_ssa_dest_init(&tf_out_base->instr, &tf_out_base->dest, 1, 32, NULL); + nir_ssa_dest_init(&tf_out_base->instr, &tf_out_base->dest, 1, 32); nir_builder_instr_insert(b, &tf_out_base->instr); auto out_addr0 = nir_build_alu(b, @@ -619,7 +619,7 @@ r600_append_tcs_TF_emission(nir_shader *shader, enum pipe_prim_type prim_type) tf_inner->num_components = inner_comps; tf_inner->src[0] = nir_src_for_ssa(addr1); nir_ssa_dest_init( - &tf_inner->instr, &tf_inner->dest, tf_inner->num_components, 32, NULL); + &tf_inner->instr, &tf_inner->dest, tf_inner->num_components, 32); nir_builder_instr_insert(b, &tf_inner->instr); tf_out.push_back(nir_vec2(b, diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c b/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c index fba5b5878ae..0917c3d8211 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c +++ b/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c @@ -149,8 +149,8 @@ r600_create_new_load(nir_builder *b, assert(intr->dest.is_ssa); nir_intrinsic_instr *new_intr = nir_intrinsic_instr_create(b->shader, intr->intrinsic); - nir_ssa_dest_init( - &new_intr->instr, &new_intr->dest, num_comps, intr->dest.ssa.bit_size, NULL); + nir_ssa_dest_init(&new_intr->instr, &new_intr->dest, num_comps, + intr->dest.ssa.bit_size); new_intr->num_components = num_comps; nir_deref_instr *deref = nir_build_deref_var(b, var); diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_io.c b/src/gallium/drivers/vc4/vc4_nir_lower_io.c index 61025122a74..74e1e1abbf0 100644 --- a/src/gallium/drivers/vc4/vc4_nir_lower_io.c +++ b/src/gallium/drivers/vc4/vc4_nir_lower_io.c @@ -303,7 +303,7 @@ vc4_nir_lower_uniform(struct vc4_compile *c, nir_builder *b, nir_intrinsic_instr_create(c->s, intr->intrinsic); intr_comp->num_components = 1; nir_ssa_dest_init(&intr_comp->instr, &intr_comp->dest, 1, - intr->dest.ssa.bit_size, NULL); + intr->dest.ssa.bit_size); /* Convert the uniform offset to bytes. If it happens * to be a constant, constant-folding will clean up diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c b/src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c index 57a3fda1d84..196cdb8ae75 100644 --- a/src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c +++ b/src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c @@ -119,7 +119,7 @@ vc4_nir_lower_txf_ms_instr(nir_builder *b, nir_instr *instr, void *data) txf->src[0].src_type = nir_tex_src_coord; txf->src[0].src = nir_src_for_ssa(nir_vec2(b, addr, nir_imm_int(b, 0))); - nir_ssa_dest_init(&txf->instr, &txf->dest, 4, 32, NULL); + nir_ssa_dest_init(&txf->instr, &txf->dest, 4, 32); nir_builder_instr_insert(b, &txf->instr); return &txf->dest.ssa; diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 21bdee34965..b72ebbbba4d 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -237,7 +237,7 @@ lower_basevertex_instr(nir_builder *b, nir_instr *in, void *data) load->src[0] = nir_src_for_ssa(nir_imm_int(b, ZINK_GFX_PUSHCONST_DRAW_MODE_IS_INDEXED)); nir_intrinsic_set_range(load, 4); load->num_components = 1; - nir_ssa_dest_init(&load->instr, &load->dest, 1, 32, "draw_mode_is_indexed"); + nir_ssa_dest_init(&load->instr, &load->dest, 1, 32); nir_builder_instr_insert(b, &load->instr); nir_ssa_def *composite = nir_build_alu(b, nir_op_bcsel, @@ -278,7 +278,7 @@ lower_drawid_instr(nir_builder *b, nir_instr *in, void *data) load->src[0] = nir_src_for_ssa(nir_imm_int(b, ZINK_GFX_PUSHCONST_DRAW_ID)); nir_intrinsic_set_range(load, 4); load->num_components = 1; - nir_ssa_dest_init(&load->instr, &load->dest, 1, 32, "draw_id"); + nir_ssa_dest_init(&load->instr, &load->dest, 1, 32); nir_builder_instr_insert(b, &load->instr); nir_ssa_def_rewrite_uses(&instr->dest.ssa, &load->dest.ssa); @@ -1736,7 +1736,7 @@ lower_txf_lod_robustness_instr(nir_builder *b, nir_instr *in, void *data) nir_src_copy(&levels->src[!!(offset_idx >= 0)].src, &txf->src[handle_idx].src, &levels->instr); } nir_ssa_dest_init(&levels->instr, &levels->dest, - nir_tex_instr_dest_size(levels), 32, NULL); + nir_tex_instr_dest_size(levels), 32); nir_builder_instr_insert(b, &levels->instr); nir_if *lod_oob_if = nir_push_if(b, nir_ilt(b, lod, &levels->dest.ssa)); @@ -2340,7 +2340,8 @@ rewrite_atomic_ssbo_instr(nir_builder *b, nir_instr *instr, struct bo_vars *bo) for (unsigned i = 0; i < num_components; i++) { nir_deref_instr *deref_arr = nir_build_deref_array(b, deref_struct, offset); nir_intrinsic_instr *new_instr = nir_intrinsic_instr_create(b->shader, op); - nir_ssa_dest_init(&new_instr->instr, &new_instr->dest, 1, nir_dest_bit_size(intr->dest), ""); + nir_ssa_dest_init(&new_instr->instr, &new_instr->dest, 1, + nir_dest_bit_size(intr->dest)); nir_intrinsic_set_atomic_op(new_instr, nir_intrinsic_atomic_op(intr)); new_instr->src[0] = nir_src_for_ssa(&deref_arr->dest.ssa); /* deref ops have no offset src, so copy the srcs after it */ diff --git a/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c b/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c index 4dcc9950369..d897f72f357 100644 --- a/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c +++ b/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c @@ -176,7 +176,8 @@ create_array_tex_from_cube_tex(nir_builder *b, nir_tex_instr *tex, nir_ssa_def * } nir_ssa_dest_init(&array_tex->instr, &array_tex->dest, - nir_tex_instr_dest_size(array_tex), nir_dest_bit_size(tex->dest), NULL); + nir_tex_instr_dest_size(array_tex), + nir_dest_bit_size(tex->dest)); nir_builder_instr_insert(b, &array_tex->instr); return &array_tex->dest.ssa; } @@ -445,8 +446,9 @@ lower_tex_to_txl(nir_builder *b, nir_tex_instr *tex) txl->src[s].src_type = nir_tex_src_lod; b->cursor = nir_before_instr(&tex->instr); - 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); return txl; |