From: Henri Verbeet <hverbeet@gmail.com>
Date: Thu, 7 Apr 2011 21:48:28 +0000 (+0200)
Subject: mesa: Also update the color draw buffer if it's explicitly set to GL_NONE.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=158d42c8b08411d761fa40299f3f29027ad3905f;p=mesa.git

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@gmail.com>
---

diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 5c37f3d1a86..96ee1ace728 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) {