From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Nov 2011 22:55:18 +0000 (-0600)
Subject: draw: assert that we have non-null fragment shader
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e814d577253d3b618cc40e36f9d50b42fe61d6ed;p=mesa.git

draw: assert that we have non-null fragment shader

Instead of just segfaulting.  Recently ran into this.
---

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