diff options
| author | Brian Paul <brianp@vmware.com> | 2015-01-02 16:56:12 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2015-01-05 13:50:54 -0700 |
| commit | d0fa559e49799a13e56b65aa3c389e70926455c9 (patch) | |
| tree | c669bf18bee5029b28ce16eae926d052aadac717 /src/mesa/main/shaderapi.c | |
| parent | c0a445037bf3453c60dd060894539e31223fb821 (diff) | |
| download | external_mesa3d-d0fa559e49799a13e56b65aa3c389e70926455c9.zip external_mesa3d-d0fa559e49799a13e56b65aa3c389e70926455c9.tar.gz external_mesa3d-d0fa559e49799a13e56b65aa3c389e70926455c9.tar.bz2 | |
mesa: simplify a conditional in detach_shader()
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/main/shaderapi.c')
| -rw-r--r-- | src/mesa/main/shaderapi.c | 4 |
1 files changed, 1 insertions, 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; |