summaryrefslogtreecommitdiff
path: root/progs/trivial/Makefile
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2008-11-15 16:23:31 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2008-11-15 16:23:31 +0000
commit5e1454a036be6da2c48e2e20bf6f8047ee1a94d3 (patch)
tree660228843fc88f2e43d975921e7d4e078e483f1c /progs/trivial/Makefile
parent56ef0aeda5d23bf0c6147fd9d20d61abd18207af (diff)
parent7e584a70c492698be18bf4d6372b50d1a1c38385 (diff)
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts: src/mesa/drivers/dri/common/dri_util.c
Diffstat (limited to 'progs/trivial/Makefile')
-rw-r--r--progs/trivial/Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile
index 3f26798ca6..40ee5e81c4 100644
--- a/progs/trivial/Makefile
+++ b/progs/trivial/Makefile
@@ -15,6 +15,7 @@ SOURCES = \
clear-fbo.c \
clear-scissor.c \
clear-undefined.c \
+ clear-repeat.c \
clear.c \
dlist-dangling.c \
dlist-edgeflag-dangling.c \
@@ -92,9 +93,13 @@ SOURCES = \
tri-flat-clip.c \
tri-flat.c \
tri-fog.c \
+ tri-fp.c \
+ tri-fp-const-imm.c \
+ tri-lit.c \
tri-mask-tri.c \
tri-orig.c \
tri-query.c \
+ tri-repeat.c \
tri-scissor-tri.c \
tri-stencil.c \
tri-tex.c \
@@ -103,6 +108,8 @@ SOURCES = \
tri-unfilled-edgeflag.c \
tri-unfilled-clip.c \
tri-unfilled-smooth.c \
+ tri-unfilled-tri.c \
+ tri-unfilled-tri-lit.c \
tri-unfilled-userclip-stip.c \
tri-unfilled-userclip.c \
tri-unfilled.c \