diff options
| author | Brian Paul <brianp@vmware.com> | 2015-02-28 08:57:11 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2015-03-02 08:55:30 -0700 |
| commit | c2e130f8201239f836f429cab3beddb4d66a3357 (patch) | |
| tree | 244eb29a1db25d23e6bd5f276e64817838c470fb /src/mesa/main/rastpos.c | |
| parent | cd6db1989ad98b3e848d3ab132de98dc06274385 (diff) | |
| download | external_mesa3d-c2e130f8201239f836f429cab3beddb4d66a3357.zip external_mesa3d-c2e130f8201239f836f429cab3beddb4d66a3357.tar.gz external_mesa3d-c2e130f8201239f836f429cab3beddb4d66a3357.tar.bz2 | |
mesa/main: replace Elements() with ARRAY_SIZE()
We've been using a mix of these two macros for a while now. Let's
just use the later everywhere. It seems to be the convention used
by other open-source projects.
Acked-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'src/mesa/main/rastpos.c')
| -rw-r--r-- | src/mesa/main/rastpos.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index 2027a9b..54b2125 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -266,7 +266,7 @@ window_pos3f(GLfloat x, GLfloat y, GLfloat z) { GLuint texSet; for (texSet = 0; texSet < ctx->Const.MaxTextureCoordUnits; texSet++) { - assert(texSet < Elements(ctx->Current.RasterTexCoords)); + assert(texSet < ARRAY_SIZE(ctx->Current.RasterTexCoords)); COPY_4FV( ctx->Current.RasterTexCoords[texSet], ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texSet] ); } @@ -496,7 +496,7 @@ void _mesa_init_rastpos( struct gl_context * ctx ) ctx->Current.RasterDistance = 0.0; ASSIGN_4V( ctx->Current.RasterColor, 1.0, 1.0, 1.0, 1.0 ); ASSIGN_4V( ctx->Current.RasterSecondaryColor, 0.0, 0.0, 0.0, 1.0 ); - for (i = 0; i < Elements(ctx->Current.RasterTexCoords); i++) + for (i = 0; i < ARRAY_SIZE(ctx->Current.RasterTexCoords); i++) ASSIGN_4V( ctx->Current.RasterTexCoords[i], 0.0, 0.0, 0.0, 1.0 ); ctx->Current.RasterPosValid = GL_TRUE; } |