projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
55821d0
)
check for null program ptrs in _mesa_uniform()
author
Brian
<brian@yutani.localnet.net>
Wed, 7 Mar 2007 15:04:06 +0000
(08:04 -0700)
committer
Brian
<brian@yutani.localnet.net>
Wed, 7 Mar 2007 15:04:06 +0000
(08:04 -0700)
src/mesa/shader/shader_api.c
patch
|
blob
|
history
diff --git
a/src/mesa/shader/shader_api.c
b/src/mesa/shader/shader_api.c
index
48ba8b6
..
924c9d5
100644
(file)
--- a/
src/mesa/shader/shader_api.c
+++ b/
src/mesa/shader/shader_api.c
@@
-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);
}
}