diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2007-02-02 12:26:10 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-02-02 12:26:10 +0000 |
| commit | b59657ad965f9471574e914b861bb1d2a17d772e (patch) | |
| tree | 99a4fe6dc933472516de91773da04034626a84b5 /src/mesa/tnl/sources | |
| parent | 325196f548f8e46aa8fcc7b030e81ba939e7f6b7 (diff) | |
| parent | 2ddc8799a8e243cb10cd69ea9424f72b6c4de534 (diff) | |
Merge branch 'vbo-0.2'
Conflicts:
src/mesa/main/texcompress_s3tc.c
src/mesa/tnl/t_array_api.c
Diffstat (limited to 'src/mesa/tnl/sources')
| -rw-r--r-- | src/mesa/tnl/sources | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/mesa/tnl/sources b/src/mesa/tnl/sources index e01f55dbaf..a0888be11d 100644 --- a/src/mesa/tnl/sources +++ b/src/mesa/tnl/sources @@ -1,12 +1,7 @@ # List of source files in this directory used for X.org xserver build MESA_TNL_SOURCES = \ -t_array_api.c \ -t_array_import.c \ t_context.c \ t_pipeline.c \ -t_save_api.c \ -t_save_loopback.c \ -t_save_playback.c \ t_vb_arbprogram.c \ t_vb_arbprogram_sse.c \ t_vb_arbshader.c \ @@ -23,24 +18,17 @@ t_vb_vertex.c \ t_vertex.c \ t_vertex_generic.c \ t_vertex_sse.c \ -t_vp_build.c \ -t_vtx_api.c \ -t_vtx_eval.c \ -t_vtx_exec.c \ -t_vtx_generic.c \ -t_vtx_x86.c +t_vp_build.c MESA_TNL_HEADERS = \ t_array_api.h \ t_array_import.h \ t_context.h \ t_pipeline.h \ -t_save_api.h \ t_vb_arbprogram.h \ t_vb_cliptmp.h \ t_vb_lighttmp.h \ t_vb_rendertmp.h \ t_vertex.h \ t_vp_build.h \ -t_vtx_api.h \ tnl.h |