Mesa (master): softpipe: Get rid of the redundant resource parameter to get_sampler_variant().

[Brian Paul]

Module: Mesa
Branch: master
Commit: 54fdc351ddbda68bd6ef75021dafcdf8654a4342
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=54fdc351ddbda68bd6ef75021dafcdf8654a4342

Author: Henri Verbeet <hverbeet at gmail.com>
Date:   Mon Jan 17 22:03:29 2011 +0100

softpipe: Get rid of the redundant resource parameter to get_sampler_variant().

Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/drivers/softpipe/sp_state_sampler.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c
index 513ce0f..7becd6e 100644
--- a/src/gallium/drivers/softpipe/sp_state_sampler.c
+++ b/src/gallium/drivers/softpipe/sp_state_sampler.c
@@ -290,10 +290,9 @@ static struct sp_sampler_variant *
 get_sampler_variant( unsigned unit,
                      struct sp_sampler *sampler,
                      struct pipe_sampler_view *view,
-                     struct pipe_resource *resource,
                      unsigned processor )
 {
-   struct softpipe_resource *sp_texture = softpipe_resource(resource);
+   struct softpipe_resource *sp_texture = softpipe_resource(view->texture);
    struct sp_sampler_variant *v = NULL;
    union sp_sampler_key key;
 
@@ -353,7 +352,6 @@ softpipe_reset_sampler_variants(struct softpipe_context *softpipe)
             get_sampler_variant( i,
                                  sp_sampler(softpipe->vertex_samplers[i]),
                                  softpipe->vertex_sampler_views[i],
-                                 texture,
                                  TGSI_PROCESSOR_VERTEX );
 
          sp_sampler_variant_bind_texture( softpipe->tgsi.vert_samplers_list[i], 
@@ -376,7 +374,6 @@ softpipe_reset_sampler_variants(struct softpipe_context *softpipe)
                   i,
                   sp_sampler(softpipe->geometry_samplers[i]),
                   softpipe->geometry_sampler_views[i],
-                  texture,
                   TGSI_PROCESSOR_GEOMETRY );
 
             sp_sampler_variant_bind_texture(
@@ -399,7 +396,6 @@ softpipe_reset_sampler_variants(struct softpipe_context *softpipe)
             get_sampler_variant( i,
                                  sp_sampler(softpipe->sampler[i]),
                                  softpipe->sampler_views[i],
-                                 texture,
                                  TGSI_PROCESSOR_FRAGMENT );
 
          sp_sampler_variant_bind_texture( softpipe->tgsi.frag_samplers_list[i],