Revert "Store value types for FBO attachments."

src/libANGLE/Framebuffer.h

@@ -15,7 +15,6 @@
 #include "common/angleutils.h"
 #include "libANGLE/Constants.h"
 #include "libANGLE/Error.h"
-#include "libANGLE/FramebufferAttachment.h"
 #include "libANGLE/RefCountObject.h"
 
 namespace rx
@@ -33,6 +32,7 @@ class Surface;
 
 namespace gl
 {
+class FramebufferAttachment;
 class Renderbuffer;
 class State;
 class Texture;
@@ -43,6 +43,8 @@ struct Extensions;
 struct ImageIndex;
 struct Rectangle;
 
+typedef std::vector<const FramebufferAttachment *> AttachmentList;
+
 class Framebuffer
 {
   public:
@@ -62,7 +64,7 @@ class Framebuffer
         const FramebufferAttachment *getDepthStencilAttachment() const;
 
         const std::vector<GLenum> &getDrawBufferStates() const { return mDrawBufferStates; }
-        const std::vector<FramebufferAttachment> &getColorAttachments() const { return mColorAttachments; }
+        const std::vector<FramebufferAttachment *> &getColorAttachments() const { return mColorAttachments; }
 
       private:
         friend class Framebuffer;
@@ -71,9 +73,9 @@ class Framebuffer
         FramebufferAttachment *getStencilAttachment();
         FramebufferAttachment *getDepthStencilAttachment();
 
-        std::vector<FramebufferAttachment> mColorAttachments;
-        FramebufferAttachment mDepthAttachment;
-        FramebufferAttachment mStencilAttachment;
+        std::vector<FramebufferAttachment *> mColorAttachments;
+        FramebufferAttachment *mDepthAttachment;
+        FramebufferAttachment *mStencilAttachment;
 
         std::vector<GLenum> mDrawBufferStates;
         GLenum mReadBufferState;
@@ -87,11 +89,9 @@ class Framebuffer
 
     GLuint id() const { return mId; }
 
-    void setAttachment(GLenum type,
-                       GLenum binding,
-                       const ImageIndex &textureIndex,
-                       FramebufferAttachmentObject *resource);
-    void resetAttachment(GLenum binding);
+    void setTextureAttachment(GLenum attachment, Texture *texture, const ImageIndex &imageIndex);
+    void setRenderbufferAttachment(GLenum attachment, Renderbuffer *renderbuffer);
+    void setNULLAttachment(GLenum attachment);
 
     void detachTexture(GLuint texture);
     void detachRenderbuffer(GLuint renderbuffer);
@@ -109,6 +109,7 @@ class Framebuffer
     GLenum getReadColorbufferType() const;
     const FramebufferAttachment *getFirstColorbuffer() const;
 
+    FramebufferAttachment *getAttachment(GLenum attachment);
     const FramebufferAttachment *getAttachment(GLenum attachment) const;
 
     GLenum getDrawBufferState(unsigned int colorAttachment) const;
@@ -143,6 +144,7 @@ class Framebuffer
                GLbitfield mask, GLenum filter, const gl::Framebuffer *sourceFramebuffer);
 
   protected:
+    void setAttachment(GLenum attachment, FramebufferAttachment *attachmentObj);
     void detachResourceById(GLenum resourceType, GLuint resourceId);
 
     Data mData;

src/libANGLE/FramebufferAttachment.cpp

@@ -43,12 +43,6 @@ FramebufferAttachment::Target &FramebufferAttachment::Target::operator=(const Ta
 
 ////// FramebufferAttachment Implementation //////
 
-FramebufferAttachment::FramebufferAttachment()
-    : mType(GL_NONE),
-      mTarget(GL_NONE, ImageIndex::MakeInvalid())
-{
-}
-
 FramebufferAttachment::FramebufferAttachment(GLenum type,
                                              GLenum binding,
                                              const ImageIndex &textureIndex,
@@ -59,25 +53,6 @@ FramebufferAttachment::FramebufferAttachment(GLenum type,
     mResource.set(resource);
 }
 
-void FramebufferAttachment::detach()
-{
-    mType = GL_NONE;
-    mResource.set(nullptr);
-
-    // not technically necessary, could omit for performance
-    mTarget = Target(GL_NONE, ImageIndex::MakeInvalid());
-}
-
-void FramebufferAttachment::attach(GLenum type,
-                                   GLenum binding,
-                                   const ImageIndex &textureIndex,
-                                   FramebufferAttachmentObject *resource)
-{
-    mType = type;
-    mTarget = Target(binding, textureIndex);
-    mResource.set(resource);
-}
-
 FramebufferAttachment::~FramebufferAttachment()
 {
     mResource.set(nullptr);

src/libANGLE/FramebufferAttachment.h

@@ -35,8 +35,6 @@ class Texture;
 class FramebufferAttachment final : angle::NonCopyable
 {
   public:
-    FramebufferAttachment();
-
     FramebufferAttachment(GLenum type,
                           GLenum binding,
                           const ImageIndex &textureIndex,
@@ -64,12 +62,6 @@ class FramebufferAttachment final : angle::NonCopyable
         ImageIndex mTextureIndex;
     };
 
-    void detach();
-    void attach(GLenum type,
-                GLenum binding,
-                const ImageIndex &textureIndex,
-                FramebufferAttachmentObject *resource);
-
     // Helper methods
     GLuint getRedSize() const;
     GLuint getGreenSize() const;
@@ -97,7 +89,6 @@ class FramebufferAttachment final : angle::NonCopyable
     GLenum getInternalFormat() const;
     GLsizei getSamples() const;
     GLenum type() const { return mType; }
-    bool isAttached() const { return mType != GL_NONE; }
 
     Renderbuffer *getRenderbuffer() const;
     Texture *getTexture() const;

src/libANGLE/renderer/d3d/FramebufferD3D.cpp

@@ -324,15 +324,15 @@ GLenum FramebufferD3D::checkStatus() const
     const auto &colorAttachments = mData.getColorAttachments();
     for (size_t colorAttachment = 0; colorAttachment < colorAttachments.size(); colorAttachment++)
     {
-        const gl::FramebufferAttachment &attachment = colorAttachments[colorAttachment];
-        if (attachment.isAttached())
+        const gl::FramebufferAttachment *attachment = colorAttachments[colorAttachment];
+        if (attachment != nullptr)
         {
             for (size_t prevColorAttachment = 0; prevColorAttachment < colorAttachment; prevColorAttachment++)
             {
-                const gl::FramebufferAttachment &prevAttachment = colorAttachments[prevColorAttachment];
-                if (prevAttachment.isAttached() &&
-                    (attachment.id() == prevAttachment.id() &&
-                     attachment.type() == prevAttachment.type()))
+                const gl::FramebufferAttachment *prevAttachment = colorAttachments[prevColorAttachment];
+                if (prevAttachment != nullptr &&
+                    (attachment->id() == prevAttachment->id() &&
+                     attachment->type() == prevAttachment->type()))
                 {
                     return GL_FRAMEBUFFER_UNSUPPORTED;
                 }
@@ -355,16 +355,15 @@ const gl::AttachmentList &FramebufferD3D::getColorAttachmentsForRender(const Wor
 
     const auto &colorAttachments = mData.getColorAttachments();
     const auto &drawBufferStates = mData.getDrawBufferStates();
-
     for (size_t attachmentIndex = 0; attachmentIndex < colorAttachments.size(); ++attachmentIndex)
     {
         GLenum drawBufferState = drawBufferStates[attachmentIndex];
-        const gl::FramebufferAttachment &colorAttachment = colorAttachments[attachmentIndex];
+        const gl::FramebufferAttachment *colorAttachment = colorAttachments[attachmentIndex];
 
-        if (colorAttachment.isAttached() && drawBufferState != GL_NONE)
+        if (colorAttachment != nullptr && drawBufferState != GL_NONE)
         {
             ASSERT(drawBufferState == GL_BACK || drawBufferState == (GL_COLOR_ATTACHMENT0_EXT + attachmentIndex));
-            mColorAttachmentsForRender.push_back(&colorAttachment);
+            mColorAttachmentsForRender.push_back(colorAttachment);
         }
         else if (!workarounds.mrtPerfWorkaround)
         {

src/libANGLE/renderer/d3d/FramebufferD3D.h

@@ -19,9 +19,6 @@ namespace gl
 {
 class FramebufferAttachment;
 struct PixelPackState;
-
-typedef std::vector<const FramebufferAttachment *> AttachmentList;
-
 }
 
 namespace rx

src/libANGLE/renderer/d3d/d3d11/Clear11.cpp

@@ -253,27 +253,27 @@ gl::Error Clear11::clearFramebuffer(const ClearParameters &clearParams, const gl
 
     for (size_t colorAttachment = 0; colorAttachment < colorAttachments.size(); colorAttachment++)
     {
-        const gl::FramebufferAttachment &attachment = colorAttachments[colorAttachment];
-
         if (clearParams.clearColor[colorAttachment] &&
-            attachment.isAttached() &&
+            colorAttachments[colorAttachment] != nullptr &&
             drawBufferStates[colorAttachment] != GL_NONE)
         {
+            const gl::FramebufferAttachment *attachment = colorAttachments[colorAttachment];
+
             RenderTarget11 *renderTarget = NULL;
-            gl::Error error = d3d11::GetAttachmentRenderTarget(&attachment, &renderTarget);
+            gl::Error error = d3d11::GetAttachmentRenderTarget(attachment, &renderTarget);
             if (error.isError())
             {
                 return error;
             }
 
-            const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(attachment.getInternalFormat());
+            const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(attachment->getInternalFormat());
 
             if (clearParams.colorClearType == GL_FLOAT &&
                 !(formatInfo.componentType == GL_FLOAT || formatInfo.componentType == GL_UNSIGNED_NORMALIZED || formatInfo.componentType == GL_SIGNED_NORMALIZED))
             {
                 ERR("It is undefined behaviour to clear a render buffer which is not normalized fixed point or floating-"
                     "point to floating point values (color attachment %u has internal format 0x%X).", colorAttachment,
-                    attachment.getInternalFormat());
+                    attachment->getInternalFormat());
             }
 
             if ((formatInfo.redBits == 0 || !clearParams.colorMaskRed) &&

src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp

@@ -64,15 +64,12 @@ static gl::Error InvalidateAttachmentSwizzles(const gl::FramebufferAttachment *a
 
 gl::Error Framebuffer11::invalidateSwizzles() const
 {
-    for (const auto &colorAttachment : mData.getColorAttachments())
+    for (const auto *colorAttachment : mData.getColorAttachments())
     {
-        if (colorAttachment.isAttached())
+        gl::Error error = InvalidateAttachmentSwizzles(colorAttachment);
+        if (error.isError())
         {
-            gl::Error error = InvalidateAttachmentSwizzles(&colorAttachment);
-            if (error.isError())
-            {
-                return error;
-            }
+            return error;
         }
     }
 
@@ -188,7 +185,7 @@ gl::Error Framebuffer11::blit(const gl::Rectangle &sourceArea, const gl::Rectang
         const gl::FramebufferAttachment *readBuffer = sourceFramebuffer->getReadColorbuffer();
         ASSERT(readBuffer);
 
-        RenderTargetD3D *readRenderTarget = nullptr;
+        RenderTargetD3D *readRenderTarget = NULL;
         gl::Error error = GetAttachmentRenderTarget(readBuffer, &readRenderTarget);
         if (error.isError())
         {
@@ -198,16 +195,15 @@ gl::Error Framebuffer11::blit(const gl::Rectangle &sourceArea, const gl::Rectang
 
         const auto &colorAttachments = mData.getColorAttachments();
         const auto &drawBufferStates = mData.getDrawBufferStates();
-
         for (size_t colorAttachment = 0; colorAttachment < colorAttachments.size(); colorAttachment++)
         {
-            const gl::FramebufferAttachment &drawBuffer = colorAttachments[colorAttachment];
-
-            if (drawBuffer.isAttached() &&
+            if (colorAttachments[colorAttachment] != nullptr &&
                 drawBufferStates[colorAttachment] != GL_NONE)
             {
-                RenderTargetD3D *drawRenderTarget = nullptr;
-                error = GetAttachmentRenderTarget(&drawBuffer, &drawRenderTarget);
+                const gl::FramebufferAttachment *drawBuffer = colorAttachments[colorAttachment];
+
+                RenderTargetD3D *drawRenderTarget = NULL;
+                error = GetAttachmentRenderTarget(drawBuffer, &drawRenderTarget);
                 if (error.isError())
                 {
                     return error;

src/libANGLE/validationES.cpp

@@ -636,8 +636,8 @@ bool ValidateBlitFramebufferParameters(gl::Context *context, GLint srcX0, GLint
     {
         if (mask & masks[i])
         {
-            const gl::FramebufferAttachment *readBuffer = readFramebuffer->getAttachment(attachments[i]);
-            const gl::FramebufferAttachment *drawBuffer = drawFramebuffer->getAttachment(attachments[i]);
+            gl::FramebufferAttachment *readBuffer = readFramebuffer->getAttachment(attachments[i]);
+            gl::FramebufferAttachment *drawBuffer = drawFramebuffer->getAttachment(attachments[i]);
 
             if (readBuffer && drawBuffer)
             {

src/libGLESv2/entry_points_gles_2_0.cpp

@@ -1342,11 +1342,11 @@ void GL_APIENTRY FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenu
         if (renderbuffer != 0)
         {
             Renderbuffer *renderbufferObject = context->getRenderbuffer(renderbuffer);
-            framebuffer->setAttachment(GL_RENDERBUFFER, attachment, gl::ImageIndex::MakeInvalid(), renderbufferObject);
+            framebuffer->setRenderbufferAttachment(attachment, renderbufferObject);
         }
         else
         {
-            framebuffer->resetAttachment(attachment);
+            framebuffer->setNULLAttachment(attachment);
         }
     }
 }
@@ -1383,11 +1383,11 @@ void GL_APIENTRY FramebufferTexture2D(GLenum target, GLenum attachment, GLenum t
                 index = ImageIndex::MakeCube(textarget, level);
             }
 
-            framebuffer->setAttachment(GL_TEXTURE, attachment, index, textureObj);
+            framebuffer->setTextureAttachment(attachment, textureObj, index);
         }
         else
         {
-            framebuffer->resetAttachment(attachment);
+            framebuffer->setNULLAttachment(attachment);
         }
     }
 }

src/libGLESv2/entry_points_gles_3_0.cpp

@@ -763,11 +763,11 @@ void GL_APIENTRY FramebufferTextureLayer(GLenum target, GLenum attachment, GLuin
                 index = ImageIndex::Make2DArray(level, layer);
             }
 
-            framebuffer->setAttachment(GL_TEXTURE, attachment, index, textureObject);
+            framebuffer->setTextureAttachment(attachment, textureObject, index);
         }
         else
         {
-            framebuffer->resetAttachment(attachment);
+            framebuffer->setNULLAttachment(attachment);
         }
     }
 }