projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
553a08d
)
llvmpipe: remove polygon stipple assertion
author
Brian Paul
<brianp@vmware.com>
Fri, 17 Aug 2012 14:58:15 +0000
(08:58 -0600)
committer
Brian Paul
<brianp@vmware.com>
Fri, 17 Aug 2012 15:07:49 +0000
(09:07 -0600)
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
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/softpipe/sp_state_derived.c
b/src/gallium/drivers/softpipe/sp_state_derived.c
index f88a7fda60d76a0d5d7ef4041abb85533ee23cf5..cb954a17ef67dc63eea4fb6312a56841815ab9c3 100644
(file)
--- 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;