Mesa (master): mesa: simplify a conditional in detach_shader()

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jan  2 16:56:12 2015 -0700

mesa: simplify a conditional in detach_shader()

Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/main/shaderapi.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index e38189c..e5e9cab 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -431,9 +431,7 @@ detach_shader(struct gl_context *ctx, GLuint program, GLuint shader)
    /* not found */
    {
       GLenum err;
-      if (is_shader(ctx, shader))
-         err = GL_INVALID_OPERATION;
-      else if (is_program(ctx, shader))
+      if (is_shader(ctx, shader) || is_program(ctx, shader))
          err = GL_INVALID_OPERATION;
       else
          err = GL_INVALID_VALUE;