summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2011-11-03 16:55:18 -0600
committerBrian Paul <[email protected]>2011-11-03 16:56:11 -0600
commite814d577253d3b618cc40e36f9d50b42fe61d6ed (patch)
tree99a371b3c62a0756cf2f9a0871e70922e8861c6f
parentac0ec07e6c8bad958f583aae192fe5a80a63da7b (diff)
draw: assert that we have non-null fragment shader
Instead of just segfaulting. Recently ran into this.
-rw-r--r--src/gallium/auxiliary/draw/draw_pipe_pstipple.c2
-rw-r--r--src/gallium/auxiliary/draw/draw_pipe_wide_point.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
index fe3627be867..0401a45507b 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
@@ -361,6 +361,8 @@ generate_pstip_fs(struct pstip_stage *pstip)
tgsi_dump(pstip_fs.tokens, 0);
#endif
+ assert(pstip->fs);
+
pstip->fs->sampler_unit = transform.freeSampler;
assert(pstip->fs->sampler_unit < PIPE_MAX_SAMPLERS);
diff --git a/src/gallium/auxiliary/draw/draw_pipe_wide_point.c b/src/gallium/auxiliary/draw/draw_pipe_wide_point.c
index 0b86ba1e928..8e0a117843e 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_wide_point.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_wide_point.c
@@ -229,6 +229,8 @@ widepoint_first_point(struct draw_stage *stage,
const struct draw_fragment_shader *fs = draw->fs.fragment_shader;
uint i;
+ assert(fs);
+
wide->num_texcoord_gen = 0;
/* Loop over fragment shader inputs looking for generic inputs