softpipe: rework texture sampling code

Split into component pieces, stitch together at runtime using function
pointers.  Make it possible to utilize the existing fastpaths as image-level
filters for generic mip-filtering routines.

Remove special case for rectangle filtering, as it can now be handled by
the 2d path.

As most of the mesa demo texturing was already covered by fast paths, its
harder to find examples of speedups, but tunnel gets a boost as mip-nearest
filtering is now able to access the img_2d_linear_wrap_POT functions
for sampling within a mipmap level.

1 files changed, 4 insertions, 14 deletions

diff --git a/src/gallium/drivers/softpipe/sp_state_derived.c b/src/gallium/drivers/softpipe/sp_state_derived.c
index 1f6e2ccb83..5310928332 100644
--- a/src/gallium/drivers/softpipe/sp_state_derived.c
+++ b/src/gallium/drivers/softpipe/sp_state_derived.c
@@ -198,19 +198,7 @@ update_tgsi_samplers( struct softpipe_context *softpipe )
 {
    unsigned i;
 
-   /* vertex shader samplers */
-   for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
-      softpipe->tgsi.vert_samplers[i].sampler = softpipe->sampler[i];
-      softpipe->tgsi.vert_samplers[i].texture = softpipe->texture[i];
-      softpipe->tgsi.frag_samplers[i].base.get_samples = sp_get_samples;
-   }
-
-   /* fragment shader samplers */
-   for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
-      softpipe->tgsi.frag_samplers[i].sampler = softpipe->sampler[i];
-      softpipe->tgsi.frag_samplers[i].texture = softpipe->texture[i];
-      softpipe->tgsi.frag_samplers[i].base.get_samples = sp_get_samples;
-   }
+   softpipe_reset_sampler_varients( softpipe );
 
    for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
       sp_tile_cache_validate_texture( softpipe->tex_cache[i] );
@@ -232,7 +220,9 @@ void softpipe_update_derived( struct softpipe_context *softpipe )
    }
       
    if (softpipe->dirty & (SP_NEW_SAMPLER |
-                          SP_NEW_TEXTURE))
+                          SP_NEW_TEXTURE |
+                          SP_NEW_FS | 
+                          SP_NEW_VS))
       update_tgsi_samplers( softpipe );
 
    if (softpipe->dirty & (SP_NEW_RASTERIZER |