diff options
| author | Henri Verbeet <[email protected]> | 2011-07-04 00:57:42 +0200 |
|---|---|---|
| committer | Henri Verbeet <[email protected]> | 2011-07-07 20:30:13 +0200 |
| commit | 47441956284b3e22df2ee8500667617d2880bfc8 (patch) | |
| tree | ae9f45dda0e42c0d96fb1fa76dba85f2172137e6 | |
| parent | 86adc2b29effb573c18eb0de7016cef605ab1edc (diff) | |
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 <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | 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 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) { |