From: Vinson Lee <vlee@freedesktop.org>
Date: Tue, 25 Jun 2013 05:50:30 +0000 (-0700)
Subject: glsl: Fix gl_shader_program::UniformLocationBaseScale assert.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=61bfed2d0998065bdb20f3f67e1591f8d5005ba6;p=mesa.git

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 <vlee@freedesktop.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

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;
 }