Merge remote branch 'origin/master' into pipe-video

Conflicts:
	src/gallium/drivers/r600/r600_asm.c
	src/gallium/drivers/r600/r600_shader.c

1 files changed, 35 insertions, 13 deletions

diff --git a/src/gallium/drivers/nvc0/nvc0_3d.xml.h b/src/gallium/drivers/nvc0/nvc0_3d.xml.h
index 702e58b2e3c..31302949d5e 100644
--- a/src/gallium/drivers/nvc0/nvc0_3d.xml.h
+++ b/src/gallium/drivers/nvc0/nvc0_3d.xml.h
@@ -8,7 +8,7 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng
 git clone git://0x04.net/rules-ng-ng
 
 The rules-ng-ng source files this header was generated from are:
-- nvc0_3d.xml    (  30401 bytes, from 2011-01-08 18:09:11)
+- nvc0_3d.xml    (  30827 bytes, from 2011-01-13 18:23:07)
 - copyright.xml  (   6452 bytes, from 2010-11-25 23:28:20)
 - nv_defs.xml    (   4437 bytes, from 2010-07-06 07:43:58)
 - nv_3ddefs.xml  (  16394 bytes, from 2010-12-17 15:10:40)
@@ -449,6 +449,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NVC0_3D_LINKED_TSC					0x00001234
 
+#define NVC0_3D_DRAW_TFB_BYTES					0x0000123c
+
 #define NVC0_3D_FP_RESULT_COUNT					0x00001298
 
 #define NVC0_3D_DEPTH_TEST_ENABLE				0x000012cc
@@ -511,6 +513,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NVC0_3D_ALPHA_TEST_FUNC_GEQUAL				0x00000206
 #define NVC0_3D_ALPHA_TEST_FUNC_ALWAYS				0x00000207
 
+#define NVC0_3D_DRAW_TFB_STRIDE					0x00001318
+#define NVC0_3D_DRAW_TFB_STRIDE__MIN				0x00000001
+#define NVC0_3D_DRAW_TFB_STRIDE__MAX				0x00000fff
+
 #define NVC0_3D_BLEND_COLOR(i0)				       (0x0000131c + 0x4*(i0))
 #define NVC0_3D_BLEND_COLOR__ESIZE				0x00000004
 #define NVC0_3D_BLEND_COLOR__LEN				0x00000004
@@ -603,6 +609,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NVC0_3D_STENCIL_FRONT_FUNC_MASK				0x0000139c
 
+#define NVC0_3D_DRAW_TFB_BASE					0x000013a4
+
 #define NVC0_3D_FRAG_COLOR_CLAMP_EN				0x000013a8
 #define NVC0_3D_FRAG_COLOR_CLAMP_EN_0				0x00000001
 #define NVC0_3D_FRAG_COLOR_CLAMP_EN_1				0x00000010
@@ -613,7 +621,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NVC0_3D_FRAG_COLOR_CLAMP_EN_6				0x01000000
 #define NVC0_3D_FRAG_COLOR_CLAMP_EN_7				0x10000000
 
-#define NVC0_3D_Y_ORIGIN_BOTTOM					0x000013ac
+#define NVC0_3D_SCREEN_Y_CONTROL				0x000013ac
+#define NVC0_3D_SCREEN_Y_CONTROL_Y_NEGATE			0x00000001
+#define NVC0_3D_SCREEN_Y_CONTROL_TRIANGLE_RAST_FLIP		0x00000010
 
 #define NVC0_3D_LINE_WIDTH					0x000013b0
 
@@ -621,7 +631,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NVC0_3D_GP_VERTEX_OUTPUT_COUNT__MIN			0x00000001
 #define NVC0_3D_GP_VERTEX_OUTPUT_COUNT__MAX			0x00000400
 
-#define NVC0_3D_FENCE_UNK					0x0000142c
+#define NVC0_3D_VERTEX_ARRAY_FLUSH				0x0000142c
 
 #define NVC0_3D_VB_ELEMENT_BASE					0x00001434
 
@@ -668,7 +678,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NVC0_3D_COUNTER_RESET_UNK1E				0x0000001e
 #define NVC0_3D_COUNTER_RESET_GENERATED_PRIMITIVES		0x0000001f
 
-#define NVC0_3D_MULTISAMPLE_ZETA_ENABLE				0x00001534
+#define NVC0_3D_MULTISAMPLE_ENABLE				0x00001534
 
 #define NVC0_3D_ZETA_ENABLE					0x00001538
 
@@ -747,7 +757,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NVC0_3D_STENCIL_BACK_FUNC_FUNC_GEQUAL			0x00000206
 #define NVC0_3D_STENCIL_BACK_FUNC_FUNC_ALWAYS			0x00000207
 
-#define NVC0_3D_MULTISAMPLE_COLOR_ENABLE			0x000015b4
+#define NVC0_3D_CSAA_ENABLE					0x000015b4
 
 #define NVC0_3D_FRAMEBUFFER_SRGB				0x000015b8
 
@@ -849,6 +859,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NVC0_3D_POINT_SMOOTH_ENABLE				0x00001658
 
+#define NVC0_3D_POINT_RASTER_RULES				0x0000165c
+#define NVC0_3D_POINT_RASTER_RULES_OGL				0x00000000
+#define NVC0_3D_POINT_RASTER_RULES_D3D				0x00000001
+
 #define NVC0_3D_POINT_SPRITE_CTRL				0x00001660
 
 #define NVC0_3D_TEX_MISC					0x00001664
@@ -1028,6 +1042,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NVC0_3D_VERTEX_ARRAY_FETCH_STRIDE__SHIFT		0
 #define NVC0_3D_VERTEX_ARRAY_FETCH_ENABLE			0x00001000
 
+#define NVC0_3D_VERTEX_ARRAY_START_HIGH(i0)		       (0x00001c04 + 0x10*(i0))
+#define NVC0_3D_VERTEX_ARRAY_START_HIGH__ESIZE			0x00000010
+#define NVC0_3D_VERTEX_ARRAY_START_HIGH__LEN			0x00000020
+
+#define NVC0_3D_VERTEX_ARRAY_START_LOW(i0)		       (0x00001c08 + 0x10*(i0))
+#define NVC0_3D_VERTEX_ARRAY_START_LOW__ESIZE			0x00000010
+#define NVC0_3D_VERTEX_ARRAY_START_LOW__LEN			0x00000020
+
 #define NVC0_3D_VERTEX_ARRAY_DIVISOR(i0)		       (0x00001c0c + 0x10*(i0))
 #define NVC0_3D_VERTEX_ARRAY_DIVISOR__ESIZE			0x00000010
 #define NVC0_3D_VERTEX_ARRAY_DIVISOR__LEN			0x00000020
@@ -1058,6 +1080,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NVC0_3D_IBLEND_FUNC_DST_ALPHA(i0)		       (0x00001e18 + 0x20*(i0))
 
+#define NVC0_3D_VERTEX_ARRAY_LIMIT_HIGH(i0)		       (0x00001f00 + 0x8*(i0))
+#define NVC0_3D_VERTEX_ARRAY_LIMIT_HIGH__ESIZE			0x00000008
+#define NVC0_3D_VERTEX_ARRAY_LIMIT_HIGH__LEN			0x00000020
+
+#define NVC0_3D_VERTEX_ARRAY_LIMIT_LOW(i0)		       (0x00001f04 + 0x8*(i0))
+#define NVC0_3D_VERTEX_ARRAY_LIMIT_LOW__ESIZE			0x00000008
+#define NVC0_3D_VERTEX_ARRAY_LIMIT_LOW__LEN			0x00000020
+
 #define NVC0_3D_SP(i0)					       (0x00002000 + 0x40*(i0))
 #define NVC0_3D_SP__ESIZE					0x00000040
 #define NVC0_3D_SP__LEN						0x00000006
@@ -1132,14 +1162,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NVC0_3D_VERTEX_ARRAY_SELECT				0x00003820
 
-#define NVC0_3D_VERTEX_ARRAY_LIMIT_HIGH				0x00003824
-
-#define NVC0_3D_VERTEX_ARRAY_LIMIT_LOW				0x00003828
-
-#define NVC0_3D_VERTEX_ARRAY_START_HIGH				0x0000382c
-
-#define NVC0_3D_VERTEX_ARRAY_START_LOW				0x00003830
-
 #define NVC0_3D_BLEND_ENABLES					0x00003858
 
 #define NVC0_3D_POLYGON_MODE_FRONT				0x00003868