Module: Mesa Branch: master Commit: 61bfed2d0998065bdb20f3f67e1591f8d5005ba6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=61bfed2d0998065bdb20f3f67e1591f8d5005ba6
Author: Vinson Lee <[email protected]> Date: Mon Jun 24 22:50:30 2013 -0700 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 <[email protected]> Reviewed-by: Ian Romanick <[email protected]> --- src/mesa/main/uniforms.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 14fe26d..9223917 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; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
