summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/uniforms.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2015-02-28 08:57:11 -0700
committerBrian Paul <[email protected]>2015-03-02 08:55:30 -0700
commitc2e130f8201239f836f429cab3beddb4d66a3357 (patch)
tree244eb29a1db25d23e6bd5f276e64817838c470fb /src/mesa/main/uniforms.c
parentcd6db1989ad98b3e848d3ab132de98dc06274385 (diff)
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 <[email protected]>
Diffstat (limited to 'src/mesa/main/uniforms.c')
-rw-r--r--src/mesa/main/uniforms.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index 4bb3dfbcd94..fb1482f9ceb 100644
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -81,7 +81,7 @@ _mesa_update_shader_textures_used(struct gl_shader_program *shProg,
if (prog->SamplersUsed & (1 << s)) {
GLuint unit = shader->SamplerUnits[s];
GLuint tgt = shader->SamplerTargets[s];
- assert(unit < Elements(prog->TexturesUsed));
+ assert(unit < ARRAY_SIZE(prog->TexturesUsed));
assert(tgt < NUM_TEXTURE_TARGETS);
/* The types of the samplers associated with a particular texture