diff options
| author | Brian Paul <[email protected]> | 2015-02-28 08:57:20 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2015-03-02 08:55:30 -0700 |
| commit | 16f7b7727569758a4df9c2bae3ca3a0de683960d (patch) | |
| tree | 3cd212dadd2dbb23d95ab36f04beef7bb1ad2957 | |
| parent | 766f5cf8f88c08a7673beb492095ad8ca878bc22 (diff) | |
mesa/swrast: replace Elements() with ARRAY_SIZE()
Acked-by: Ilia Mirkin <[email protected]>
| -rw-r--r-- | src/mesa/swrast/s_points.c | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_texfetch.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c index 52a7222129f..8180483ba4b 100644 --- a/src/mesa/swrast/s_points.c +++ b/src/mesa/swrast/s_points.c @@ -140,7 +140,7 @@ sprite_point(struct gl_context *ctx, const SWvertex *vert) if (attr >= VARYING_SLOT_TEX0 && attr <= VARYING_SLOT_TEX7) { /* a texcoord attribute */ const GLuint u = attr - VARYING_SLOT_TEX0; - assert(u < Elements(ctx->Point.CoordReplace)); + assert(u < ARRAY_SIZE(ctx->Point.CoordReplace)); if (ctx->Point.CoordReplace[u]) { tCoords[numTcoords++] = attr; diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c index 242f8a43fa1..3c4ee15ba85 100644 --- a/src/mesa/swrast/s_texfetch.c +++ b/src/mesa/swrast/s_texfetch.c @@ -573,7 +573,7 @@ set_fetch_functions(const struct gl_sampler_object *samp, } #endif - STATIC_ASSERT(Elements(texfetch_funcs) == MESA_FORMAT_COUNT); + STATIC_ASSERT(ARRAY_SIZE(texfetch_funcs) == MESA_FORMAT_COUNT); if (samp->sRGBDecode == GL_SKIP_DECODE_EXT && _mesa_get_format_color_encoding(format) == GL_SRGB) { |