commit f2632212ad7735c659331b65d3bfe14aef0faccb
author Brian Paul <brian.paul@tungstengraphics.com> Fri May 16 10:49:44 2008 -0600
committer Brian Paul <brian.paul@tungstengraphics.com> Fri May 16 15:16:06 2008 -0600
tree 2cf36bb5d6438ab6e644b677ac11f50fd11dabd1
parent e291cf6f8d3423c2f1e123ec2a42f0568019da80

silence warning, new assertion

src/mesa/shader/shader_api.c

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 08fa9a7..61d51c3 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -942,7 +942,7 @@
    if (shProg) {
       if (location < shProg->Uniforms->NumUniforms) {
          GLint progPos, i;
-         const struct gl_program *prog;
+         const struct gl_program *prog = NULL;
 
          progPos = shProg->Uniforms->Uniforms[location].VertPos;
          if (progPos >= 0) {
@@ -955,8 +955,11 @@
             }
          }
 
-         for (i = 0; i < prog->Parameters->Parameters[progPos].Size; i++) {
-            params[i] = prog->Parameters->ParameterValues[progPos][i];
+         ASSERT(prog);
+         if (prog) {
+            for (i = 0; i < prog->Parameters->Parameters[progPos].Size; i++) {
+               params[i] = prog->Parameters->ParameterValues[progPos][i];
+            }
          }
       }
       else {