Merge branch 'mesa_7_7_branch'

Conflicts:
	configs/darwin
	src/gallium/auxiliary/util/u_clear.h
	src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
	src/mesa/drivers/dri/i965/brw_draw_upload.c

diff --cc configs/darwin
index 25e8d057a929aa1f6398c7edd1a6b32ff0ee4192,336b54e067485e2f78c52bfb5553eb970cc5599d..7556688fe6dd431c74a7f731b3d0402be4600db5
--- 1/configs/darwin
--- 2/configs/darwin
+++ b/configs/darwin
@@@ -49,7 -49,7 +49,7 @@@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(
  APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
  
  # omit glw lib for now:
- SRC_DIRS = glsl glx/x11 mesa glu glut/glx glew
 -SRC_DIRS = glx/x11 mesa gallium glu glut/glx glew
++SRC_DIRS = glsl glx/x11 mesa gallium glu glut/glx glew
  GLU_DIRS = sgi
  DRIVER_DIRS = osmesa
  #DRIVER_DIRS = dri

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

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

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

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

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

diff --cc src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
Simple merge

diff --cc src/gallium/drivers/i915/i915_state.c
Simple merge

diff --cc src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
index a67c70ff25a277a394476e9d916e2443aa1b7692,0dea2cd4c86da00d46a7f8bf445d45d2238d38da..7cfa4cc59a6a036fa3dd6ea79afb249eacd85648
--- 1/src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
--- 2/src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
+++ b/src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
@@@ -319,9 -319,9 +319,9 @@@ emit_tex( struct lp_build_tgsi_soa_cont
            boolean projected,
            LLVMValueRef *texel)
  {
 -   const uint unit = inst->FullSrcRegisters[1].SrcRegister.Index;
 +   const uint unit = inst->Src[1].Register.Index;
     LLVMValueRef lodbias;
-    LLVMValueRef oow;
+    LLVMValueRef oow = NULL;
     LLVMValueRef coords[3];
     unsigned num_coords;
     unsigned i;

diff --cc src/gallium/drivers/llvmpipe/lp_state_fs.c
Simple merge

diff --cc src/gallium/drivers/trace/tr_context.c
Simple merge

diff --cc src/gallium/drivers/trace/tr_rbug.c
Simple merge

diff --cc src/gallium/state_trackers/egl/egl_surface.c
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc src/mesa/main/texgetimage.c
Simple merge

diff --cc src/mesa/shader/slang/slang_compile.c
Simple merge

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

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