nouveau: PIPE_ATTRIB_MAX -> PIPE_MAX_ATTRIBS

4 files changed, 8 insertions, 8 deletions

diff --git a/src/gallium/drivers/nv10/nv10_context.h b/src/gallium/drivers/nv10/nv10_context.h
index 63d33ef7c..b80f36ad3 100644
--- a/src/gallium/drivers/nv10/nv10_context.h
+++ b/src/gallium/drivers/nv10/nv10_context.h
@@ -96,8 +96,8 @@ struct nv10_context {
 		struct pipe_buffer *constant_buf;
 	} fragprog;
 
-	struct pipe_vertex_buffer  vtxbuf[PIPE_ATTRIB_MAX];
-	struct pipe_vertex_element vtxelt[PIPE_ATTRIB_MAX];
+	struct pipe_vertex_buffer  vtxbuf[PIPE_MAX_ATTRIBS];
+	struct pipe_vertex_element vtxelt[PIPE_MAX_ATTRIBS];
 };
 
 static INLINE struct nv10_context *
diff --git a/src/gallium/drivers/nv10/nv10_vbo.c b/src/gallium/drivers/nv10/nv10_vbo.c
index 3a4f49e15..2a334e137 100644
--- a/src/gallium/drivers/nv10/nv10_vbo.c
+++ b/src/gallium/drivers/nv10/nv10_vbo.c
@@ -23,7 +23,7 @@ boolean nv10_draw_elements( struct pipe_context *pipe,
 	/*
 	 * Map vertex buffers
 	 */
-	for (i = 0; i < PIPE_ATTRIB_MAX; i++) {
+	for (i = 0; i < PIPE_MAX_ATTRIBS; i++) {
 		if (nv10->vtxbuf[i].buffer) {
 			void *buf
 				= pipe->winsys->buffer_map(pipe->winsys,
@@ -52,7 +52,7 @@ boolean nv10_draw_elements( struct pipe_context *pipe,
 	/*
 	 * unmap vertex/index buffers
 	 */
-	for (i = 0; i < PIPE_ATTRIB_MAX; i++) {
+	for (i = 0; i < PIPE_MAX_ATTRIBS; i++) {
 		if (nv10->vtxbuf[i].buffer) {
 			pipe->winsys->buffer_unmap(pipe->winsys, nv10->vtxbuf[i].buffer);
 			draw_set_mapped_vertex_buffer(draw, i, NULL);
diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 180969731..1a016405e 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -124,8 +124,8 @@ struct nv30_context {
 		struct pipe_buffer *constant_buf;
 	} fragprog;
 
-	struct pipe_vertex_buffer  vtxbuf[PIPE_ATTRIB_MAX];
-	struct pipe_vertex_element vtxelt[PIPE_ATTRIB_MAX];
+	struct pipe_vertex_buffer  vtxbuf[PIPE_MAX_ATTRIBS];
+	struct pipe_vertex_element vtxelt[PIPE_MAX_ATTRIBS];
 };
 
 static INLINE struct nv30_context *
diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
index 436351b6b..2f10540ff 100644
--- a/src/gallium/drivers/nv40/nv40_context.h
+++ b/src/gallium/drivers/nv40/nv40_context.h
@@ -151,9 +151,9 @@ struct nv40_context {
 	unsigned nr_samplers;
 	unsigned nr_textures;
 	unsigned dirty_samplers;
-	struct pipe_vertex_buffer vtxbuf[PIPE_ATTRIB_MAX];
+	struct pipe_vertex_buffer vtxbuf[PIPE_MAX_ATTRIBS];
 	unsigned vtxbuf_nr;
-	struct pipe_vertex_element vtxelt[PIPE_ATTRIB_MAX];
+	struct pipe_vertex_element vtxelt[PIPE_MAX_ATTRIBS];
 	unsigned vtxelt_nr;
 };