Add set*Attachment methods to FramebufferImpl.

src/libANGLE/Framebuffer.cpp

@@ -195,6 +195,18 @@ void Framebuffer::setDrawBuffers(size_t count, const GLenum *buffers)
     ASSERT(count <= ArraySize(mDrawBufferStates));
     std::copy(buffers, buffers + count, mDrawBufferStates);
     std::fill(mDrawBufferStates + count, mDrawBufferStates + ArraySize(mDrawBufferStates), GL_NONE);
+    mImpl->setDrawBuffers(count, buffers);
+}
+
+GLenum Framebuffer::getReadBufferState() const
+{
+    return mReadBufferState;
+}
+
+void Framebuffer::setReadBuffer(GLenum buffer)
+{
+    mReadBufferState = buffer;
+    mImpl->setReadBuffer(buffer);
 }
 
 bool Framebuffer::isEnabledColorAttachment(unsigned int colorAttachment) const
@@ -536,21 +548,25 @@ void Framebuffer::setAttachment(GLenum attachment, FramebufferAttachment *attach
         size_t colorAttachment = attachment - GL_COLOR_ATTACHMENT0;
         SafeDelete(mColorbuffers[colorAttachment]);
         mColorbuffers[colorAttachment] = attachmentObj;
+        mImpl->setColorAttachment(colorAttachment, attachmentObj);
     }
     else if (attachment == GL_BACK)
     {
         SafeDelete(mColorbuffers[0]);
         mColorbuffers[0] = attachmentObj;
+        mImpl->setColorAttachment(0, attachmentObj);
     }
     else if (attachment == GL_DEPTH_ATTACHMENT || attachment == GL_DEPTH)
     {
         SafeDelete(mDepthbuffer);
         mDepthbuffer = attachmentObj;
+        mImpl->setDepthttachment(attachmentObj);
     }
     else if (attachment == GL_STENCIL_ATTACHMENT || attachment == GL_STENCIL)
     {
         SafeDelete(mStencilbuffer);
         mStencilbuffer = attachmentObj;
+        mImpl->setStencilAttachment(attachmentObj);
     }
     else if (attachment == GL_DEPTH_STENCIL_ATTACHMENT || attachment == GL_DEPTH_STENCIL)
     {
@@ -561,6 +577,7 @@ void Framebuffer::setAttachment(GLenum attachment, FramebufferAttachment *attach
         if (attachmentObj && attachmentObj->getDepthSize() > 0 && attachmentObj->getStencilSize() > 0)
         {
             mDepthbuffer = attachmentObj;
+            mImpl->setDepthttachment(attachmentObj);
 
             // Make a new attachment object to ensure we do not double-delete
             // See angle issue 686
@@ -568,10 +585,12 @@ void Framebuffer::setAttachment(GLenum attachment, FramebufferAttachment *attach
             {
                 mStencilbuffer = new TextureAttachment(GL_DEPTH_STENCIL_ATTACHMENT, attachmentObj->getTexture(),
                                                        *attachmentObj->getTextureImageIndex());
+                mImpl->setStencilAttachment(mStencilbuffer);
             }
             else if (attachmentObj->type() == GL_RENDERBUFFER)
             {
                 mStencilbuffer = new RenderbufferAttachment(GL_DEPTH_STENCIL_ATTACHMENT, attachmentObj->getRenderbuffer());
+                mImpl->setStencilAttachment(mStencilbuffer);
             }
             else
             {
@@ -601,8 +620,10 @@ DefaultFramebuffer::DefaultFramebuffer(rx::FramebufferImpl *impl, rx::DefaultAtt
         setAttachment(GL_STENCIL, new DefaultAttachment(GL_STENCIL, stencilAttachment));
     }
 
-    mDrawBufferStates[0] = GL_BACK;
-    mReadBufferState = GL_BACK;
+    GLenum drawBufferState = GL_BACK;
+    setDrawBuffers(1, &drawBufferState);
+
+    setReadBuffer(GL_BACK);
 }
 
 }

src/libANGLE/Framebuffer.h

@@ -72,6 +72,9 @@ class Framebuffer
     GLenum getDrawBufferState(unsigned int colorAttachment) const;
     void setDrawBuffers(size_t count, const GLenum *buffers);
 
+    GLenum getReadBufferState() const;
+    void setReadBuffer(GLenum buffer);
+
     bool isEnabledColorAttachment(unsigned int colorAttachment) const;
     bool hasEnabledColorAttachment() const;
     bool hasStencil() const;

src/libANGLE/renderer/FramebufferImpl.h

@@ -15,6 +15,7 @@
 
 namespace gl
 {
+class FramebufferAttachment;
 struct Rectangle;
 }
 
@@ -38,6 +39,14 @@ class FramebufferImpl
   public:
     virtual ~FramebufferImpl() {};
 
+    virtual void setColorAttachment(size_t index, const gl::FramebufferAttachment *attachment) = 0;
+    virtual void setDepthttachment(const gl::FramebufferAttachment *attachment) = 0;
+    virtual void setStencilAttachment(const gl::FramebufferAttachment *attachment) = 0;
+    virtual void setDepthStencilAttachment(const gl::FramebufferAttachment *attachment) = 0;
+
+    virtual void setDrawBuffers(size_t count, const GLenum *buffers) = 0;
+    virtual void setReadBuffer(GLenum buffer) = 0;
+
     virtual gl::Error invalidate(size_t count, const GLenum *attachments) = 0;
     virtual gl::Error invalidateSub(size_t count, const GLenum *attachments, const gl::Rectangle &area) = 0;
 };

src/libANGLE/renderer/d3d/FramebufferD3D.cpp

@@ -74,6 +74,30 @@ FramebufferD3D::~FramebufferD3D()
 {
 }
 
+void FramebufferD3D::setColorAttachment(size_t index, const gl::FramebufferAttachment *attachment)
+{
+}
+
+void FramebufferD3D::setDepthttachment(const gl::FramebufferAttachment *attachment)
+{
+}
+
+void FramebufferD3D::setStencilAttachment(const gl::FramebufferAttachment *attachment)
+{
+}
+
+void FramebufferD3D::setDepthStencilAttachment(const gl::FramebufferAttachment *attachment)
+{
+}
+
+void FramebufferD3D::setDrawBuffers(size_t count, const GLenum *buffers)
+{
+}
+
+void FramebufferD3D::setReadBuffer(GLenum buffer)
+{
+}
+
 gl::Error FramebufferD3D::invalidate(size_t, const GLenum *)
 {
     // No-op in D3D

src/libANGLE/renderer/d3d/FramebufferD3D.h

@@ -47,6 +47,14 @@ class FramebufferD3D : public FramebufferImpl
     FramebufferD3D(RendererD3D *renderer);
     virtual ~FramebufferD3D();
 
+    void setColorAttachment(size_t index, const gl::FramebufferAttachment *attachment) override;
+    void setDepthttachment(const gl::FramebufferAttachment *attachment) override;
+    void setStencilAttachment(const gl::FramebufferAttachment *attachment) override;
+    void setDepthStencilAttachment(const gl::FramebufferAttachment *attachment) override;
+
+    void setDrawBuffers(size_t count, const GLenum *buffers) override;
+    void setReadBuffer(GLenum buffer) override;
+
     gl::Error invalidate(size_t count, const GLenum *attachments) override;
     gl::Error invalidateSub(size_t count, const GLenum *attachments, const gl::Rectangle &area) override;