check for null program ptrs in _mesa_uniform()

This commit is contained in:
Brian 2007-03-07 08:04:06 -07:00
parent 55821d021d
commit cec81eef31

View file

@ -961,8 +961,10 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
}
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);
}
}