From: Brian Paul <brianp@vmware.com>
Date: Wed, 17 Jun 2009 00:25:52 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8d482227915552c414e13743652e6794c4313ae2;p=mesa.git

Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/main/api_validate.c
---

8d482227915552c414e13743652e6794c4313ae2
diff --cc src/mesa/drivers/dri/i965/brw_wm.h
index ab0ab8bdbf6,0408034c38a..ba497432c60
--- a/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 */