diff options
| author | Brian <[email protected]> | 2007-02-22 08:53:33 -0700 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-02-22 08:53:33 -0700 |
| commit | 29c471aafc6a3fef23d553e31a555d1782854a77 (patch) | |
| tree | 335385fd55d510118346136c6feb4daa707988b6 /progs/trivial/Makefile | |
| parent | 6d4cf6be4e79c3a6ab18272577df17389e3834a6 (diff) | |
| parent | a4b344baa2484c65a1618f3cce3a94c91dea8ef7 (diff) | |
Merge branch 'origin' into glsl-compiler-1
Conflicts:
src/mesa/main/state.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/programopt.c
src/mesa/shader/slang/slang_execute.c
src/mesa/sources
src/mesa/swrast/s_arbshader.c
src/mesa/swrast/s_context.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_zoom.c
src/mesa/tnl/t_context.c
src/mesa/tnl/t_save_api.c
src/mesa/tnl/t_vb_arbprogram.c
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/t_vtx_eval.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 \ |