From: Brian <brian@poulsbo.localnet.net>
Date: Wed, 12 Mar 2008 20:20:54 +0000 (-0600)
Subject: gallium: pass NULL to cso_single_sampler() when the sampler isn't used.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0dd79011b9c407191e40c2697c68946f35bc557a;p=mesa.git

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.
---

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);