Merge branch 'tex-tilecache' into softpipe-opt

[mesa.git] / src / gallium / drivers / softpipe / sp_state_sampler.c

diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c
index afc6e1d2eb7623aa691f611016bf4ca831943a29..db0b8ab76b1722a039b99cb779cf956f927c4e78 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_state_sampler.c
+++ b/src/gallium/drivers/softpipe/sp_state_sampler.c
@@ -37,8 +37,8 @@
 #include "sp_context.h"
 #include "sp_state.h"
 #include "sp_texture.h"
-#include "sp_tile_cache.h"
 #include "sp_tex_sample.h"
+#include "sp_tex_tile_cache.h"
 
 
 struct sp_sampler {
@@ -113,7 +113,7 @@ softpipe_set_sampler_textures(struct pipe_context *pipe,
       struct pipe_texture *tex = i < num ? texture[i] : NULL;
 
       pipe_texture_reference(&softpipe->texture[i], tex);
-      sp_tile_cache_set_texture(softpipe->tex_cache[i], tex);
+      sp_tex_tile_cache_set_texture(softpipe->tex_cache[i], tex);
    }
 
    softpipe->num_textures = num;