diff options
| author | Eric Anholt <eric@anholt.net> | 2016-08-19 15:38:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2016-08-22 11:52:27 -0700 |
| commit | 3ef1853f7d75eb5235dc1a425374b67c42a4eb65 (patch) | |
| tree | 80cd9072055e6ca1dda147d68ddfc1f52586158b /src/compiler/nir | |
| parent | 0a8ff1681b4149b50956791c5b080ab5753447ad (diff) | |
| download | external_mesa3d-3ef1853f7d75eb5235dc1a425374b67c42a4eb65.zip external_mesa3d-3ef1853f7d75eb5235dc1a425374b67c42a4eb65.tar.gz external_mesa3d-3ef1853f7d75eb5235dc1a425374b67c42a4eb65.tar.bz2 | |
nir: Fix crash in nir_lower_drawpixels.
Generally you'd see the gl_Color reference first and get some cursor set.
However, in piglit draw-pixel-with-texture we're now seeing the TexCoord
dereferenced first.
Reviewed-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'src/compiler/nir')
| -rw-r--r-- | src/compiler/nir/nir_lower_drawpixels.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/nir/nir_lower_drawpixels.c b/src/compiler/nir/nir_lower_drawpixels.c index a71bccd..54f3ea0 100644 --- a/src/compiler/nir/nir_lower_drawpixels.c +++ b/src/compiler/nir/nir_lower_drawpixels.c @@ -194,6 +194,8 @@ lower_color(lower_drawpixels_state *state, nir_intrinsic_instr *intr) static void lower_texcoord(lower_drawpixels_state *state, nir_intrinsic_instr *intr) { + state->b.cursor = nir_before_instr(&intr->instr); + nir_ssa_def *texcoord_const = get_texcoord_const(state); nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(texcoord_const)); } |