Module: Mesa Branch: gles3 Commit: edaa34f7a4fb9892ad3c8b04939a7558dc63f0e0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=edaa34f7a4fb9892ad3c8b04939a7558dc63f0e0
Author: Kenneth Graunke <[email protected]> Date: Tue Dec 18 12:32:29 2012 -0800 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. --- 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 c2a02c0..aa9b9f0 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: _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
