summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2016-08-19 15:38:08 -0700
committerEric Anholt <[email protected]>2016-08-22 11:52:27 -0700
commit3ef1853f7d75eb5235dc1a425374b67c42a4eb65 (patch)
tree80cd9072055e6ca1dda147d68ddfc1f52586158b
parent0a8ff1681b4149b50956791c5b080ab5753447ad (diff)
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 <[email protected]>
-rw-r--r--src/compiler/nir/nir_lower_drawpixels.c2
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 a71bccddfb0..54f3ea08aad 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));
}