diff options
| author | Kenneth Graunke <[email protected]> | 2012-12-18 12:32:29 -0800 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2013-01-04 17:25:29 -0800 |
| commit | 555245eeb7c6d1f662bc4f07c754ecf4a121a5d5 (patch) | |
| tree | 02b7cc96f4c0d07a84698c5b7aa29888401a50eb | |
| parent | e76ddbf0f84b7b7b50bc819aa5fa592b874fbff5 (diff) | |
Fix-up for "mesa: Rework crazy error code rules in glDrawBuffers()."
This should be squashed into the earlier patch when mailing it out for
review or merging it to master.
The error path was missing a "return" like all the other error paths.
Also, we may as well call it glDrawBuffers in the error message since
the ARB suffix doesn't exist in ES 3.
| -rw-r--r-- | src/mesa/main/buffers.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c index 79aa69b678e..3dcd46f0180 100644 --- a/src/mesa/main/buffers.c +++ b/src/mesa/main/buffers.c @@ -369,7 +369,8 @@ _mesa_DrawBuffers(GLsizei n, const GLenum *buffers) if (_mesa_is_gles3(ctx) && _mesa_is_user_fbo(ctx->DrawBuffer) && buffers[output] != GL_NONE && buffers[output] != GL_COLOR_ATTACHMENT0 + output) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffersARB(buffer)"); + _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffers(buffer)"); + return; } /* From the OpenGL 3.0 specification, page 258: |