From: Henri Verbeet <hverbeet@gmail.com>
Date: Sun, 3 Jul 2011 22:57:42 +0000 (+0200)
Subject: mesa: Use the Elements macro for the sampler index assert in validate_samplers().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=47441956284b3e22df2ee8500667617d2880bfc8;p=mesa.git

mesa: Use the Elements macro for the sampler index assert in validate_samplers().

This is probably nicer if the array size ever changes.

NOTE: This is a candidate for the 7.11 branch.

Signed-off-by: Henri Verbeet <hverbeet@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index cb02e430c78..8df25c3f988 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1050,7 +1050,7 @@ validate_samplers(const struct gl_program *prog, char *errMsg)
       gl_texture_index target;
       GLint sampler = _mesa_ffs(samplersUsed) - 1;
       assert(sampler >= 0);
-      assert(sampler < MAX_TEXTURE_IMAGE_UNITS);
+      assert(sampler < Elements(prog->SamplerUnits));
       unit = prog->SamplerUnits[sampler];
       target = prog->SamplerTargets[sampler];
       if (targetUsed[unit] != -1 && targetUsed[unit] != (int) target) {