diff options
| author | Eric Anholt <[email protected]> | 2017-03-08 15:20:31 -0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-05 19:35:08 +0100 |
| commit | cabca7185b3924837a396094ef52f0bfc351f800 (patch) | |
| tree | b4bf244f651a05ebc9b058cd2491246474a628ed | |
| parent | 8020ce02fc2dbc5dd8a8674a64d5a344031b1e03 (diff) | |
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: 370d68babcbb ("nir/validate: Validate that bit sizes and components always match")
Reviewed-by: Jason Ekstrand <[email protected]> (v1)
Cc: <[email protected]>
(cherry picked from commit fba6559a1e76a22135b14490fdf5a6f1de1ae272)
| -rw-r--r-- | src/compiler/nir/nir_lower_bitmap.c | 4 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_drawpixels.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/compiler/nir/nir_lower_bitmap.c b/src/compiler/nir/nir_lower_bitmap.c index f08fb9b9c34..a1b4a32a5d4 100644 --- a/src/compiler/nir/nir_lower_bitmap.c +++ b/src/compiler/nir/nir_lower_bitmap.c @@ -96,7 +96,9 @@ lower_bitmap(nir_shader *shader, nir_builder *b, tex->texture_index = options->sampler; tex->dest_type = nir_type_float; 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_builder_instr_insert(b, &tex->instr); diff --git a/src/compiler/nir/nir_lower_drawpixels.c b/src/compiler/nir/nir_lower_drawpixels.c index e221fd5ce0f..c01ae9e2536 100644 --- a/src/compiler/nir/nir_lower_drawpixels.c +++ b/src/compiler/nir/nir_lower_drawpixels.c @@ -135,7 +135,9 @@ lower_color(lower_drawpixels_state *state, nir_intrinsic_instr *intr) tex->texture_index = state->options->drawpix_sampler; tex->dest_type = nir_type_float; 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_builder_instr_insert(b, &tex->instr); |