Merge commit 'origin/master' into gallium-0.2

Conflicts:

	progs/trivial/Makefile
	src/mesa/glapi/glthread.c

diff --cc progs/trivial/Makefile
index 95223e45b945c2ea125b52c9d9540cf90d19f8ba,36a5548488612bcab9bbd9dd065c475b0e1a8c83..28c0b12fa4d50cc7246ca809733669623ebfe0df
--- 1/progs/trivial/Makefile
--- 2/progs/trivial/Makefile
+++ b/progs/trivial/Makefile
@@@ -11,23 -11,9 +11,24 @@@ include $(TOP)/configs/curren
  LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
  
  SOURCES = \
 +      clear-fbo-tex.c \
 +      clear-fbo.c \
 +      clear-scissor.c \
 +      clear-undefined.c \
        clear.c \
 +      dlist-dangling.c \
 +      dlist-edgeflag-dangling.c \
 +      dlist-edgeflag.c \
++      dlist-degenerate.c \
 +      drawarrays.c \
 +      drawelements.c \
 +      drawrange.c \
 +      flat-clip.c \
 +      fs-tri.c \
        line-clip.c \
        line-cull.c \
 +      line-smooth.c \
 +      line-stipple-wide.c \
        line-userclip-clip.c \
        line-userclip-nop-clip.c \
        line-userclip-nop.c \
@@@ -60,48 -34,32 +61,48 @@@
        quad-degenerate.c \
        quad-flat.c \
        quad-offset-factor.c \
 -      quad-offset-units.c \
        quad-offset-unfilled.c \
 -      quad-unfilled.c \
 +      quad-offset-units.c \
        quad-tex-2d.c \
 -      quad-tex-pbo.c \
        quad-tex-3d.c \
 +      quad-tex-alpha.c \
 +      quad-tex-pbo.c \
 +      quad-unfilled-clip.c \
 +      quad-unfilled-stipple.c \
 +      quad-unfilled.c \
        quad.c \
        quads.c \
 -      quadstrip.c \
 +      quadstrip-cont.c \
        quadstrip-flat.c \
 -      dlist-edgeflag.c \
 -      dlist-dangling.c \
 -      dlist-edgeflag-dangling.c \
 -      dlist-degenerate.c \
 -      drawrange.c \
 -      drawelements.c \
 -      drawarrays.c \
 +      quadstrip.c \
-       tri-orig.c \
 +      tri-alpha.c \
 +      tri-blend-color.c \
 +      tri-blend-max.c \
 +      tri-blend-min.c \
 +      tri-blend-revsub.c \
 +      tri-blend-sub.c \
        tri-blend.c \
 -      tri-tex-3d.c \
        tri-clip.c \
 +      tri-cull-both.c \
        tri-cull.c \
 +      tri-dlist.c \
        tri-edgeflag.c \
 +      tri-fbo-tex.c \
 +      tri-fbo.c \
        tri-flat-clip.c \
        tri-flat.c \
 +      tri-fog.c \
 +      tri-mask-tri.c \
++      tri-orig.c \
 +      tri-query.c \
 +      tri-scissor-tri.c \
 +      tri-stencil.c \
 +      tri-tex-3d.c \
 +      tri-tri.c \
 +      tri-unfilled-edgeflag.c \
        tri-unfilled-clip.c \
        tri-unfilled-smooth.c \
 +      tri-unfilled-userclip-stip.c \
        tri-unfilled-userclip.c \
        tri-unfilled.c \
        tri-userclip.c \

diff --cc src/glu/sgi/libnurbs/interface/mystdio.h
Simple merge

diff --cc src/glu/sgi/libnurbs/internals/backend.cc
Simple merge

diff --cc src/glu/sgi/libnurbs/internals/backend.h
Simple merge

diff --cc src/glu/sgi/libnurbs/internals/bufpool.cc
Simple merge

diff --cc src/glu/sgi/libnurbs/internals/bufpool.h
Simple merge

diff --cc src/glu/sgi/libnurbs/internals/knotvector.h
Simple merge

diff --cc src/glu/sgi/libnurbs/internals/nurbstess.cc
Simple merge

diff --cc src/mesa/drivers/dri/tdfx/tdfx_screen.c
Simple merge

diff --cc src/mesa/glapi/glthread.c
index 09cc8cfcde20ce01e2eed4f6523fae9889516cb1,b818f4e26eb5ef65994c19aa33a2002f843da549..56ddf7c25acceea2bf038c37e30235d2b1ac41f5
--- 1/src/mesa/glapi/glthread.c
--- 2/src/mesa/glapi/glthread.c
+++ b/src/mesa/glapi/glthread.c
@@@ -25,11 -25,16 +25,14 @@@
  
  /*
   * XXX There's probably some work to do in order to make this file
 - * truly reusable outside of Mesa.
 + * truly reusable outside of Mesa.  First, the glheader.h include must go.
   */
  
 -
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
  
 -#include <stdlib.h>
 -#include <stdio.h>
 +#include "main/glheader.h"
  #include "glthread.h"
  
  

diff --cc src/mesa/main/bufferobj.c
Simple merge

diff --cc src/mesa/main/dlist.c
Simple merge

diff --cc src/mesa/main/mtypes.h
Simple merge

diff --cc src/mesa/main/state.c
Simple merge

diff --cc src/mesa/shader/shader_api.c
Simple merge

diff --cc src/mesa/swrast/s_texfilter.c
Simple merge