diff options
| author | Eric Anholt <[email protected]> | 2016-11-03 16:28:49 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2016-11-03 18:42:58 -0700 |
| commit | 49936364e4c48e318b1ef3f09785b0e669a0c11b (patch) | |
| tree | cfbb014c6155516327743900e641c7922334b160 | |
| parent | 572a95212673888d72f1ec68b9eed660bab0b5d7 (diff) | |
nir: Make sure to set the texsrc type in nir drawpixels/bitmap lowering.
We were leaving an undefined value since the ralloc zeroing changes.
Fixes nir_validate() failures on vc4.
v2: Fix the color-index case of drawpixels as well.
Reviewed-by: Rob Clark <[email protected]> (v1)
| -rw-r--r-- | src/compiler/nir/nir_lower_bitmap.c | 1 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_drawpixels.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/compiler/nir/nir_lower_bitmap.c b/src/compiler/nir/nir_lower_bitmap.c index fefe53cbd81..f08fb9b9c34 100644 --- a/src/compiler/nir/nir_lower_bitmap.c +++ b/src/compiler/nir/nir_lower_bitmap.c @@ -95,6 +95,7 @@ lower_bitmap(nir_shader *shader, nir_builder *b, tex->sampler_index = options->sampler; 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); nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); diff --git a/src/compiler/nir/nir_lower_drawpixels.c b/src/compiler/nir/nir_lower_drawpixels.c index 54f3ea08aad..51c52d038c7 100644 --- a/src/compiler/nir/nir_lower_drawpixels.c +++ b/src/compiler/nir/nir_lower_drawpixels.c @@ -134,6 +134,7 @@ lower_color(lower_drawpixels_state *state, nir_intrinsic_instr *intr) tex->sampler_index = state->options->drawpix_sampler; 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); nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); @@ -161,6 +162,7 @@ lower_color(lower_drawpixels_state *state, nir_intrinsic_instr *intr) tex->sampler_index = state->options->pixelmap_sampler; tex->texture_index = state->options->pixelmap_sampler; tex->dest_type = nir_type_float; + tex->src[0].src_type = nir_tex_src_coord; tex->src[0].src = nir_src_for_ssa(nir_swizzle(b, def, swiz_xy, 2, true)); nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); @@ -174,6 +176,7 @@ lower_color(lower_drawpixels_state *state, nir_intrinsic_instr *intr) tex->coord_components = 2; tex->sampler_index = state->options->pixelmap_sampler; tex->dest_type = nir_type_float; + tex->src[0].src_type = nir_tex_src_coord; tex->src[0].src = nir_src_for_ssa(nir_swizzle(b, def, swiz_zw, 2, true)); nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); |