[Mesa-stable] [PATCH 17/29] swrast: Fix a bug with Multiple Render Targets.

[Emil Velikov]

See https://code.google.com/p/chromium/issues/detail?id=308715 for more
info.

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

Patch authored by hubbe at chromium.org, as per
https://android.googlesource.com/platform/external/chromium_org/third_party/mesa/src/+/009d829daee69743d77f4eaea702633a2fd5d7c6%5E%21/

Cc: Stéphane Marchesin <marcheu at chromium.org>
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
---
 src/mesa/swrast/s_span.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 10aa33c..5e95b23 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1330,8 +1330,8 @@ _swrast_write_rgba_span( struct gl_context *ctx, SWspan *span)
                    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) {
-- 
2.0.2