softpipe: per-unit sampler varients

Can't share sampler varients across multiple tex units because the texture
pointer is in the sampler varient.  That prevents different textures per unit.

Fixes progs/demos/multiarb, progs/glsl/samplers, etc.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.h b/src/gallium/drivers/softpipe/sp_tex_sample.h
index 26f80eb88a..f6cd57ec0a 100644
--- a/src/gallium/drivers/softpipe/sp_tex_sample.h
+++ b/src/gallium/drivers/softpipe/sp_tex_sample.h
@@ -62,7 +62,8 @@ union sp_sampler_key {
       unsigned target:3;
       unsigned is_pot:1;
       unsigned processor:2;
-      unsigned pad:26;
+      unsigned unit:4;
+      unsigned pad:22;
    } bits;
    unsigned value;
 };