diff options
author | Ben Skeggs <[email protected]> | 2008-03-30 19:58:03 +1000 |
---|---|---|
committer | Ben Skeggs <[email protected]> | 2008-03-30 19:58:03 +1000 |
commit | 03c60e0fb691d39a168a8825ace7150ef3a20e02 (patch) | |
tree | e7433c539a7584d29d4a6bf23aacdc348167aed8 /src/gallium/auxiliary/draw/draw_vf.c | |
parent | 68395f6726183a0776e324b900e429449ede2b22 (diff) | |
parent | a52c0416d1f2105960b4646e2e268aed26814689 (diff) |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_vf.c')
-rw-r--r-- | src/gallium/auxiliary/draw/draw_vf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/draw/draw_vf.c b/src/gallium/auxiliary/draw/draw_vf.c index f4e29a62932..7bb34ace7aa 100644 --- a/src/gallium/auxiliary/draw/draw_vf.c +++ b/src/gallium/auxiliary/draw/draw_vf.c @@ -158,7 +158,7 @@ draw_vf_set_vertex_attributes( struct draw_vertex_fetch *vf, unsigned offset = 0; unsigned i, j; - assert(nr < PIPE_ATTRIB_MAX); + assert(nr < PIPE_MAX_ATTRIBS); for (j = 0, i = 0; i < nr; i++) { const unsigned format = map[i].format; @@ -390,7 +390,7 @@ struct draw_vertex_fetch *draw_vf_create( void ) struct draw_vertex_fetch *vf = CALLOC_STRUCT(draw_vertex_fetch); unsigned i; - for (i = 0; i < PIPE_ATTRIB_MAX; i++) + for (i = 0; i < PIPE_MAX_ATTRIBS; i++) vf->attr[i].vf = vf; vf->identity[0] = 0.0; |