From: Keith Whitwell <keith@tungstengraphics.com>
Date: Sat, 15 Nov 2008 16:23:31 +0000 (+0000)
Subject: Merge commit 'origin/gallium-0.1' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5e1454a036be6da2c48e2e20bf6f8047ee1a94d3;p=mesa.git

Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	src/mesa/drivers/dri/common/dri_util.c
---

5e1454a036be6da2c48e2e20bf6f8047ee1a94d3
diff --cc progs/trivial/Makefile
index 3f26798ca62,1b9a50b437b..40ee5e81c41
--- a/progs/trivial/Makefile
+++ b/progs/trivial/Makefile
@@@ -92,9 -93,12 +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 \