commit 009d829daee69743d77f4eaea702633a2fd5d7c6
author hubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Oct 17 23:12:30 2013 +0000
committer hubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Oct 17 23:12:30 2013 +0000
tree 6ff35f378a7580d3abf5975da3c87abcdfd78376
parent 2a3406721cd61852bebd502c7a907cf07b7be731

Fix a bug with Multiple Render Targets.
See https://code.google.com/p/chromium/issues/detail?id=308715 for more info.

Review URL: https://codereview.chromium.org/27740005

git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@229247 0039d316-1c4b-4281-b951-d872f2087c98

src/mesa/swrast/s_span.c

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index ef51479..57058ab 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1330,8 +1330,8 @@
                    colorType == GL_FLOAT);
 
             /* set span->array->rgba to colors for renderbuffer's datatype */
-            if (span->array->ChanType != colorType) {
-               convert_color_type(span, colorType, 0);
+            if (span->array->ChanType != colorType || multiFragOutputs) {
+               convert_color_type(span, colorType, buf);
             }
             else {
                if (span->array->ChanType == GL_UNSIGNED_BYTE) {