summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2012-08-17 08:58:15 -0600
committerBrian Paul <brianp@vmware.com>2012-08-17 09:07:49 -0600
commitf69273f9522a0c1486cf1870e35b3a16516f7233 (patch)
treecf4140abf6430bb8a9c759e28897f57c5644beff
parent553a08d3144b8b668f28c6094948afe64be309d9 (diff)
downloadmesa-f69273f9522a0c1486cf1870e35b3a16516f7233.tar.gz
mesa-f69273f9522a0c1486cf1870e35b3a16516f7233.tar.xz
mesa-f69273f9522a0c1486cf1870e35b3a16516f7233.zip
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
-rw-r--r--src/gallium/drivers/softpipe/sp_state_derived.c2
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 f88a7fda60..cb954a17ef 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;