commit a15472a3e0f8a77f44737e19a8b2e8bc58b4445c
author Geoff Lang <geofflang@chromium.org> Tue Aug 11 11:48:03 2015 -0400
committer Geoff Lang <geofflang@chromium.org> Wed Jan 27 16:17:03 2016 +0000
tree c454bc4ff188752b235b8da03389efda60d33bf0
parent 722b0d3134a50ee60d4594ac7ef7493c725a41f4

Fix bugs with drawbuffer state.

 * IsAttachmentEnabled was checking the wrong draw buffer state.  Instead
   of checking that drawbuffer[colorAttachment] is in use, it should have
   been scanning for a drawbuffer state that points to colorAttachment.
 * Allow for maxDrawBuffer != maxColorAttachments.  Tested by the GL
   backend on some systems that don't have the draw buffers extension.

Fixed by updating the helpers and adding a new getDrawBuffer helper.

BUG=angleproject:1121

Change-Id: Idd1b0a9ec4a3f944d332c708364408bf5d59e1fd
Reviewed-on: https://chromium-review.googlesource.com/292740
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Tryjob-Request: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/validationES2.cpp

diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index 6ec11d9..f496449 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -1602,15 +1602,13 @@
                 return false;
             }
 
-            for (size_t colorAttachment = 0;
-                 colorAttachment < drawFramebuffer->getNumColorBuffers(); ++colorAttachment)
+            for (size_t drawbufferIdx = 0;
+                 drawbufferIdx < drawFramebuffer->getDrawbufferStateCount(); ++drawbufferIdx)
             {
-                if (drawFramebuffer->isEnabledColorAttachment(colorAttachment))
+                const FramebufferAttachment *attachment =
+                    drawFramebuffer->getDrawBuffer(drawbufferIdx);
+                if (attachment)
                 {
-                    const FramebufferAttachment *attachment =
-                        drawFramebuffer->getColorbuffer(colorAttachment);
-                    ASSERT(attachment);
-
                     if (!(attachment->type() == GL_TEXTURE &&
                           attachment->getTextureImageIndex().type == GL_TEXTURE_2D) &&
                         attachment->type() != GL_RENDERBUFFER &&