FramebufferD3D: Only make sure that enabled attachments are not the same.

src/libANGLE/Framebuffer.cpp

@@ -67,6 +67,33 @@ const std::string &FramebufferState::getLabel()
     return mLabel;
 }
 
+const FramebufferAttachment *FramebufferState::getAttachment(GLenum attachment) const
+{
+    if (attachment >= GL_COLOR_ATTACHMENT0 && attachment <= GL_COLOR_ATTACHMENT15)
+    {
+        return getColorAttachment(attachment - GL_COLOR_ATTACHMENT0);
+    }
+
+    switch (attachment)
+    {
+        case GL_COLOR:
+        case GL_BACK:
+            return getColorAttachment(0);
+        case GL_DEPTH:
+        case GL_DEPTH_ATTACHMENT:
+            return getDepthAttachment();
+        case GL_STENCIL:
+        case GL_STENCIL_ATTACHMENT:
+            return getStencilAttachment();
+        case GL_DEPTH_STENCIL:
+        case GL_DEPTH_STENCIL_ATTACHMENT:
+            return getDepthStencilAttachment();
+        default:
+            UNREACHABLE();
+            return nullptr;
+    }
+}
+
 const FramebufferAttachment *FramebufferState::getReadAttachment() const
 {
     ASSERT(mReadBufferState == GL_BACK || (mReadBufferState >= GL_COLOR_ATTACHMENT0 && mReadBufferState <= GL_COLOR_ATTACHMENT15));
@@ -169,6 +196,28 @@ bool FramebufferState::attachmentsHaveSameDimensions() const
     return !hasMismatchedSize(mStencilAttachment);
 }
 
+const gl::FramebufferAttachment *FramebufferState::getDrawBuffer(size_t drawBufferIdx) const
+{
+    ASSERT(drawBufferIdx < mDrawBufferStates.size());
+    if (mDrawBufferStates[drawBufferIdx] != GL_NONE)
+    {
+        // ES3 spec: "If the GL is bound to a draw framebuffer object, the ith buffer listed in bufs
+        // must be COLOR_ATTACHMENTi or NONE"
+        ASSERT(mDrawBufferStates[drawBufferIdx] == GL_COLOR_ATTACHMENT0 + drawBufferIdx ||
+               (drawBufferIdx == 0 && mDrawBufferStates[drawBufferIdx] == GL_BACK));
+        return getAttachment(mDrawBufferStates[drawBufferIdx]);
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+
+size_t FramebufferState::getDrawBufferCount() const
+{
+    return mDrawBufferStates.size();
+}
+
 Framebuffer::Framebuffer(const Caps &caps, rx::GLImplFactory *factory, GLuint id)
     : mState(caps),
       mImpl(factory->createFramebuffer(mState)),
@@ -295,31 +344,7 @@ const FramebufferAttachment *Framebuffer::getFirstColorbuffer() const
 
 const FramebufferAttachment *Framebuffer::getAttachment(GLenum attachment) const
 {
-    if (attachment >= GL_COLOR_ATTACHMENT0 && attachment <= GL_COLOR_ATTACHMENT15)
-    {
-        return mState.getColorAttachment(attachment - GL_COLOR_ATTACHMENT0);
-    }
-    else
-    {
-        switch (attachment)
-        {
-          case GL_COLOR:
-          case GL_BACK:
-              return mState.getColorAttachment(0);
-          case GL_DEPTH:
-          case GL_DEPTH_ATTACHMENT:
-              return mState.getDepthAttachment();
-          case GL_STENCIL:
-          case GL_STENCIL_ATTACHMENT:
-              return mState.getStencilAttachment();
-          case GL_DEPTH_STENCIL:
-          case GL_DEPTH_STENCIL_ATTACHMENT:
-            return getDepthStencilBuffer();
-          default:
-            UNREACHABLE();
-            return nullptr;
-        }
-    }
+    return mState.getAttachment(attachment);
 }
 
 size_t Framebuffer::getDrawbufferStateCount() const
@@ -350,19 +375,7 @@ void Framebuffer::setDrawBuffers(size_t count, const GLenum *buffers)
 
 const FramebufferAttachment *Framebuffer::getDrawBuffer(size_t drawBuffer) const
 {
-    ASSERT(drawBuffer < mState.mDrawBufferStates.size());
-    if (mState.mDrawBufferStates[drawBuffer] != GL_NONE)
-    {
-        // ES3 spec: "If the GL is bound to a draw framebuffer object, the ith buffer listed in bufs
-        // must be COLOR_ATTACHMENTi or NONE"
-        ASSERT(mState.mDrawBufferStates[drawBuffer] == GL_COLOR_ATTACHMENT0 + drawBuffer ||
-               (drawBuffer == 0 && mState.mDrawBufferStates[drawBuffer] == GL_BACK));
-        return getAttachment(mState.mDrawBufferStates[drawBuffer]);
-    }
-    else
-    {
-        return nullptr;
-    }
+    return mState.getDrawBuffer(drawBuffer);
 }
 
 bool Framebuffer::hasEnabledDrawBuffer() const

src/libANGLE/Framebuffer.h

@@ -58,6 +58,7 @@ class FramebufferState final : angle::NonCopyable
 
     const std::string &getLabel();
 
+    const FramebufferAttachment *getAttachment(GLenum attachment) const;
     const FramebufferAttachment *getReadAttachment() const;
     const FramebufferAttachment *getFirstColorAttachment() const;
     const FramebufferAttachment *getDepthOrStencilAttachment() const;
@@ -75,6 +76,9 @@ class FramebufferState final : angle::NonCopyable
 
     bool attachmentsHaveSameDimensions() const;
 
+    const FramebufferAttachment *getDrawBuffer(size_t drawBufferIdx) const;
+    size_t getDrawBufferCount() const;
+
   private:
     friend class Framebuffer;
 

src/libANGLE/renderer/d3d/FramebufferD3D.cpp

@@ -309,22 +309,31 @@ bool FramebufferD3D::checkStatus() const
         return false;
     }
 
-    // D3D11 does not allow for overlapping RenderTargetViews, so ensure uniqueness
-    const auto &colorAttachments = mState.getColorAttachments();
-    for (size_t colorAttachment = 0; colorAttachment < colorAttachments.size(); colorAttachment++)
+    // D3D11 does not allow for overlapping RenderTargetViews, so ensure uniqueness by checking the
+    // enabled draw buffers
+    for (size_t firstDrawBufferIdx = 0; firstDrawBufferIdx < mState.getDrawBufferCount();
+         firstDrawBufferIdx++)
     {
-        const gl::FramebufferAttachment &attachment = colorAttachments[colorAttachment];
-        if (attachment.isAttached())
+        const gl::FramebufferAttachment *firstAttachment = mState.getDrawBuffer(firstDrawBufferIdx);
+        if (firstAttachment == nullptr)
+        {
+            continue;
+        }
+
+        for (size_t secondDrawBufferIdx = firstDrawBufferIdx + 1;
+             secondDrawBufferIdx < mState.getDrawBufferCount(); secondDrawBufferIdx++)
         {
-            for (size_t prevColorAttachment = 0; prevColorAttachment < colorAttachment; prevColorAttachment++)
+            const gl::FramebufferAttachment *secondAttachment =
+                mState.getDrawBuffer(secondDrawBufferIdx);
+            if (secondAttachment == nullptr)
+            {
+                continue;
+            }
+
+            if (firstAttachment->id() == secondAttachment->id() &&
+                firstAttachment->type() == secondAttachment->type())
             {
-                const gl::FramebufferAttachment &prevAttachment = colorAttachments[prevColorAttachment];
-                if (prevAttachment.isAttached() &&
-                    (attachment.id() == prevAttachment.id() &&
-                     attachment.type() == prevAttachment.type()))
-                {
-                    return false;
-                }
+                return false;
             }
         }
     }