Mesa (master): mesa: fix assertion in _mesa_drawbuffers()
Brian Paul
brianp at kemper.freedesktop.org
Mon Aug 11 15:47:09 UTC 2014
Module: Mesa
Branch: master
Commit: 39b40ad144f5f587e505b45048e33a03641ba857
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=39b40ad144f5f587e505b45048e33a03641ba857
Author: Brian Paul <brianp at vmware.com>
Date: Fri Aug 8 15:01:50 2014 -0600
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 at lists.freedesktop.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/main/buffers.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index b13a7af..6b4fac9 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;
More information about the mesa-commit
mailing list