diff options
| author | Keith Whitwell <[email protected]> | 2007-02-02 12:26:10 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2007-02-02 12:26:10 +0000 |
| commit | b59657ad965f9471574e914b861bb1d2a17d772e (patch) | |
| tree | 99a4fe6dc933472516de91773da04034626a84b5 /progs/trivial/Makefile | |
| 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 'progs/trivial/Makefile')
| -rw-r--r-- | progs/trivial/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile index b9ed5c70dc5..341c115c07d 100644 --- a/progs/trivial/Makefile +++ b/progs/trivial/Makefile @@ -40,11 +40,16 @@ SOURCES = \ quad-tex-2d.c \ quad-tex-pbo.c \ quad-tex-3d.c \ - quad-tex-dep.c \ quad.c \ quads.c \ quadstrip.c \ quadstrip-flat.c \ + dlist-edgeflag.c \ + dlist-dangling.c \ + dlist-edgeflag-dangling.c \ + drawrange.c \ + drawelements.c \ + drawarrays.c \ tri-blend.c \ tri-tex-3d.c \ tri-clip.c \ @@ -61,6 +66,9 @@ SOURCES = \ tri.c \ tristrip-clip.c \ tristrip.c \ + vbo-drawrange.c \ + vbo-drawelements.c \ + vbo-drawarrays.c \ vp-clip.c \ vp-tri.c \ vp-line-clip.c \ |