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_state_sampler.c | |
| 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_state_sampler.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_state_sampler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c index afc6e1d2eb..db0b8ab76b 100644 --- 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; |