Mesa (master): main: Clean up a strange construction in use_shader_program ().

[Jordan Justen]

Module: Mesa
Branch: master
Commit: 57b2652322c833f9007203488526571023279cfc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=57b2652322c833f9007203488526571023279cfc

Author: Paul Berry <stereotype441 at gmail.com>
Date:   Fri Jan 10 06:35:09 2014 -0800

main: Clean up a strange construction in use_shader_program().

Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

---

 src/mesa/main/shaderapi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 3ea76af..6e73684 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) {