Make Framebuffer attachments angle::Subjects.

src/libANGLE/Framebuffer.cpp

@@ -1788,7 +1788,7 @@ void Framebuffer::updateAttachment(const Context *context,
                        multiviewLayout, viewportOffsets);
     mDirtyBits.set(dirtyBit);
     mState.mResourceNeedsInit.set(dirtyBit, attachment->initState() == InitState::MayNeedInit);
-    onDirtyBinding->bind(resource ? resource->getSubject() : nullptr);
+    onDirtyBinding->bind(resource);
 
     invalidateCompletenessCache(context);
 }

src/libANGLE/FramebufferAttachment.cpp

@@ -340,11 +340,6 @@ angle::Result FramebufferAttachmentObject::getAttachmentRenderTarget(
     return getAttachmentImpl()->getAttachmentRenderTarget(context, binding, imageIndex, rtOut);
 }
 
-void FramebufferAttachmentObject::onStorageChange(const gl::Context *context) const
-{
-    return getAttachmentImpl()->onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
-}
-
 angle::Result FramebufferAttachmentObject::initializeContents(const Context *context,
                                                               const ImageIndex &imageIndex)
 {

src/libANGLE/FramebufferAttachment.h

@@ -14,6 +14,7 @@
 #include "common/angleutils.h"
 #include "libANGLE/Error.h"
 #include "libANGLE/ImageIndex.h"
+#include "libANGLE/Observer.h"
 #include "libANGLE/formatutils.h"
 #include "libANGLE/renderer/FramebufferAttachmentObjectImpl.h"
 
@@ -36,11 +37,6 @@ class FramebufferAttachmentRenderTarget : angle::NonCopyable
 class FramebufferAttachmentObjectImpl;
 }  // namespace rx
 
-namespace angle
-{
-class Subject;
-}  // namespace angle
-
 namespace gl
 {
 class FramebufferAttachmentObject;
@@ -194,7 +190,7 @@ class FramebufferAttachment final
 };
 
 // A base class for objects that FBO Attachments may point to.
-class FramebufferAttachmentObject
+class FramebufferAttachmentObject : public angle::Subject
 {
   public:
     FramebufferAttachmentObject();
@@ -222,9 +218,6 @@ class FramebufferAttachmentObject
 
     angle::Result initializeContents(const Context *context, const ImageIndex &imageIndex);
 
-    void onStorageChange(const gl::Context *context) const;
-    angle::Subject *getSubject() const { return getAttachmentImpl(); }
-
   protected:
     virtual rx::FramebufferAttachmentObjectImpl *getAttachmentImpl() const = 0;
 };

src/libANGLE/Renderbuffer.cpp

@@ -102,7 +102,7 @@ angle::Result Renderbuffer::setStorage(const Context *context,
 
     mState.update(static_cast<GLsizei>(width), static_cast<GLsizei>(height), Format(internalformat),
                   0, InitState::MayNeedInit);
-    onStorageChange(context);
+    onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
 
     return angle::Result::Continue();
 }
@@ -119,7 +119,7 @@ angle::Result Renderbuffer::setStorageMultisample(const Context *context,
 
     mState.update(static_cast<GLsizei>(width), static_cast<GLsizei>(height), Format(internalformat),
                   static_cast<GLsizei>(samples), InitState::MayNeedInit);
-    onStorageChange(context);
+    onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
 
     return angle::Result::Continue();
 }
@@ -133,7 +133,7 @@ angle::Result Renderbuffer::setStorageEGLImageTarget(const Context *context, egl
 
     mState.update(static_cast<GLsizei>(image->getWidth()), static_cast<GLsizei>(image->getHeight()),
                   Format(image->getFormat()), 0, image->sourceInitState());
-    onStorageChange(context);
+    onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
 
     return angle::Result::Continue();
 }

src/libANGLE/State.cpp

@@ -468,7 +468,7 @@ ANGLE_INLINE angle::Result State::updateActiveTexture(const Context *context,
         return angle::Result::Continue();
     }
 
-    mCompleteTextureBindings[textureIndex].bind(texture->getImplementation());
+    mCompleteTextureBindings[textureIndex].bind(texture);
 
     if (!texture->isSamplerComplete(context, sampler))
     {

src/libANGLE/Surface.cpp

@@ -134,7 +134,7 @@ void Surface::postSwap(const gl::Context *context)
     if (mRobustResourceInitialization && mSwapBehavior != EGL_BUFFER_PRESERVED)
     {
         mInitState = gl::InitState::MayNeedInit;
-        onStorageChange(context);
+        onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
     }
 }
 

src/libANGLE/Texture.cpp

@@ -966,7 +966,7 @@ GLint Texture::getLevelMemorySize(TextureTarget target, GLint level) const
 void Texture::signalDirty(const Context *context, InitState initState)
 {
     mState.mInitState = initState;
-    onStorageChange(context);
+    onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
     invalidateCompletenessCache();
 }
 

src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h

@@ -18,7 +18,7 @@ namespace rx
 {
 class FramebufferAttachmentRenderTarget;
 
-class FramebufferAttachmentObjectImpl : public angle::Subject
+class FramebufferAttachmentObjectImpl : angle::NonCopyable
 {
   public:
     FramebufferAttachmentObjectImpl() {}

src/libANGLE/renderer/TextureImpl.h

@@ -40,7 +40,7 @@ namespace rx
 {
 class ContextImpl;
 
-class TextureImpl : public FramebufferAttachmentObjectImpl
+class TextureImpl : public FramebufferAttachmentObjectImpl, public angle::Subject
 {
   public:
     TextureImpl(const gl::TextureState &state);

src/libANGLE/renderer/d3d/EGLImageD3D.cpp

@@ -82,7 +82,7 @@ angle::Result EGLImageD3D::copyToLocalRendertarget(const gl::Context *context)
     // Invalidate FBOs with this Image attached. Only currently applies to D3D11.
     for (egl::ImageSibling *target : mState.targets)
     {
-        target->getSubject()->onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
+        target->onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
     }
 
     return mRenderer->createRenderTargetCopy(context, curRenderTarget, &mRenderTarget);