summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/softpipe/sp_state_sampler.c
diff options
context:
space:
mode:
authorMichal Krol <michal@vmware.com>2010-03-02 12:03:24 +0100
committerMichal Krol <michal@vmware.com>2010-03-02 12:03:24 +0100
commitf59f28093ea827bd234d8e1a36bdd56a9fce5f09 (patch)
tree5a5350bfc84af951fbf5bd0fe861137eef9d3fbe /src/gallium/drivers/softpipe/sp_state_sampler.c
parent5587097b53afbce52f7e26568d2dde11de96e1ec (diff)
softpipe: Implement sampler view swizzling.
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_state_sampler.c')
-rw-r--r--src/gallium/drivers/softpipe/sp_state_sampler.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c
index 8922941994..68ea13f8d5 100644
--- a/src/gallium/drivers/softpipe/sp_state_sampler.c
+++ b/src/gallium/drivers/softpipe/sp_state_sampler.c
@@ -166,10 +166,9 @@ softpipe_set_sampler_views(struct pipe_context *pipe,
for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
struct pipe_sampler_view *view = i < num ? views[i] : NULL;
- struct pipe_texture *texture = view ? view->texture : NULL;
pipe_sampler_view_reference(&softpipe->sampler_views[i], view);
- sp_tex_tile_cache_set_texture(softpipe->tex_cache[i], texture);
+ sp_tex_tile_cache_set_sampler_view(softpipe->tex_cache[i], view);
}
softpipe->num_sampler_views = num;
@@ -198,10 +197,9 @@ softpipe_set_vertex_sampler_views(struct pipe_context *pipe,
for (i = 0; i < PIPE_MAX_VERTEX_SAMPLERS; i++) {
struct pipe_sampler_view *view = i < num ? views[i] : NULL;
- struct pipe_texture *texture = view ? view->texture : NULL;
pipe_sampler_view_reference(&softpipe->vertex_sampler_views[i], view);
- sp_tex_tile_cache_set_texture(softpipe->vertex_tex_cache[i], texture);
+ sp_tex_tile_cache_set_sampler_view(softpipe->vertex_tex_cache[i], view);
}
softpipe->num_vertex_sampler_views = num;