diff --git a/src/amd/common/nir/ac_nir_meta_ps_resolve.c b/src/amd/common/nir/ac_nir_meta_ps_resolve.c index bccb3bf50fb..1bceed5ecf7 100644 --- a/src/amd/common/nir/ac_nir_meta_ps_resolve.c +++ b/src/amd/common/nir/ac_nir_meta_ps_resolve.c @@ -63,10 +63,7 @@ ac_create_resolve_ps(const struct ac_ps_resolve_options *options, nir_def *zero = nir_imm_int(&b, 0); nir_def *baryc = nir_load_barycentric_pixel(&b, 32, .interp_mode = INTERP_MODE_SMOOTH); nir_def *coord = nir_load_interpolated_input(&b, 2 + key->src_is_array, 32, baryc, zero, - .dest_type = nir_type_float32, - .io_semantics = (nir_io_semantics){ - .location = VARYING_SLOT_VAR0, - .num_slots = 1}); + .io_semantics.location = VARYING_SLOT_VAR0); /* Nearest filtering floors and then converts to integer, and then * applies clamp to edge as clamp(coord, 0, dim - 1). @@ -158,9 +155,7 @@ ac_create_resolve_ps(const struct ac_ps_resolve_options *options, nir_store_output(&b, result, zero, .write_mask = BITFIELD_MASK(key->last_dst_channel + 1), .src_type = key->d16 ? nir_type_float16 : nir_type_float32, - .io_semantics = (nir_io_semantics){ - .location = FRAG_RESULT_DATA0, - .num_slots = 1}); + .io_semantics.location = FRAG_RESULT_DATA0); return b.shader; } diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index e36d7aca309..6d3a0a17054 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2028,8 +2028,7 @@ static bool si_nir_lower_ps_color_input(nir_shader *nir, const union si_shader_k nir_def *back_color = NULL; if (interp_mode == INTERP_MODE_FLAT) { colors[i] = nir_load_input(b, 4, 32, nir_imm_int(b, 0), - .io_semantics.location = VARYING_SLOT_COL0 + i, - .io_semantics.num_slots = 1); + .io_semantics.location = VARYING_SLOT_COL0 + i); if (key->ps.part.prolog.color_two_side) { back_color = nir_load_input(b, 4, 32, nir_imm_int(b, 0), @@ -2057,14 +2056,12 @@ static bool si_nir_lower_ps_color_input(nir_shader *nir, const union si_shader_k colors[i] = nir_load_interpolated_input(b, 4, 32, barycentric, nir_imm_int(b, 0), - .io_semantics.location = VARYING_SLOT_COL0 + i, - .io_semantics.num_slots = 1); + .io_semantics.location = VARYING_SLOT_COL0 + i); if (key->ps.part.prolog.color_two_side) { back_color = nir_load_interpolated_input(b, 4, 32, barycentric, nir_imm_int(b, 0), - .io_semantics.location = VARYING_SLOT_BFC0 + i, - .io_semantics.num_slots = 1); + .io_semantics.location = VARYING_SLOT_BFC0 + i); } } diff --git a/src/gallium/drivers/radeonsi/si_shaderlib_nir.c b/src/gallium/drivers/radeonsi/si_shaderlib_nir.c index f4e1a8f3357..6d67149453c 100644 --- a/src/gallium/drivers/radeonsi/si_shaderlib_nir.c +++ b/src/gallium/drivers/radeonsi/si_shaderlib_nir.c @@ -327,29 +327,19 @@ void *si_get_blitter_vs(struct si_context *sctx, enum blitter_attrib_type type, b.shader->info.io_lowered = true; nir_def *pos = nir_load_input(&b, 4, 32, nir_imm_int(&b, 0), - .dest_type = nir_type_float32, - .io_semantics.num_slots = 1, .io_semantics.location = VERT_ATTRIB_GENERIC0); nir_store_output(&b, pos, nir_imm_int(&b, 0), - .src_type = nir_type_float32, - .io_semantics.num_slots = 1, .io_semantics.location = VARYING_SLOT_POS); if (type != UTIL_BLITTER_ATTRIB_NONE) { nir_def *attr = nir_load_input(&b, 4, 32, nir_imm_int(&b, 0), - .dest_type = nir_type_float32, - .io_semantics.num_slots = 1, .io_semantics.location = VERT_ATTRIB_GENERIC1); nir_store_output(&b, attr, nir_imm_int(&b, 0), - .src_type = nir_type_float32, - .io_semantics.num_slots = 1, .io_semantics.location = VARYING_SLOT_VAR0); } if (num_layers > 1) { nir_store_output(&b, nir_load_instance_id(&b), nir_imm_int(&b, 0), - .src_type = nir_type_float32, - .io_semantics.num_slots = 1, .io_semantics.location = VARYING_SLOT_LAYER); }