From: Brian Paul <brianp@vmware.com>
Date: Mon, 25 Jan 2010 21:46:17 +0000 (-0700)
Subject: Merge branch 'mesa_7_7_branch'
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=9b22427911ad27efc1f36faee9462c6082d0417c

Merge branch 'mesa_7_7_branch'

Conflicts:

	src/mesa/drivers/dri/intel/intel_screen.c
	src/mesa/drivers/dri/intel/intel_swapbuffers.c
	src/mesa/drivers/dri/r300/r300_emit.c
	src/mesa/drivers/dri/r300/r300_ioctl.c
	src/mesa/drivers/dri/r300/r300_tex.c
	src/mesa/drivers/dri/r300/r300_texstate.c
---

9b22427911ad27efc1f36faee9462c6082d0417c
diff --cc src/mesa/drivers/dri/intel/intel_screen.c
index 6c2cb3b57e2,f3de7d14649..fe504166427
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@@ -37,11 -38,9 +37,9 @@@
  #include "intel_buffers.h"
  #include "intel_bufmgr.h"
  #include "intel_chipset.h"
- #include "intel_extensions.h"
  #include "intel_fbo.h"
 -#include "intel_swapbuffers.h"
 +#include "intel_regions.h"
  #include "intel_screen.h"
- #include "intel_span.h"
  #include "intel_tex.h"
  
  #include "i915_drm.h"
diff --cc src/mesa/drivers/dri/r300/r300_context.c
index 2efdae078e8,2ad51863845..eedb7b6ed86
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@@ -52,17 -50,14 +50,15 @@@ WITH THE SOFTWARE OR THE USE OR OTHER D
  
  #include "tnl/tnl.h"
  #include "tnl/t_pipeline.h"
- #include "tnl/t_vp_build.h"
  
  #include "drivers/common/driverfuncs.h"
 +#include "drivers/common/meta.h"
  
  #include "r300_context.h"
- #include "radeon_context.h"
  #include "radeon_span.h"
 +#include "r300_blit.h"
  #include "r300_cmdbuf.h"
  #include "r300_state.h"
 -#include "r300_ioctl.h"
  #include "r300_tex.h"
  #include "r300_emit.h"
  #include "r300_swtcl.h"
diff --cc src/mesa/drivers/dri/r300/r300_emit.c
index 15aeaf05148,71287514ece..740c9022217
--- a/src/mesa/drivers/dri/r300/r300_emit.c
+++ b/src/mesa/drivers/dri/r300/r300_emit.c
@@@ -47,11 -45,8 +45,11 @@@ WITH THE SOFTWARE OR THE USE OR OTHER D
  #include "tnl/t_context.h"
  
  #include "r300_context.h"
- #include "r300_state.h"
  #include "r300_emit.h"
 +#include "r300_render.h"
 +#include "r300_swtcl.h"
 +
+ 
  GLuint r300VAPInputCntl0(GLcontext * ctx, GLuint InputsRead)
  {
  	/* No idea what this value means. I have seen other values written to