From 0dd79011b9c407191e40c2697c68946f35bc557a Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 12 Mar 2008 14:20:54 -0600 Subject: [PATCH] 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. --- src/mesa/state_tracker/st_atom_sampler.c | 7 +++++-- 1 file 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 d376480..5787a74 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); -- 2.7.4