diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-07-15 14:17:07 -0400 |
---|---|---|
committer | Alex Deucher <alexdeucher@gmail.com> | 2009-07-15 14:17:07 -0400 |
commit | c5c19919ce627b98d8aab4284da1694573bcccd4 (patch) | |
tree | 2e29b313b79b6a392e020fd5723e3cc00c800fd2 /progs/trivial/Makefile | |
parent | a0d4a12614fce072fa1eb5516e626909171c95e1 (diff) | |
parent | 3a3b83e5112b725e22f05b32a273a2351b820944 (diff) |
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
This builds, but I get an assertion in radeonGetLock() due to
the drawable being null.
Diffstat (limited to 'progs/trivial/Makefile')
-rw-r--r-- | progs/trivial/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile index 22de83fa79..3bd8faff99 100644 --- a/progs/trivial/Makefile +++ b/progs/trivial/Makefile @@ -19,6 +19,12 @@ SOURCES = \ clear-random.c \ clear.c \ dlist-dangling.c \ + dlist-flat-tri.c \ + dlist-mat-tri.c \ + dlist-tri-flat-tri.c \ + dlist-tri-mat-tri.c \ + dlist-recursive-call.c \ + dlist-begin-call-end.c \ dlist-edgeflag-dangling.c \ dlist-edgeflag.c \ dlist-degenerate.c \ @@ -105,6 +111,7 @@ SOURCES = \ tri-fp.c \ tri-fp-const-imm.c \ tri-lit.c \ + tri-lit-material.c \ tri-mask-tri.c \ tri-orig.c \ tri-query.c \ |