diff options
author | Brian <[email protected]> | 2008-03-12 14:20:54 -0600 |
---|---|---|
committer | Brian <[email protected]> | 2008-03-12 14:20:54 -0600 |
commit | 0dd79011b9c407191e40c2697c68946f35bc557a (patch) | |
tree | 2bf464781f5b8dbe2c6e852857ebfb0e1b4dabe0 | |
parent | 51809bc1bc719c8d988cd6e06b6c96af43d12026 (diff) |
gallium: pass NULL to cso_single_sampler() when the sampler isn't used.
This fixes an AA line crash/regression.
The aaline stage needs to find a free/unused sampler to do its thing.
-rw-r--r-- | src/mesa/state_tracker/st_atom_sampler.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c index d376480c915..5787a7492c6 100644 --- 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); |