diff options
Diffstat (limited to 'src/gallium/drivers/r600')
6 files changed, 20 insertions, 21 deletions
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); |