Mesa (master): mesa: Use the Elements macro for the sampler index assert in validate_samplers() .
Henri Verbeet
hverbeet at kemper.freedesktop.org
Thu Jul 7 18:31:06 UTC 2011
Module: Mesa
Branch: master
Commit: 47441956284b3e22df2ee8500667617d2880bfc8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=47441956284b3e22df2ee8500667617d2880bfc8
Author: Henri Verbeet <hverbeet at gmail.com>
Date: Mon Jul 4 00:57:42 2011 +0200
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 at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/main/shaderapi.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index cb02e43..8df25c3 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) {
More information about the mesa-commit
mailing list