diff options
author | Brian Paul <brianp@vmware.com> | 2015-02-28 08:57:15 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2015-03-02 08:55:30 -0700 |
commit | 766f5cf8f88c08a7673beb492095ad8ca878bc22 (patch) | |
tree | 4bec0be5b0bebeaefcd30bbb6a21abdbb122a59f /src/mesa/vbo/vbo_exec_api.c | |
parent | c2e130f8201239f836f429cab3beddb4d66a3357 (diff) | |
download | external_mesa3d-766f5cf8f88c08a7673beb492095ad8ca878bc22.zip external_mesa3d-766f5cf8f88c08a7673beb492095ad8ca878bc22.tar.gz external_mesa3d-766f5cf8f88c08a7673beb492095ad8ca878bc22.tar.bz2 |
mesa/vbo: replace Elements() with ARRAY_SIZE()
Acked-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'src/mesa/vbo/vbo_exec_api.c')
-rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 2a17ff5..9669abe 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -1044,16 +1044,16 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec ) _mesa_noop_vtxfmt_init(&exec->vtxfmt_noop); for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) { - assert(i < Elements(exec->vtx.attrsz)); + assert(i < ARRAY_SIZE(exec->vtx.attrsz)); exec->vtx.attrsz[i] = 0; - assert(i < Elements(exec->vtx.attrtype)); + assert(i < ARRAY_SIZE(exec->vtx.attrtype)); exec->vtx.attrtype[i] = GL_FLOAT; - assert(i < Elements(exec->vtx.active_sz)); + assert(i < ARRAY_SIZE(exec->vtx.active_sz)); exec->vtx.active_sz[i] = 0; } for (i = 0 ; i < VERT_ATTRIB_MAX; i++) { - assert(i < Elements(exec->vtx.inputs)); - assert(i < Elements(exec->vtx.arrays)); + assert(i < ARRAY_SIZE(exec->vtx.inputs)); + assert(i < ARRAY_SIZE(exec->vtx.arrays)); exec->vtx.inputs[i] = &exec->vtx.arrays[i]; } @@ -1110,7 +1110,7 @@ void vbo_exec_vtx_destroy( struct vbo_exec_context *exec ) /* Drop any outstanding reference to the vertex buffer */ - for (i = 0; i < Elements(exec->vtx.arrays); i++) { + for (i = 0; i < ARRAY_SIZE(exec->vtx.arrays); i++) { _mesa_reference_buffer_object(ctx, &exec->vtx.arrays[i].BufferObj, NULL); |