nir: Pick just the channels we want for bitmap and drawpixels lowering.
NIR now validates that SSA references use the same number of channels as
are in the SSA value.
v2: Reword commit message, since the commit didn't land before the
validation change did.
Fixes: 370d68babc
("nir/validate: Validate that bit sizes and components always match")
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> (v1)
Cc: <mesa-stable@lists.freedesktop.org>
This commit is contained in:
parent
6ef1bd4fa5
commit
fba6559a1e
|
@ -96,7 +96,9 @@ lower_bitmap(nir_shader *shader, nir_builder *b,
|
||||||
tex->texture_index = options->sampler;
|
tex->texture_index = options->sampler;
|
||||||
tex->dest_type = nir_type_float;
|
tex->dest_type = nir_type_float;
|
||||||
tex->src[0].src_type = nir_tex_src_coord;
|
tex->src[0].src_type = nir_tex_src_coord;
|
||||||
tex->src[0].src = nir_src_for_ssa(texcoord);
|
tex->src[0].src =
|
||||||
|
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, NULL);
|
||||||
nir_builder_instr_insert(b, &tex->instr);
|
nir_builder_instr_insert(b, &tex->instr);
|
||||||
|
|
|
@ -135,7 +135,9 @@ lower_color(lower_drawpixels_state *state, nir_intrinsic_instr *intr)
|
||||||
tex->texture_index = state->options->drawpix_sampler;
|
tex->texture_index = state->options->drawpix_sampler;
|
||||||
tex->dest_type = nir_type_float;
|
tex->dest_type = nir_type_float;
|
||||||
tex->src[0].src_type = nir_tex_src_coord;
|
tex->src[0].src_type = nir_tex_src_coord;
|
||||||
tex->src[0].src = nir_src_for_ssa(texcoord);
|
tex->src[0].src =
|
||||||
|
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, NULL);
|
||||||
nir_builder_instr_insert(b, &tex->instr);
|
nir_builder_instr_insert(b, &tex->instr);
|
||||||
|
|
Loading…
Reference in New Issue