Merge branch 'tex-tilecache' into softpipe-opt
authorKeith Whitwell <keithw@vmware.com>
Sun, 23 Aug 2009 09:23:46 +0000 (10:23 +0100)
committerKeith Whitwell <keithw@vmware.com>
Sun, 23 Aug 2009 09:23:46 +0000 (10:23 +0100)
commit7670102468a55de50cf0cfa0b938d36aaf212f1f
treee45cf5fba528902060e0b5e258087e0de69cfc58
parent0f24886f922df3e00094a53b5b37b1588ea84bc0
parentc84abe36a93312cfa061ce1bd005e43eb9f6a6df
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
src/gallium/drivers/softpipe/sp_context.c
src/gallium/drivers/softpipe/sp_context.h
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_tex_tile_cache.c
src/gallium/drivers/softpipe/sp_tile_cache.c
src/gallium/drivers/softpipe/sp_tile_cache.h