diff options
| author | Keith Whitwell <[email protected]> | 2008-10-15 17:20:30 +0100 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-10-15 17:20:30 +0100 |
| commit | cf85e413ad7672c1cef73215222ca1caa8e48b30 (patch) | |
| tree | f6c22fe6664f2512a06653768ca27b17d2294134 /progs/trivial/Makefile | |
| parent | d533a5d00ae2d0669e9da41718ee847de0c343aa (diff) | |
| parent | 055d986efefa310d6ffd1106e565ca2f5964159a (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/mesa/main/context.c
Diffstat (limited to 'progs/trivial/Makefile')
| -rw-r--r-- | progs/trivial/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile index a4077bd0169..3f26798ca62 100644 --- a/progs/trivial/Makefile +++ b/progs/trivial/Makefile @@ -97,6 +97,7 @@ SOURCES = \ tri-query.c \ tri-scissor-tri.c \ tri-stencil.c \ + tri-tex.c \ tri-tex-3d.c \ tri-tri.c \ tri-unfilled-edgeflag.c \ @@ -126,8 +127,11 @@ SOURCES = \ vp-line-clip.c \ vp-tri.c \ vp-tri-swap.c \ + vp-tri-tex.c \ vp-tri-imm.c \ vp-tri-cb.c \ + vp-tri-cb-pos.c \ + vp-tri-cb-tex.c \ vp-unfilled.c PROGS = $(SOURCES:%.c=%) |