Mesa (master): llvmpipe: remove polygon stipple assertion

Brian Paul brianp at kemper.freedesktop.org
Fri Aug 17 15:08:49 UTC 2012


Module: Mesa
Branch: master
Commit: f69273f9522a0c1486cf1870e35b3a16516f7233
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f69273f9522a0c1486cf1870e35b3a16516f7233

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Aug 17 08:58:15 2012 -0600

llvmpipe: remove polygon stipple assertion

It's possible for us to have an unused sampler bound when the fragment
shader itself doesn't use any samplers.  So the assertion isn't valid.

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=53616

---

 src/gallium/drivers/softpipe/sp_state_derived.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/softpipe/sp_state_derived.c b/src/gallium/drivers/softpipe/sp_state_derived.c
index f88a7fd..cb954a1 100644
--- a/src/gallium/drivers/softpipe/sp_state_derived.c
+++ b/src/gallium/drivers/softpipe/sp_state_derived.c
@@ -305,8 +305,6 @@ update_polygon_stipple_enable(struct softpipe_context *softpipe, unsigned prim)
        softpipe->fs_variant->key.polygon_stipple) {
       const unsigned unit = softpipe->fs_variant->stipple_sampler_unit;
 
-      assert(unit >= softpipe->num_samplers[PIPE_SHADER_FRAGMENT]);
-
       /* sampler state */
       softpipe->samplers[PIPE_SHADER_FRAGMENT][unit] = softpipe->pstipple.sampler;
 




More information about the mesa-commit mailing list