fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-10 12:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: Use MAX2 to calculate maximum uniform element

Browse source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick 2014-08-01 18:39:21 -07:00
parent 411abcb237
commit 8f81f4e185
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/main/uniform_query.cpp
View file

@ -282,9 +282,7 @@ validate_uniform_parameters(struct gl_context *ctx,
* If not an array, check that array_index is zero.
* array_index is unsigned so no need to check for less than zero.
*/
unsigned limit = uni->array_elements;
if (limit == 0)
limit = 1;
const unsigned limit = MAX2(uni->array_elements, 1);
if (*array_index >= limit) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)",
caller, location);