Merge branch 'tex-tilecache' into softpipe-opt

[mesa.git] / 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 f6cd57ec0ac8073843ff0758e9fde405c6859899..b0797711d374da0cf8abf251b9f420d549e35984 100644 (file)
--- 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 * );