mesa: simplify a conditional in detach_shader()

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

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index e38189cda41b578538a9e89ea534b0c48977c2d8..e5e9cabc3edc758a045dfb37118718c39a6193c1 100644 (file)
--- 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;