nouveau: PIPE_ATTRIB_MAX -> PIPE_MAX_ATTRIBS

diff --git a/src/gallium/drivers/nv10/nv10_context.h b/src/gallium/drivers/nv10/nv10_context.h
index 63d33ef7c91e421064a0e458ead50caefb6daae1..b80f36ad34cdcd96c15122306ad596d8ec5893e0 100644 (file)
--- 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 3a4f49e1564ed61168f4751354e6d819ca9a5cb0..2a334e137d96c7af9f8b3bf81a2d9e2dca6c5503 100644 (file)
--- 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 180969731bf5055015ed559867ccda31d9469b8c..1a016405e6267d9d647f40344b6959b9d4a5b384 100644 (file)
--- 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 436351b6bcc5d9627c2708166e5ce27b007319c3..2f10540ff0c491ef8884514c08edc3345b9f729a 100644 (file)
--- 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;
 };