nv30: Update nouveau_class.h to get its proper defines instead of using nv40 ones

2 files changed, 19 insertions, 19 deletions

diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index 620038fa64..84f016eead 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -51,7 +51,7 @@ nv30_blend_state_bind(struct pipe_context *pipe, void *hwcso)
 	OUT_RING  (cb->b_enable);
 	OUT_RING  (cb->b_srcfunc);
 	OUT_RING  (cb->b_dstfunc);
-	BEGIN_RING(rankine, NV34TCL_BLEND_FUNC_EQUATION, 1);
+	BEGIN_RING(rankine, NV34TCL_BLEND_EQUATION, 1);
 	OUT_RING  (cb->b_eqn);
 
 	BEGIN_RING(rankine, NV34TCL_COLOR_MASK, 1);
@@ -531,7 +531,7 @@ nv30_set_blend_color(struct pipe_context *pipe,
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
 
-	BEGIN_RING(rankine, NV34TCL_BLEND_FUNC_COLOR, 1);
+	BEGIN_RING(rankine, NV34TCL_BLEND_COLOR, 1);
 	OUT_RING  ((float_to_ubyte(bcol->color[3]) << 24) |
 		   (float_to_ubyte(bcol->color[0]) << 16) |
 		   (float_to_ubyte(bcol->color[1]) <<  8) |
diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c
index b18a407ec5..ff0ce6ac81 100644
--- a/src/gallium/drivers/nv30/nv30_vbo.c
+++ b/src/gallium/drivers/nv30/nv30_vbo.c
@@ -26,12 +26,12 @@ nv30_vbo_type(uint format)
 {
 	switch (pf_type(format)) {
 	case PIPE_FORMAT_TYPE_FLOAT:
-		return NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_FLOAT;
+		return NV34TCL_VTXFMT_TYPE_FLOAT;
 	case PIPE_FORMAT_TYPE_UNORM:
-		return NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_UBYTE;
+		return NV34TCL_VTXFMT_TYPE_UBYTE;
 	default:
 		NOUVEAU_ERR("Unknown format 0x%08x\n", format);
-		return NV40TCL_VTXFMT_TYPE_FLOAT;
+		return NV34TCL_VTXFMT_TYPE_FLOAT;
 	}
 }
 
@@ -51,7 +51,7 @@ nv30_vbo_static_attrib(struct nv30_context *nv30, int attrib,
 	map += vb->buffer_offset + ve->src_offset;
 
 	switch (type) {
-	case NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_FLOAT:
+	case NV34TCL_VTXFMT_TYPE_FLOAT:
 	{
 		float *v = map;
 
@@ -121,7 +121,7 @@ nv30_vbo_arrays_update(struct nv30_context *nv30)
 		struct pipe_vertex_buffer *vb;
 
 		if (!(inputs & (1 << hw))) {
-			vtxfmt[hw] = NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_FLOAT;
+			vtxfmt[hw] = NV34TCL_VTXFMT_TYPE_FLOAT;
 			continue;
 		}
 
@@ -129,7 +129,7 @@ nv30_vbo_arrays_update(struct nv30_context *nv30)
 		vb = &nv30->vtxbuf[ve->vertex_buffer_index];
 
 		if (vb->pitch == 0) {
-			vtxfmt[hw] = NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_FLOAT;
+			vtxfmt[hw] = NV34TCL_VTXFMT_TYPE_FLOAT;
 			if (nv30_vbo_static_attrib(nv30, hw, ve, vb) == TRUE)
 				continue;
 		}
@@ -138,13 +138,13 @@ nv30_vbo_arrays_update(struct nv30_context *nv30)
 		nv30->vb[hw].delta = vb->buffer_offset + ve->src_offset;
 		nv30->vb[hw].buffer = vb->buffer;
 
-		vtxfmt[hw] = ((vb->pitch << NV34TCL_VERTEX_ARRAY_FORMAT_STRIDE_SHIFT) |
+		vtxfmt[hw] = ((vb->pitch << NV34TCL_VTXFMT_STRIDE_SHIFT) |
 			      (nv30_vbo_ncomp(ve->src_format) <<
-			       NV34TCL_VERTEX_ARRAY_FORMAT_SIZE_SHIFT) |
+			       NV34TCL_VTXFMT_SIZE_SHIFT) |
 			      nv30_vbo_type(ve->src_format));
 	}
 
-	BEGIN_RING(rankine, NV34TCL_VERTEX_ARRAY_FORMAT(0), num_hw);
+	BEGIN_RING(rankine, NV34TCL_VTXFMT(0), num_hw);
 	OUT_RINGp (vtxfmt, num_hw);
 }
 
@@ -167,20 +167,20 @@ nv30_vbo_validate_state(struct nv30_context *nv30,
 
 		inputs &= ~(1 << a);
 
-		BEGIN_RING(rankine, NV34TCL_VERTEX_BUFFER_ADDRESS(a), 1);
+		BEGIN_RING(rankine, NV34TCL_VTXBUF_ADDRESS(a), 1);
 		OUT_RELOC (nv30->vb[a].buffer, nv30->vb[a].delta,
 			   NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_LOW |
 			   NOUVEAU_BO_OR | NOUVEAU_BO_RD, 0,
-			   NV34TCL_VERTEX_BUFFER_ADDRESS_DMA1);
+			   NV34TCL_VTXBUF_ADDRESS_DMA1);
 	}
 
 	if (ib) {
-		BEGIN_RING(rankine, NV40TCL_IDXBUF_ADDRESS, 2);
+		BEGIN_RING(rankine, NV34TCL_IDXBUF_ADDRESS, 2);
 		OUT_RELOCl(ib, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_GART |
 			   NOUVEAU_BO_RD);
 		OUT_RELOCd(ib, ib_format, NOUVEAU_BO_VRAM | NOUVEAU_BO_GART |
 			   NOUVEAU_BO_RD | NOUVEAU_BO_OR,
-			   0, NV40TCL_IDXBUF_FORMAT_DMA1);
+			   0, NV34TCL_IDXBUF_FORMAT_DMA1);
 	}
 
 	BEGIN_RING(rankine, 0x1710, 1);
@@ -360,10 +360,10 @@ nv30_draw_elements_vbo(struct pipe_context *pipe,
 
 	switch (ib_size) {
 	case 2:
-		type = NV40TCL_IDXBUF_FORMAT_TYPE_U16;
+		type = NV34TCL_IDXBUF_FORMAT_TYPE_U16;
 		break;
 	case 4:
-		type = NV40TCL_IDXBUF_FORMAT_TYPE_U32;
+		type = NV34TCL_IDXBUF_FORMAT_TYPE_U32;
 		break;
 	default:
 		NOUVEAU_ERR("invalid idxbuf fmt %d\n", ib_size);
@@ -381,7 +381,7 @@ nv30_draw_elements_vbo(struct pipe_context *pipe,
 
 	nr = (count & 0xff);
 	if (nr) {
-		BEGIN_RING(rankine, NV40TCL_VB_INDEX_BATCH, 1);
+		BEGIN_RING(rankine, NV34TCL_VB_INDEX_BATCH, 1);
 		OUT_RING  (((nr - 1) << 24) | start);
 		start += nr;
 	}
@@ -392,7 +392,7 @@ nv30_draw_elements_vbo(struct pipe_context *pipe,
 
 		nr -= push;
 
-		BEGIN_RING_NI(rankine, NV40TCL_VB_INDEX_BATCH, push);
+		BEGIN_RING_NI(rankine, NV34TCL_VB_INDEX_BATCH, push);
 		while (push--) {
 			OUT_RING(((0x100 - 1) << 24) | start);
 			start += 0x100;