From 21148e6a8806736b4487da41b01e2d3c01cbc743 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 19 Jan 2011 19:11:05 -0700 Subject: softpipe: Bind samplers to views instead of the underlying resource. Signed-off-by: Brian Paul --- src/gallium/drivers/softpipe/sp_tex_sample.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gallium/drivers/softpipe/sp_tex_sample.h') diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.h b/src/gallium/drivers/softpipe/sp_tex_sample.h index ed99006ab0..f0b867edc6 100644 --- a/src/gallium/drivers/softpipe/sp_tex_sample.h +++ b/src/gallium/drivers/softpipe/sp_tex_sample.h @@ -89,7 +89,7 @@ struct sp_sampler_variant /* Currently bound texture: */ - const struct pipe_resource *texture; + const struct pipe_sampler_view *view; struct softpipe_tex_tile_cache *cache; unsigned processor; @@ -132,9 +132,9 @@ struct sp_sampler_variant * sp_create_sampler_variant( const struct pipe_sampler_state *sampler, const union sp_sampler_key key ); -void sp_sampler_variant_bind_texture( struct sp_sampler_variant *variant, - struct softpipe_tex_tile_cache *tex_cache, - const struct pipe_resource *tex ); +void sp_sampler_variant_bind_view( struct sp_sampler_variant *variant, + struct softpipe_tex_tile_cache *tex_cache, + const struct pipe_sampler_view *view ); void sp_sampler_variant_destroy( struct sp_sampler_variant * ); -- cgit v1.2.3