Add nv20_state.c ; hook nv10_state.c into the build ; do the renaming

    required by the renouveau changes.

1 files changed, 32 insertions, 29 deletions

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_reg.h b/src/mesa/drivers/dri/nouveau/nouveau_reg.h
index c5052d7c4b..389c541e1c 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_reg.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_reg.h
@@ -43,7 +43,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************
 
-   Created from objects.c rev. 1.332
+   Created from objects.c rev. 1.337
 */
 
 #ifndef _NOUVEAU_REG_H
@@ -239,7 +239,7 @@ Object NV04_SCALED_IMAGE_FROM_MEMORY used on: NV04
 #	define		NV04_SCALED_IMAGE_FROM_MEMORY_DU_DX			0x00000318	/* Parameters: int frac*0x100000 */
 #	define		NV04_SCALED_IMAGE_FROM_MEMORY_DV_DY			0x0000031c	/* Parameters: int frac*0x100000 */
 #	define		NV04_SCALED_IMAGE_FROM_MEMORY_SIZE			0x00000400	/* Parameters: width height */
-#	define		NV04_SCALED_IMAGE_FROM_MEMORY_FORMAT			0x00000404	/* Parameters: pitch */
+#	define		NV04_SCALED_IMAGE_FROM_MEMORY_FORMAT			0x00000404	/* Parameters: pitch origin filter */
 #	define		NV04_SCALED_IMAGE_FROM_MEMORY_OFFSET			0x00000408
 #	define		NV04_SCALED_IMAGE_FROM_MEMORY_POINT			0x0000040c	/* Parameters: u_int u_frac*0x10 v_int v_frac*0x10 */
 
@@ -328,7 +328,7 @@ Object NV10_TCL_PRIMITIVE_3D used on: NV10
 #	define		NV10_TCL_PRIMITIVE_3D_FOG_COLOR				0x000002a8	/* Parameters: a b g r */
 #	define		NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(d)		(0x000002c0 + d * 0x0004)	/* Parameters: x2 x1 */
 #	define		NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_VERT(d)		(0x000002e0 + d * 0x0004)	/* Parameters: y2 y1 */
-#	define		NV10_TCL_PRIMITIVE_3D_ALPHA_TEST_ENABLE			0x00000300
+#	define		NV10_TCL_PRIMITIVE_3D_ALPHA_FUNC_ENABLE			0x00000300
 #	define		NV10_TCL_PRIMITIVE_3D_BLEND_ENABLE			0x00000304
 #	define		NV10_TCL_PRIMITIVE_3D_CULL_FACE_ENABLE			0x00000308
 #	define		NV10_TCL_PRIMITIVE_3D_DEPTH_TEST_ENABLE			0x0000030c
@@ -339,11 +339,11 @@ Object NV10_TCL_PRIMITIVE_3D used on: NV10
 #	define		NV10_TCL_PRIMITIVE_3D_LINE_SMOOTH_ENABLE		0x00000320
 #	define		NV10_TCL_PRIMITIVE_3D_POLYGON_SMOOTH_ENABLE		0x00000324
 #	define		NV10_TCL_PRIMITIVE_3D_VERTEX_WEIGHT_ENABLE		0x00000328
-#	define		NV10_TCL_PRIMITIVE_3D_STENCIL_TEST_ENABLE		0x0000032c
+#	define		NV10_TCL_PRIMITIVE_3D_STENCIL_ENABLE			0x0000032c
 #	define		NV10_TCL_PRIMITIVE_3D_POLYGON_OFFSET_POINT_ENABLE	0x00000330
 #	define		NV10_TCL_PRIMITIVE_3D_POLYGON_OFFSET_LINE_ENABLE	0x00000334
 #	define		NV10_TCL_PRIMITIVE_3D_POLYGON_OFFSET_FILL_ENABLE	0x00000338
-#	define		NV10_TCL_PRIMITIVE_3D_ALPHA_FUNC			0x0000033c
+#	define		NV10_TCL_PRIMITIVE_3D_ALPHA_FUNC_FUNC			0x0000033c
 #	define		NV10_TCL_PRIMITIVE_3D_ALPHA_FUNC_REF			0x00000340
 #	define		NV10_TCL_PRIMITIVE_3D_BLEND_FUNC_SRC			0x00000344
 #	define		NV10_TCL_PRIMITIVE_3D_BLEND_FUNC_DST			0x00000348
@@ -351,7 +351,7 @@ Object NV10_TCL_PRIMITIVE_3D used on: NV10
 #	define		NV10_TCL_PRIMITIVE_3D_BLEND_EQUATION			0x00000350
 #	define		NV10_TCL_PRIMITIVE_3D_DEPTH_FUNC			0x00000354
 #	define		NV10_TCL_PRIMITIVE_3D_COLOR_MASK			0x00000358	/* Parameters: r g b */
-#	define		NV10_TCL_PRIMITIVE_3D_DEPTH_MASK			0x0000035c
+#	define		NV10_TCL_PRIMITIVE_3D_DEPTH_WRITE_ENABLE		0x0000035c
 #	define		NV10_TCL_PRIMITIVE_3D_STENCIL_MASK			0x00000360
 #	define		NV10_TCL_PRIMITIVE_3D_STENCIL_FUNC_FUNC			0x00000364
 #	define		NV10_TCL_PRIMITIVE_3D_STENCIL_FUNC_REF			0x00000368
@@ -534,7 +534,7 @@ Object NV15_TCL_PRIMITIVE_3D used on: NV15
 #	define		NV17_TCL_PRIMITIVE_3D_COLOR_MASK_ENABLE			0x000002bc
 #	define		NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(d)		(0x000002c0 + d * 0x0004)	/* Parameters: x2 x1 */
 #	define		NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_VERT(d)		(0x000002e0 + d * 0x0004)	/* Parameters: y2 y1 */
-#	define		NV10_TCL_PRIMITIVE_3D_ALPHA_TEST_ENABLE			0x00000300
+#	define		NV10_TCL_PRIMITIVE_3D_ALPHA_FUNC_ENABLE			0x00000300
 #	define		NV10_TCL_PRIMITIVE_3D_BLEND_ENABLE			0x00000304
 #	define		NV10_TCL_PRIMITIVE_3D_CULL_FACE_ENABLE			0x00000308
 #	define		NV10_TCL_PRIMITIVE_3D_DEPTH_TEST_ENABLE			0x0000030c
@@ -545,11 +545,11 @@ Object NV15_TCL_PRIMITIVE_3D used on: NV15
 #	define		NV10_TCL_PRIMITIVE_3D_LINE_SMOOTH_ENABLE		0x00000320
 #	define		NV10_TCL_PRIMITIVE_3D_POLYGON_SMOOTH_ENABLE		0x00000324
 #	define		NV10_TCL_PRIMITIVE_3D_VERTEX_WEIGHT_ENABLE		0x00000328
-#	define		NV10_TCL_PRIMITIVE_3D_STENCIL_TEST_ENABLE		0x0000032c
+#	define		NV10_TCL_PRIMITIVE_3D_STENCIL_ENABLE			0x0000032c
 #	define		NV10_TCL_PRIMITIVE_3D_POLYGON_OFFSET_POINT_ENABLE	0x00000330
 #	define		NV10_TCL_PRIMITIVE_3D_POLYGON_OFFSET_LINE_ENABLE	0x00000334
 #	define		NV10_TCL_PRIMITIVE_3D_POLYGON_OFFSET_FILL_ENABLE	0x00000338
-#	define		NV10_TCL_PRIMITIVE_3D_ALPHA_FUNC			0x0000033c
+#	define		NV10_TCL_PRIMITIVE_3D_ALPHA_FUNC_FUNC			0x0000033c
 #	define		NV10_TCL_PRIMITIVE_3D_ALPHA_FUNC_REF			0x00000340
 #	define		NV10_TCL_PRIMITIVE_3D_BLEND_FUNC_SRC			0x00000344
 #	define		NV10_TCL_PRIMITIVE_3D_BLEND_FUNC_DST			0x00000348
@@ -557,7 +557,7 @@ Object NV15_TCL_PRIMITIVE_3D used on: NV15
 #	define		NV10_TCL_PRIMITIVE_3D_BLEND_EQUATION			0x00000350
 #	define		NV10_TCL_PRIMITIVE_3D_DEPTH_FUNC			0x00000354
 #	define		NV10_TCL_PRIMITIVE_3D_COLOR_MASK			0x00000358	/* Parameters: r g b */
-#	define		NV10_TCL_PRIMITIVE_3D_DEPTH_MASK			0x0000035c
+#	define		NV10_TCL_PRIMITIVE_3D_DEPTH_WRITE_ENABLE		0x0000035c
 #	define		NV10_TCL_PRIMITIVE_3D_STENCIL_MASK			0x00000360
 #	define		NV10_TCL_PRIMITIVE_3D_STENCIL_FUNC_FUNC			0x00000364
 #	define		NV10_TCL_PRIMITIVE_3D_STENCIL_FUNC_REF			0x00000368
@@ -797,17 +797,17 @@ Object NV10_CONTEXT_SURFACES_2D used on: NV10 NV15 NV20 NV30 NV40 G70
 #	define		NV10_CONTEXT_SURFACES_2D_OFFSET_DST			0x0000030c
 
 /****************************************** 
-Object NV04_SURFACE used on: NV04 NV10 NV15 
+Object NV04_CONTEXT_SURFACES_2D used on: NV04 NV10 NV15 
 */
-#define			NV04_SURFACE						0x00000042
-#	define		NV04_SURFACE_NOTIFY					0x00000104
-#	define		NV04_SURFACE_DMA_NOTIFY					0x00000180
-#	define		NV04_SURFACE_DMA_IMAGE_SOURCE				0x00000184
-#	define		NV04_SURFACE_DMA_IMAGE_DESTIN				0x00000188
-#	define		NV04_SURFACE_FORMAT					0x00000300
-#	define		NV04_SURFACE_PITCH					0x00000304	/* Parameters: source destin */
-#	define		NV04_SURFACE_OFFSET_SOURCE				0x00000308
-#	define		NV04_SURFACE_OFFSET_DESTIN				0x0000030c
+#define			NV04_CONTEXT_SURFACES_2D				0x00000042
+#	define		NV04_CONTEXT_SURFACES_2D_NOTIFY				0x00000104
+#	define		NV04_CONTEXT_SURFACES_2D_SET_DMA_NOTIFY			0x00000180
+#	define		NV04_CONTEXT_SURFACES_2D_SET_DMA_IMAGE_SRC		0x00000184
+#	define		NV04_CONTEXT_SURFACES_2D_SET_DMA_IMAGE_DST		0x00000188
+#	define		NV04_CONTEXT_SURFACES_2D_FORMAT				0x00000300
+#	define		NV04_CONTEXT_SURFACES_2D_PITCH				0x00000304	/* Parameters: src dst */
+#	define		NV04_CONTEXT_SURFACES_2D_OFFSET_SRC			0x00000308
+#	define		NV04_CONTEXT_SURFACES_2D_OFFSET_DST			0x0000030c
 
 /****************************************** 
 Object NV04_IMAGE_PATTERN used on: NV04 NV10 NV15 NV20 NV30 NV40 G70
@@ -858,16 +858,18 @@ Object NV20_TCL_PRIMITIVE_3D used on: NV20
 #	define		NV20_TCL_PRIMITIVE_3D_COLOR_MATERIAL_CONTROL		0x00000298	/* Parameters: back_specular back_ambient back_diffuse back_emission front_specular front_ambient front_diffuse front_emission */
 #	define		NV20_TCL_PRIMITIVE_3D_FOG_MODE				0x0000029c
 #	define		NV20_TCL_PRIMITIVE_3D_FOG_COORD_DIST			0x000002a0
-#	define		NV20_TCL_PRIMITIVE_3D_ALPHA_TEST_ENABLE			0x00000300
-#	define		NV20_TCL_PRIMITIVE_3D_BLEND_ENABLE			0x00000304
+#	define		NV20_TCL_PRIMITIVE_3D_FOG_ENABLE			0x000002a4
+#	define		NV20_TCL_PRIMITIVE_3D_ALPHA_FUNC_ENABLE			0x00000300
+#	define		NV20_TCL_PRIMITIVE_3D_BLEND_FUNC_ENABLE			0x00000304
 #	define		NV20_TCL_PRIMITIVE_3D_CULL_FACE_ENABLE			0x00000308
 #	define		NV20_TCL_PRIMITIVE_3D_DEPTH_TEST_ENABLE			0x0000030c
 #	define		NV20_TCL_PRIMITIVE_3D_DITHER_ENABLE			0x00000310
 #	define		NV20_TCL_PRIMITIVE_3D_LIGHTING_ENABLE			0x00000314
+#	define		NV20_TCL_PRIMITIVE_3D_POINT_SMOOTH_ENABLE		0x0000031c
 #	define		NV20_TCL_PRIMITIVE_3D_POINT_PARAMETERS_ENABLE		0x00000318
 #	define		NV20_TCL_PRIMITIVE_3D_LINE_SMOOTH_ENABLE		0x00000320
 #	define		NV20_TCL_PRIMITIVE_3D_POLYGON_SMOOTH_ENABLE		0x00000324
-#	define		NV20_TCL_PRIMITIVE_3D_STENCIL_TEST_ENABLE		0x0000032c
+#	define		NV20_TCL_PRIMITIVE_3D_STENCIL_ENABLE			0x0000032c
 #	define		NV20_TCL_PRIMITIVE_3D_POLYGON_OFFSET_POINT_ENABLE	0x00000330
 #	define		NV20_TCL_PRIMITIVE_3D_POLYGON_OFFSET_LINE_ENABLE	0x00000334
 #	define		NV20_TCL_PRIMITIVE_3D_POLYGON_OFFSET_FILL_ENABLE	0x00000338
@@ -879,7 +881,7 @@ Object NV20_TCL_PRIMITIVE_3D used on: NV20
 #	define		NV20_TCL_PRIMITIVE_3D_BLEND_EQUATION			0x00000350
 #	define		NV20_TCL_PRIMITIVE_3D_DEPTH_FUNC			0x00000354
 #	define		NV20_TCL_PRIMITIVE_3D_COLOR_MASK			0x00000358	/* Parameters: a r g b */
-#	define		NV20_TCL_PRIMITIVE_3D_DEPTH_MASK			0x0000035c
+#	define		NV20_TCL_PRIMITIVE_3D_DEPTH_WRITE_ENABLE		0x0000035c
 #	define		NV20_TCL_PRIMITIVE_3D_STENCIL_MASK			0x00000360
 #	define		NV20_TCL_PRIMITIVE_3D_STENCIL_FUNC_FUNC			0x00000364
 #	define		NV20_TCL_PRIMITIVE_3D_STENCIL_FUNC_REF			0x00000368
@@ -1081,11 +1083,12 @@ Object NV20_TCL_PRIMITIVE_3D used on: NV20
 #	define		NV20_TCL_PRIMITIVE_3D_LIGHT_MODEL_BACK_SIDE_PRODUCT_AMBIENT_PLUS_EMISSION	0x000017a0
 #	define		NV20_TCL_PRIMITIVE_3D_COLOR_MATERIAL_BACK		0x000017b0
 #	define		NV20_TCL_PRIMITIVE_3D_COLOR_LOGIC_OP_ENABLE		0x000017bc
-#	define		NV20_TCL_PRIMITIVE_3D_LOGIC_OP				0x000017c0
+#	define		NV20_TCL_PRIMITIVE_3D_COLOR_LOGIC_OP_OP			0x000017c0
 #	define		NV20_TCL_PRIMITIVE_3D_LIGHT_MODEL_TWO_SIDE_ENABLE	0x000017c4
 #	define		NV20_TCL_PRIMITIVE_3D_BEGIN_END				0x000017fc
-#	define		NV20_TCL_PRIMITIVE_3D_CLEAR_COLOR			0x00001d90
-#	define		NV20_TCL_PRIMITIVE_3D_CLEAR_MASK			0x00001d94	/* Parameters: clear color a clear color b clear color g clear color r clear depth clear stencil */
+#	define		NV20_TCL_PRIMITIVE_3D_CLEAR_VALUE_DEPTH			0x00001d8c
+#	define		NV20_TCL_PRIMITIVE_3D_CLEAR_VALUE_ARGB			0x00001d90
+#	define		NV20_TCL_PRIMITIVE_3D_CLEAR_WHICH_BUFFERS		0x00001d94	/* Parameters: clear color a clear color b clear color g clear color r clear depth clear stencil */
 #	define		NV20_TCL_PRIMITIVE_3D_INDEX_DATA			0x00001800	/* Parameters: index1 index0 */
 #	define		NV20_TCL_PRIMITIVE_3D_VB_VERTEX_BATCH			0x00001810	/* Parameters: count_vertices offset_vertices */
 #	define		NV20_TCL_PRIMITIVE_3D_VERTEX_DATA			0x00001818
@@ -1330,8 +1333,8 @@ Object NV30_TCL_PRIMITIVE_3D used on: NV30 NV40 G70
 #	define		NV30_TCL_PRIMITIVE_3D_TX_DEPTH_UNIT(d)			(0x00001840 + d * 0x0004)	/* Parameters: depth NPOT pitch */
 #	define		NV30_TCL_PRIMITIVE_3D_VB_VERTEX_BATCH			0x00001814	/* Parameters: count_vertices offset_vertices */
 #	define		NV30_TCL_PRIMITIVE_3D_VERTEX_DATA			0x00001818
-#	define		NV30_TCL_PRIMITIVE_3D_LOGIC_OP_ENABLE			0x00000374
-#	define		NV30_TCL_PRIMITIVE_3D_LOGIC_OP_OP			0x00000378
+#	define		NV30_TCL_PRIMITIVE_3D_COLOR_LOGIC_OP_ENABLE		0x00000374
+#	define		NV30_TCL_PRIMITIVE_3D_COLOR_LOGIC_OP_OP			0x00000378
 #	define		NV30_TCL_PRIMITIVE_3D_SET_DISPLAY_LIST_MEM_OFFSET	0x0000181c
 #	define		NV30_TCL_PRIMITIVE_3D_EXECUTE_DISPLAY_LIST		0x00001824	/* Parameters: length start offset */
 #	define		NV30_TCL_PRIMITIVE_3D_POLYGON_MODE_FRONT		0x00001828