From: Brian Paul <brianp@vmware.com>
Date: Fri, 17 Aug 2012 14:58:15 +0000 (-0600)
Subject: llvmpipe: remove polygon stipple assertion
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f69273f9522a0c1486cf1870e35b3a16516f7233;p=mesa.git

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
---

diff --git a/src/gallium/drivers/softpipe/sp_state_derived.c b/src/gallium/drivers/softpipe/sp_state_derived.c
index f88a7fda60d..cb954a17ef6 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;