projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
51809bc
)
gallium: pass NULL to cso_single_sampler() when the sampler isn't used.
author
Brian
<brian@poulsbo.localnet.net>
Wed, 12 Mar 2008 20:20:54 +0000
(14:20 -0600)
committer
Brian
<brian@poulsbo.localnet.net>
Wed, 12 Mar 2008 20:20:54 +0000
(14:20 -0600)
This fixes an AA line crash/regression.
The aaline stage needs to find a free/unused sampler to do its thing.
src/mesa/state_tracker/st_atom_sampler.c
patch
|
blob
|
history
diff --git
a/src/mesa/state_tracker/st_atom_sampler.c
b/src/mesa/state_tracker/st_atom_sampler.c
index d376480c9150d20c1b3aab2de10ce201747fd404..5787a7492c6bbcbce2e5695b601ede727d68d683 100644
(file)
--- a/
src/mesa/state_tracker/st_atom_sampler.c
+++ b/
src/mesa/state_tracker/st_atom_sampler.c
@@
-176,9
+176,12
@@
update_samplers(struct st_context *st)
st->state.num_samplers = su + 1;
/* XXX more sampler state here */
- }
- cso_single_sampler(st->cso_context, su, sampler);
+ cso_single_sampler(st->cso_context, su, sampler);
+ }
+ else {
+ cso_single_sampler(st->cso_context, su, NULL);
+ }
}
cso_single_sampler_done(st->cso_context);