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_context.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_context.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c index ef8faab3bd..48ec540ebf 100644 --- a/src/gallium/drivers/softpipe/sp_context.c +++ b/src/gallium/drivers/softpipe/sp_context.c @@ -97,7 +97,7 @@ static void softpipe_destroy( struct pipe_context *pipe ) sp_destroy_tile_cache(softpipe->zsbuf_cache); for (i = 0; i < PIPE_MAX_SAMPLERS; i++) - sp_destroy_tile_cache(softpipe->tex_cache[i]); + sp_destroy_tex_tile_cache(softpipe->tex_cache[i]); for (i = 0; i < Elements(softpipe->constants); i++) { if (softpipe->constants[i].buffer) { @@ -220,7 +220,7 @@ softpipe_create( struct pipe_screen *screen ) softpipe->zsbuf_cache = sp_create_tile_cache( screen ); for (i = 0; i < PIPE_MAX_SAMPLERS; i++) - softpipe->tex_cache[i] = sp_create_tile_cache( screen ); + softpipe->tex_cache[i] = sp_create_tex_tile_cache( screen ); /* setup quad rendering stages */ |