From: Jakob Bornecrantz <jakob@vmware.com>
Date: Thu, 14 Jan 2010 22:31:04 +0000 (+0000)
Subject: Merge branch 'mesa_7_7_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b01ffb12ed82dcf435b186e2aff35e344a8a6ebe;p=mesa.git

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
---

b01ffb12ed82dcf435b186e2aff35e344a8a6ebe
diff --cc src/gallium/drivers/r300/r300_flush.c
index c78a7673a3f,4282357521b..59819cb1061
--- a/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/mesa/swrast/s_bitmap.c
index 46c63aa6458,57a42b3f5db..59e26e9ea31
--- a/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 986b6aff4f0,da98730c38b..e881d1be30c
--- a/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/tnl/t_draw.c
index d31b29b9b40,9a888ce19f4..38757a0e288
--- a/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"