diff options
| author | Paul Berry <[email protected]> | 2014-01-10 06:35:09 -0800 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2015-03-19 13:38:51 -0700 |
| commit | 57b2652322c833f9007203488526571023279cfc (patch) | |
| tree | 7234c765d1860b8abd2b72703fd80cd428e9d99d /src | |
| parent | 46c35c61e9c5c1b56fdd9fcd4eb45591dd16d21d (diff) | |
main: Clean up a strange construction in use_shader_program().
Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/shaderapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 3ea76af25d5..6e736847c3a 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -1035,7 +1035,7 @@ use_shader_program(struct gl_context *ctx, GLenum type, gl_shader_stage stage = _mesa_shader_enum_to_shader_stage(type); target = &shTarget->CurrentProgram[stage]; - if ((shProg == NULL) || (shProg->_LinkedShaders[stage] == NULL)) + if ((shProg != NULL) && (shProg->_LinkedShaders[stage] == NULL)) shProg = NULL; if (*target != shProg) { |