From: Brian Paul <brianp@vmware.com>
Date: Thu, 31 Dec 2009 16:02:27 +0000 (-0700)
Subject: Merge branch 'mesa_7_7_branch'
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=25024d948298a9f3f3210a0b91486f79a3917b0f

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

25024d948298a9f3f3210a0b91486f79a3917b0f
diff --cc configs/darwin
index 25e8d057a92,336b54e0674..7556688fe6d
--- a/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 src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
index a67c70ff25a,0dea2cd4c86..7cfa4cc59a6
--- a/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;