commit cec81eef313cea94ffdbd8e62c18ff8d3f651dbd
author Brian <brian@yutani.localnet.net> Wed Mar 07 08:04:06 2007 -0700
committer Brian <brian@yutani.localnet.net> Wed Mar 07 08:04:06 2007 -0700
tree 9cdc1fda7e9c54cede143c48dc9b30f80bb85b9b
parent 55821d021d87fba6551509f5612ee16d9ece977f

check for null program ptrs in _mesa_uniform()

src/mesa/shader/shader_api.c

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 48ba8b6..924c9d5 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -961,8 +961,10 @@
    }
 
    if (shProg->Uniforms->Parameters[location].Type == PROGRAM_SAMPLER) {
-      _slang_resolve_samplers(shProg, &shProg->VertexProgram->Base);
-      _slang_resolve_samplers(shProg, &shProg->FragmentProgram->Base);
+      if (shProg->VertexProgram)
+         _slang_resolve_samplers(shProg, &shProg->VertexProgram->Base);
+      if (shProg->FragmentProgram)
+         _slang_resolve_samplers(shProg, &shProg->FragmentProgram->Base);
       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
    }
 }