diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-08-23 10:23:46 +0100 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-08-23 10:23:46 +0100 |
| commit | 7670102468a55de50cf0cfa0b938d36aaf212f1f (patch) | |
| tree | e45cf5fba528902060e0b5e258087e0de69cfc58 /src/gallium/drivers/softpipe/sp_tex_sample.h | |
| parent | 0f24886f922df3e00094a53b5b37b1588ea84bc0 (diff) | |
| parent | c84abe36a93312cfa061ce1bd005e43eb9f6a6df (diff) | |
Merge branch 'tex-tilecache' into softpipe-opt
Conflicts:
src/gallium/drivers/softpipe/sp_state_derived.c
src/gallium/drivers/softpipe/sp_state_sampler.c
src/gallium/drivers/softpipe/sp_tex_sample.c
src/gallium/drivers/softpipe/sp_tex_sample.h
src/gallium/drivers/softpipe/sp_tile_cache.c
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_tex_sample.h')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_tex_sample.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.h b/src/gallium/drivers/softpipe/sp_tex_sample.h index f6cd57ec0ac..b0797711d37 100644 --- a/src/gallium/drivers/softpipe/sp_tex_sample.h +++ b/src/gallium/drivers/softpipe/sp_tex_sample.h @@ -85,7 +85,7 @@ struct sp_sampler_varient /* Currently bound texture: */ const struct pipe_texture *texture; - struct softpipe_tile_cache *cache; + struct softpipe_tex_tile_cache *cache; unsigned processor; @@ -127,7 +127,7 @@ sp_create_sampler_varient( const struct pipe_sampler_state *sampler, const union sp_sampler_key key ); void sp_sampler_varient_bind_texture( struct sp_sampler_varient *varient, - struct softpipe_tile_cache *tex_cache, + struct softpipe_tex_tile_cache *tex_cache, const struct pipe_texture *tex ); void sp_sampler_varient_destroy( struct sp_sampler_varient * ); |