Merge remote branch 'origin/master' into lp-binning

Conflicts:
	Makefile
	src/gallium/auxiliary/util/u_surface.c
	src/gallium/drivers/llvmpipe/lp_flush.c
	src/gallium/drivers/llvmpipe/lp_setup.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.c
	src/gallium/drivers/llvmpipe/lp_state_surface.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.c
	src/gallium/drivers/llvmpipe/lp_texture.c
	src/gallium/drivers/llvmpipe/lp_tile_cache.c
	src/mesa/state_tracker/st_cb_condrender.c

11 files changed, 0 insertions, 13 deletions

diff --git a/src/glu/sgi/libnurbs/internals/arc.cc b/src/glu/sgi/libnurbs/internals/arc.cc
index b85139de937..cd4c4048a0a 100644
--- a/src/glu/sgi/libnurbs/internals/arc.cc
+++ b/src/glu/sgi/libnurbs/internals/arc.cc
@@ -43,7 +43,6 @@
 #include "myassert.h"
 #include "arc.h"
 #include "bin.h"
-#include "bezierarc.h"
 #include "pwlarc.h"
 #include "simplemath.h"
 
diff --git a/src/glu/sgi/libnurbs/internals/backend.cc b/src/glu/sgi/libnurbs/internals/backend.cc
index 88dc3f51680..27b41ebb29e 100644
--- a/src/glu/sgi/libnurbs/internals/backend.cc
+++ b/src/glu/sgi/libnurbs/internals/backend.cc
@@ -46,7 +46,6 @@
 #include "backend.h"
 #include "basiccrveval.h"
 #include "basicsurfeval.h"
-#include "nurbsconsts.h"
 
 #define NOWIREFRAME
 
diff --git a/src/glu/sgi/libnurbs/internals/curvelist.cc b/src/glu/sgi/libnurbs/internals/curvelist.cc
index 872eb5816d3..abfebb767f0 100644
--- a/src/glu/sgi/libnurbs/internals/curvelist.cc
+++ b/src/glu/sgi/libnurbs/internals/curvelist.cc
@@ -43,7 +43,6 @@
 #include "quilt.h"
 #include "curvelist.h"
 #include "curve.h"
-#include "nurbsconsts.h"
 #include "types.h"
 
 Curvelist::Curvelist( Quilt *quilts, REAL pta, REAL ptb )
diff --git a/src/glu/sgi/libnurbs/internals/curvesub.cc b/src/glu/sgi/libnurbs/internals/curvesub.cc
index f85acc269a9..91f2ca8ce8e 100644
--- a/src/glu/sgi/libnurbs/internals/curvesub.cc
+++ b/src/glu/sgi/libnurbs/internals/curvesub.cc
@@ -45,7 +45,6 @@
 #include "backend.h"
 #include "quilt.h"
 #include "curvelist.h"
-#include "curve.h"
 #include "nurbsconsts.h"
 
 /*--------------------------------------------------------------------------
diff --git a/src/glu/sgi/libnurbs/internals/maplist.cc b/src/glu/sgi/libnurbs/internals/maplist.cc
index f944d1529e5..e51a3e85d0c 100644
--- a/src/glu/sgi/libnurbs/internals/maplist.cc
+++ b/src/glu/sgi/libnurbs/internals/maplist.cc
@@ -44,7 +44,6 @@
 #include "nurbsconsts.h"
 #include "maplist.h"
 #include "mapdesc.h"
-#include "backend.h"
  
 Maplist::Maplist( Backend& b )
     : mapdescPool( sizeof( Mapdesc ), 10, "mapdesc pool" ),
diff --git a/src/glu/sgi/libnurbs/internals/patchlist.cc b/src/glu/sgi/libnurbs/internals/patchlist.cc
index 989d2dd00ab..6a400ab6f72 100644
--- a/src/glu/sgi/libnurbs/internals/patchlist.cc
+++ b/src/glu/sgi/libnurbs/internals/patchlist.cc
@@ -44,7 +44,6 @@
 #include "quilt.h"
 #include "patchlist.h"
 #include "patch.h"
-#include "nurbsconsts.h"
 
 Patchlist::Patchlist( Quilt *quilts, REAL *pta, REAL *ptb )
 {
diff --git a/src/glu/sgi/libnurbs/internals/quilt.cc b/src/glu/sgi/libnurbs/internals/quilt.cc
index 4fc58b74736..d16f4bfec02 100644
--- a/src/glu/sgi/libnurbs/internals/quilt.cc
+++ b/src/glu/sgi/libnurbs/internals/quilt.cc
@@ -44,9 +44,7 @@
 #include "backend.h"
 #include "mapdesc.h"
 #include "flist.h"
-#include "knotvector.h"
 #include "patchlist.h"
-#include "math.h"     //fglu_abs()
 #include "simplemath.h" //min()
 
 /* local preprocessor definitions */
diff --git a/src/glu/sgi/libnurbs/internals/renderhints.cc b/src/glu/sgi/libnurbs/internals/renderhints.cc
index 7025f74f5b6..4b347ebc7f5 100644
--- a/src/glu/sgi/libnurbs/internals/renderhints.cc
+++ b/src/glu/sgi/libnurbs/internals/renderhints.cc
@@ -40,7 +40,6 @@
 #include "glimports.h"
 #include "mystdio.h"
 #include "renderhints.h"
-#include "defines.h"
 #include "nurbsconsts.h"
 
 
diff --git a/src/glu/sgi/libnurbs/internals/trimregion.cc b/src/glu/sgi/libnurbs/internals/trimregion.cc
index efe7893569d..4aeb5eeac16 100644
--- a/src/glu/sgi/libnurbs/internals/trimregion.cc
+++ b/src/glu/sgi/libnurbs/internals/trimregion.cc
@@ -41,7 +41,6 @@
 #include "myassert.h"
 #include "mystdio.h"
 #include "trimregion.h"
-#include "backend.h"
 
 TrimRegion::TrimRegion( void )
 {
diff --git a/src/glu/sgi/libutil/error.c b/src/glu/sgi/libutil/error.c
index e734818ed6d..7212748450d 100644
--- a/src/glu/sgi/libutil/error.c
+++ b/src/glu/sgi/libutil/error.c
@@ -31,8 +31,6 @@
 #include "gluos.h"
 #include "gluint.h"
 #include <GL/glu.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 
 struct token_string
diff --git a/src/glu/sgi/libutil/mipmap.c b/src/glu/sgi/libutil/mipmap.c
index d1fd5a7d724..8e63eaaad77 100644
--- a/src/glu/sgi/libutil/mipmap.c
+++ b/src/glu/sgi/libutil/mipmap.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <limits.h>		/* UINT_MAX */
 #include <math.h>
-#include "gluint.h"
 
 typedef union {
     unsigned char ub[4];