diff options
| author | Keith Whitwell <[email protected]> | 2009-08-23 10:23:46 +0100 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-08-23 10:23:46 +0100 |
| commit | 7670102468a55de50cf0cfa0b938d36aaf212f1f (patch) | |
| tree | e45cf5fba528902060e0b5e258087e0de69cfc58 /src/gallium/drivers/softpipe/Makefile | |
| 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/Makefile')
| -rw-r--r-- | src/gallium/drivers/softpipe/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/drivers/softpipe/Makefile b/src/gallium/drivers/softpipe/Makefile index a6ed7ea6a2a..3da9be6957e 100644 --- a/src/gallium/drivers/softpipe/Makefile +++ b/src/gallium/drivers/softpipe/Makefile @@ -30,6 +30,7 @@ C_SOURCES = \ sp_state_vertex.c \ sp_texture.c \ sp_tex_sample.c \ + sp_tex_tile_cache.c \ sp_tile_cache.c \ sp_surface.c |