summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/softpipe
diff options
context:
space:
mode:
authorHenri Verbeet <hverbeet@gmail.com>2011-01-17 22:03:29 +0100
committerBrian Paul <brianp@vmware.com>2011-01-19 21:47:27 -0700
commit54fdc351ddbda68bd6ef75021dafcdf8654a4342 (patch)
tree9b34f3abc385db0b6899aaaae373900bbf875cda /src/gallium/drivers/softpipe
parent8c68362d7c3ab9a49714b59255d05c871d8d2eff (diff)
softpipe: Get rid of the redundant resource parameter to get_sampler_variant().
Signed-off-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/gallium/drivers/softpipe')
-rw-r--r--src/gallium/drivers/softpipe/sp_state_sampler.c6
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 513ce0fcc0..7becd6e9d7 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],