From 61bfed2d0998065bdb20f3f67e1591f8d5005ba6 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 24 Jun 2013 22:50:30 -0700 Subject: [PATCH] glsl: Fix gl_shader_program::UniformLocationBaseScale assert. commit 26d86d26f9f972b19c7040bdb1b1daf48537ef3e added gl_shader_program::UniformLocationBaseScale. According to the code comments in that commit, UniformLocationBaseScale "must be >=1". UniformLocationBaseScale is of type unsigned. Coverity reported a "Macro compares unsigned to 0" defect as well. Signed-off-by: Vinson Lee Reviewed-by: Ian Romanick --- src/mesa/main/uniforms.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 14fe26d5fde..92239176e94 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -272,7 +272,7 @@ static inline GLint _mesa_uniform_merge_location_offset(const struct gl_shader_program *prog, unsigned base_location, unsigned offset) { - assert(prog->UniformLocationBaseScale >= 0); + assert(prog->UniformLocationBaseScale >= 1); assert(offset < prog->UniformLocationBaseScale); return (base_location * prog->UniformLocationBaseScale) + offset; } -- 2.30.2