Mesa (master): mesa: add asserts in load_texunit_bumpmap

Brian Paul brianp at kemper.freedesktop.org
Wed Dec 18 16:42:58 UTC 2013


Module: Mesa
Branch: master
Commit: 28b552bf6b7a0a79187db2887b25cbfa42cbf98b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=28b552bf6b7a0a79187db2887b25cbfa42cbf98b

Author: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Date:   Wed Dec 18 06:58:00 2013 -0700

mesa: add asserts in load_texunit_bumpmap

In load_texunit_bumpmap tc_array is asserted so lets assert
rot_mat_0 and rot_mat_1 also which are coming from same path.

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/main/ff_fragment_shader.cpp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index ad004ac..16715f6 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -1096,7 +1096,9 @@ load_texunit_bumpmap( texenv_fragment_program *p, GLuint unit )
    ir_variable *rot_mat_0, *rot_mat_1;
 
    rot_mat_0 = p->shader->symbols->get_variable("gl_BumpRotMatrix0MESA");
+   assert(rot_mat_0);
    rot_mat_1 = p->shader->symbols->get_variable("gl_BumpRotMatrix1MESA");
+   assert(rot_mat_1);
 
    ir_variable *tc_array = p->shader->symbols->get_variable("gl_TexCoord");
    assert(tc_array);




More information about the mesa-commit mailing list