Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/main/api_validate.c

diff --cc src/gallium/drivers/softpipe/sp_context.h
Simple merge

diff --cc src/gallium/drivers/softpipe/sp_setup.c
Simple merge

diff --cc src/gallium/include/pipe/p_thread.h
Simple merge

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

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

diff --cc src/mesa/drivers/dri/i965/brw_wm.h
index ab0ab8bdbf65e179dd73fc0b7dff650d608cf37e,0408034c38a6ce322df51e42328e51353d0b10dc..ba497432c601a8282d912dace18dc0a34f80bd9e
--- 1/src/mesa/drivers/dri/i965/brw_wm.h
--- 2/src/mesa/drivers/dri/i965/brw_wm.h
+++ b/src/mesa/drivers/dri/i965/brw_wm.h
@@@ -63,10 -63,9 +63,10 @@@ struct brw_wm_prog_key 
     GLuint computes_depth:1;   /* could be derived from program string */
     GLuint source_depth_to_render_target:1;
     GLuint flat_shade:1;
 +   GLuint linear_color:1;  /**< linear interpolation vs perspective interp */
     GLuint runtime_check_aads_emit:1;
     
-    GLuint projtex_mask:16;
+    GLbitfield proj_attrib_mask; /**< one bit per fragment program attribute */
     GLuint shadowtex_mask:16;
     GLuint yuvtex_mask:16;
     GLuint yuvtex_swap_mask:16;        /* UV swaped */

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

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

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

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