Merge branch 'mesa_7_7_branch'

Conflicts:
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
	src/gallium/auxiliary/util/Makefile
	src/gallium/drivers/r300/r300_state_derived.c

diff --cc progs/demos/engine.c
Simple merge

diff --cc progs/demos/fire.c
Simple merge

diff --cc progs/demos/isosurf.c
Simple merge

diff --cc progs/demos/morph3d.c
Simple merge

diff --cc src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_exec.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_flush.c
index c78a767,4282357..59819cb
--- 1/src/gallium/drivers/r300/r300_flush.c
--- 2/src/gallium/drivers/r300/r300_flush.c
+++ b/src/gallium/drivers/r300/r300_flush.c
@@@ -37,9 -37,9 +37,10 @@@ static void r300_flush(struct pipe_cont
  {
      struct r300_context *r300 = r300_context(pipe);
      struct r300_query *query;
 +    struct r300_atom *atom;
  
      CS_LOCALS(r300);
+     (void) cs_count;
      /* We probably need to flush Draw, but we may have been called from
       * within Draw. This feels kludgy, but it might be the best thing.
       *

diff --cc src/gallium/drivers/svga/svga_state_fs.c
Simple merge

diff --cc src/gallium/drivers/svga/svga_state_vs.c
Simple merge

diff --cc src/gallium/state_trackers/dri/dri_drawable.c
Simple merge

diff --cc src/gallium/state_trackers/xorg/xorg_xv.c
Simple merge

diff --cc src/mesa/state_tracker/st_program.c
Simple merge

diff --cc src/mesa/state_tracker/st_texture.c
Simple merge

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

diff --cc src/mesa/swrast/s_bitmap.c
index 46c63aa,57a42b3..59e26e9
--- 1/src/mesa/swrast/s_bitmap.c
--- 2/src/mesa/swrast/s_bitmap.c
+++ b/src/mesa/swrast/s_bitmap.c
@@@ -30,10 -30,8 +30,9 @@@
  
  #include "main/glheader.h"
  #include "main/bufferobj.h"
 +#include "main/condrender.h"
  #include "main/image.h"
  #include "main/macros.h"
- #include "main/pixel.h"
  
  #include "s_context.h"
  #include "s_span.h"

diff --cc src/mesa/swrast/s_copypix.c
index 986b6af,da98730..e881d1b
--- 1/src/mesa/swrast/s_copypix.c
--- 2/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@@ -26,9 -26,7 +26,8 @@@
  #include "main/glheader.h"
  #include "main/context.h"
  #include "main/colormac.h"
 +#include "main/condrender.h"
  #include "main/convolve.h"
- #include "main/histogram.h"
  #include "main/image.h"
  #include "main/macros.h"
  #include "main/imports.h"

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

diff --cc src/mesa/tnl/t_draw.c
index d31b29b,9a888ce..38757a0
--- 1/src/mesa/tnl/t_draw.c
--- 2/src/mesa/tnl/t_draw.c
+++ b/src/mesa/tnl/t_draw.c
@@@ -26,10 -26,8 +26,9 @@@
   */
  
  #include "main/glheader.h"
 +#include "main/condrender.h"
  #include "main/context.h"
  #include "main/imports.h"
- #include "main/state.h"
  #include "main/mtypes.h"
  #include "main/macros.h"
  #include "main/enums.h"

diff --cc src/mesa/tnl/t_pipeline.c
Simple merge

diff --cc src/mesa/tnl/t_vb_program.c
Simple merge