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 /progs/fp/slt.txt | |
| 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 'progs/fp/slt.txt')
0 files changed, 0 insertions, 0 deletions