diff options
| author | Brian Paul <brianp@vmware.com> | 2014-08-08 15:01:50 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2014-08-11 09:44:51 -0600 |
| commit | 39b40ad144f5f587e505b45048e33a03641ba857 (patch) | |
| tree | 046e680534c5d120ae7d510949710c014bbeab48 | |
| parent | dd8f15a5533cf2847c8039b626cdc7ee18b1eccf (diff) | |
mesa: fix assertion in _mesa_drawbuffers()
Fixes failed assertion when _mesa_update_draw_buffers() was called
with GL_DRAW_BUFFER == GL_FRONT_AND_BACK. The piglit gl30basic hit
this.
Cc: "10.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
| -rw-r--r-- | src/mesa/main/buffers.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c index b13a7af65a..6b4fac9f58 100644 --- a/src/mesa/main/buffers.c +++ b/src/mesa/main/buffers.c @@ -494,10 +494,11 @@ _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers, } /* - * If n==1, destMask[0] may have up to four bits set. + * destMask[0] may have up to four bits set + * (ex: glDrawBuffer(GL_FRONT_AND_BACK)). * Otherwise, destMask[x] can only have one bit set. */ - if (n == 1) { + if (_mesa_bitcount(destMask[0]) > 1) { GLuint count = 0, destMask0 = destMask[0]; while (destMask0) { GLint bufIndex = ffs(destMask0) - 1; |