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

diff --cc SConstruct
Simple merge

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

diff --cc scons/gallium.py
Simple merge

diff --cc src/gallium/auxiliary/util/u_tile.c
Simple merge

diff --cc src/gallium/state_trackers/vega/shader.c
Simple merge

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

diff --cc src/gallium/state_trackers/xorg/xorg_tracker.h
Simple merge

diff --cc src/mesa/drivers/dri/i915/i830_context.c
Simple merge

diff --cc src/mesa/drivers/dri/i915/i915_context.c
Simple merge

diff --cc src/mesa/drivers/dri/i915/i915_vtbl.c
Simple merge

diff --cc src/mesa/drivers/dri/i915/intel_tris.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_cc.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_clip_line.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_clip_state.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_clip_tri.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_clip_util.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_context.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_draw.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_draw_upload.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_fallback.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_gs_emit.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_gs_state.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_sf_state.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_vs_surface_state.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_vtbl.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_wm.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_blit.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_buffers.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_clear.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_context.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_pixel.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_pixel_draw.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_pixel_read.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_regions.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_screen.c
index 6c2cb3b57e26b3bb98a165ede15cd2a1cbbe9dfe,f3de7d146490289f183aa4005a962971dbea7671..fe504166427bae4b06ae415a375213a9f007d4d1
--- 1/src/mesa/drivers/dri/intel/intel_screen.c
--- 2/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/intel/intel_state.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_tex_copy.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_tex_image.c
Simple merge

diff --cc src/mesa/drivers/dri/mga/mga_xmesa.c
Simple merge

diff --cc src/mesa/drivers/dri/mga/mgaioctl.c
Simple merge

diff --cc src/mesa/drivers/dri/mga/mgatex.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_cmdbuf.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_context.c
index 2efdae078e896f5486705032889f54230cc2f64e,2ad51863845093fd17814a45f219deaeb3d51c90..eedb7b6ed8679731e12c3b33ccc339c931fd7265
--- 1/src/mesa/drivers/dri/r300/r300_context.c
--- 2/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_draw.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_emit.c
index 15aeaf051480f40554de4a1958e7309c5eac3b7b,71287514ece9fab73c9021607bf8444a89352842..740c9022217207dfe259d12d8475f0db721bfef2
--- 1/src/mesa/drivers/dri/r300/r300_emit.c
--- 2/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

diff --cc src/mesa/drivers/dri/r300/r300_fragprog_common.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_state.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_tex.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_texstate.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_vertprog.c
Simple merge

diff --cc src/mesa/drivers/dri/savage/savageioctl.c
Simple merge

diff --cc src/mesa/drivers/dri/savage/savagerender.c
Simple merge

diff --cc src/mesa/drivers/dri/savage/savagespan.c
Simple merge

diff --cc src/mesa/drivers/dri/savage/savagetex.c
Simple merge

diff --cc src/mesa/drivers/dri/savage/savagetris.c
Simple merge

diff --cc src/mesa/drivers/dri/sis/sis_context.c
Simple merge

diff --cc src/mesa/drivers/dri/sis/sis_screen.c
Simple merge

diff --cc src/mesa/drivers/dri/sis/sis_texstate.c
Simple merge

diff --cc src/mesa/drivers/dri/sis/sis_tris.c
Simple merge

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

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

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

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

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

diff --cc src/mesa/glapi/gl_x86_asm.py
Simple merge

diff --cc src/mesa/x86/glapi_x86.S
Simple merge