Mesa (master): mesa: Also update the color draw buffer if it' s explicitly set to GL_NONE.

[Henri Verbeet]

Module: Mesa
Branch: master
Commit: 158d42c8b08411d761fa40299f3f29027ad3905f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=158d42c8b08411d761fa40299f3f29027ad3905f

Author: Henri Verbeet <hverbeet at gmail.com>
Date:   Thu Apr  7 23:48:28 2011 +0200

mesa: Also update the color draw buffer if it's explicitly set to GL_NONE.

NOTE: This is a candidate for the 7.10 branch.

Signed-off-by: Henri Verbeet <hverbeet at gmail.com>

---

 src/mesa/main/buffers.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 5c37f3d..96ee1ac 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -407,7 +407,6 @@ _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
                fb->_ColorDrawBufferIndexes[buf] = bufIndex;
                newState = GL_TRUE;
             }
-            fb->ColorDrawBuffer[buf] = buffers[buf];
             count = buf + 1;
          }
          else {
@@ -416,6 +415,7 @@ _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
                newState = GL_TRUE;
             }
          }
+         fb->ColorDrawBuffer[buf] = buffers[buf];
       }
       /* set remaining outputs to -1 (GL_NONE) */
       while (buf < ctx->Const.MaxDrawBuffers) {