Revert "Vulkan: Forward RenderBuffer/Surface dirty messages."

src/libANGLE/FramebufferAttachment.h

@@ -195,7 +195,7 @@ class FramebufferAttachment final
 };
 
 // A base class for objects that FBO Attachments may point to.
-class FramebufferAttachmentObject : public angle::Subject, public angle::ObserverInterface
+class FramebufferAttachmentObject : public angle::Subject
 {
   public:
     FramebufferAttachmentObject();

src/libANGLE/Image.cpp

@@ -49,8 +49,6 @@ const Display *DisplayFromContext(const gl::Context *context)
 {
     return (context ? context->getDisplay() : nullptr);
 }
-
-angle::SubjectIndex kExternalImageImplSubjectIndex = 0;
 }  // anonymous namespace
 
 ImageSibling::ImageSibling() : FramebufferAttachmentObject(), mSourcesOf(), mTargetOf() {}
@@ -147,11 +145,8 @@ ExternalImageSibling::ExternalImageSibling(rx::EGLImplFactory *factory,
                                            EGLenum target,
                                            EGLClientBuffer buffer,
                                            const AttributeMap &attribs)
-    : mImplementation(factory->createExternalImageSibling(context, target, buffer, attribs)),
-      mImplObserverBinding(this, kExternalImageImplSubjectIndex)
-{
-    mImplObserverBinding.bind(mImplementation.get());
-}
+    : mImplementation(factory->createExternalImageSibling(context, target, buffer, attribs))
+{}
 
 ExternalImageSibling::~ExternalImageSibling() = default;
 
@@ -216,14 +211,6 @@ rx::ExternalImageSiblingImpl *ExternalImageSibling::getImplementation() const
     return mImplementation.get();
 }
 
-void ExternalImageSibling::onSubjectStateChange(angle::SubjectIndex index,
-                                                angle::SubjectMessage message)
-{
-    ASSERT(message == angle::SubjectMessage::SubjectChanged &&
-           index == kExternalImageImplSubjectIndex);
-    onStateChange(angle::SubjectMessage::ContentsChanged);
-}
-
 rx::FramebufferAttachmentObjectImpl *ExternalImageSibling::getAttachmentImpl() const
 {
     return mImplementation.get();

src/libANGLE/Image.h

@@ -38,7 +38,7 @@ class Display;
 // Only currently Renderbuffers and Textures can be bound with images. This makes the relationship
 // explicit, and also ensures that an image sibling can determine if it's been initialized or not,
 // which is important for the robust resource init extension with Textures and EGLImages.
-class ImageSibling : public gl::FramebufferAttachmentObject
+class ImageSibling : public gl::FramebufferAttachmentObject, public angle::ObserverInterface
 {
   public:
     ImageSibling();
@@ -52,6 +52,12 @@ class ImageSibling : public gl::FramebufferAttachmentObject
                       GLenum binding,
                       const gl::ImageIndex &imageIndex) const override;
 
+    // ObserverInterface implementation
+    void onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message) override
+    {
+        // default to no-op.
+    }
+
   protected:
     // Set the image target of this sibling
     void setTargetImage(const gl::Context *context, egl::Image *imageTarget);
@@ -111,11 +117,7 @@ class ExternalImageSibling : public ImageSibling
     rx::FramebufferAttachmentObjectImpl *getAttachmentImpl() const override;
 
   private:
-    // ObserverInterface implementation.
-    void onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message) override;
-
     std::unique_ptr<rx::ExternalImageSiblingImpl> mImplementation;
-    angle::ObserverBinding mImplObserverBinding;
 };
 
 struct ImageState : private angle::NonCopyable

src/libANGLE/Renderbuffer.cpp

@@ -22,11 +22,6 @@
 
 namespace gl
 {
-namespace
-{
-angle::SubjectIndex kRenderbufferImplSubjectIndex = 0;
-}  // namespace
-
 // RenderbufferState implementation.
 RenderbufferState::RenderbufferState()
     : mWidth(0), mHeight(0), mFormat(GL_RGBA4), mSamples(0), mInitState(InitState::MayNeedInit)
@@ -72,11 +67,8 @@ Renderbuffer::Renderbuffer(rx::GLImplFactory *implFactory, RenderbufferID id)
     : RefCountObject(implFactory->generateSerial(), id),
       mState(),
       mImplementation(implFactory->createRenderbuffer(mState)),
-      mLabel(),
-      mImplObserverBinding(this, kRenderbufferImplSubjectIndex)
-{
-    mImplObserverBinding.bind(mImplementation.get());
-}
+      mLabel()
+{}
 
 void Renderbuffer::onDestroy(const Context *context)
 {
@@ -313,10 +305,4 @@ angle::Result Renderbuffer::getRenderbufferImage(const Context *context,
     return mImplementation->getRenderbufferImage(context, packState, packBuffer, format, type,
                                                  pixels);
 }
-
-void Renderbuffer::onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message)
-{
-    ASSERT(message == angle::SubjectMessage::SubjectChanged);
-    onStateChange(angle::SubjectMessage::ContentsChanged);
-}
 }  // namespace gl

src/libANGLE/Renderbuffer.h

@@ -127,16 +127,12 @@ class Renderbuffer final : public RefCountObject<RenderbufferID>,
                                        void *pixels) const;
 
   private:
-    // ObserverInterface implementation.
-    void onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message) override;
-
     rx::FramebufferAttachmentObjectImpl *getAttachmentImpl() const override;
 
     RenderbufferState mState;
     std::unique_ptr<rx::RenderbufferImpl> mImplementation;
 
     std::string mLabel;
-    angle::ObserverBinding mImplObserverBinding;
 };
 
 }  // namespace gl

src/libANGLE/Surface.cpp

@@ -24,10 +24,6 @@
 
 namespace egl
 {
-namespace
-{
-angle::SubjectIndex kSurfaceImplSubjectIndex = 0;
-}  // namespace
 
 SurfaceState::SurfaceState(const egl::Config *configIn, const AttributeMap &attributesIn)
     : label(nullptr),
@@ -78,8 +74,7 @@ Surface::Surface(EGLint surfaceType,
       mTexture(nullptr),
       mColorFormat(config->renderTargetFormat),
       mDSFormat(config->depthStencilFormat),
-      mInitState(gl::InitState::Initialized),
-      mImplObserverBinding(this, kSurfaceImplSubjectIndex)
+      mInitState(gl::InitState::Initialized)
 {
     mPostSubBufferRequested =
         (attributes.get(EGL_POST_SUB_BUFFER_SUPPORTED_NV, EGL_FALSE) == EGL_TRUE);
@@ -210,8 +205,6 @@ Error Surface::initialize(const Display *display)
         mState.supportedTimestamps        = mImplementation->getSupportedTimestamps();
     }
 
-    mImplObserverBinding.bind(mImplementation);
-
     return NoError();
 }
 
@@ -586,12 +579,6 @@ Error Surface::getFrameTimestamps(EGLuint64KHR frameId,
     return mImplementation->getFrameTimestamps(frameId, numTimestamps, timestamps, values);
 }
 
-void Surface::onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message)
-{
-    ASSERT(message == angle::SubjectMessage::SubjectChanged && index == kSurfaceImplSubjectIndex);
-    onStateChange(angle::SubjectMessage::ContentsChanged);
-}
-
 WindowSurface::WindowSurface(rx::EGLImplFactory *implFactory,
                              const egl::Config *config,
                              EGLNativeWindowType window,

src/libANGLE/Surface.h

@@ -232,11 +232,7 @@ class Surface : public LabeledObject, public gl::FramebufferAttachmentObject
     void postSwap(const gl::Context *context);
     Error releaseRef(const Display *display);
 
-    // ObserverInterface implementation.
-    void onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message) override;
-
     gl::InitState mInitState;
-    angle::ObserverBinding mImplObserverBinding;
 };
 
 class WindowSurface final : public Surface

src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h

@@ -23,11 +23,11 @@ namespace rx
 {
 class FramebufferAttachmentRenderTarget;
 
-class FramebufferAttachmentObjectImpl : public angle::Subject
+class FramebufferAttachmentObjectImpl : angle::NonCopyable
 {
   public:
     FramebufferAttachmentObjectImpl() {}
-    ~FramebufferAttachmentObjectImpl() override {}
+    virtual ~FramebufferAttachmentObjectImpl() {}
 
     virtual angle::Result getAttachmentRenderTarget(const gl::Context *context,
                                                     GLenum binding,

src/libANGLE/renderer/TextureImpl.h

@@ -41,7 +41,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/vulkan/RenderbufferVk.cpp

@@ -17,16 +17,8 @@
 
 namespace rx
 {
-namespace
-{
-angle::SubjectIndex kRenderbufferImageSubjectIndex = 0;
-}  // namespace
-
 RenderbufferVk::RenderbufferVk(const gl::RenderbufferState &state)
-    : RenderbufferImpl(state),
-      mOwnsImage(false),
-      mImage(nullptr),
-      mImageObserverBinding(this, kRenderbufferImageSubjectIndex)
+    : RenderbufferImpl(state), mOwnsImage(false), mImage(nullptr)
 {}
 
 RenderbufferVk::~RenderbufferVk() {}
@@ -69,7 +61,6 @@ angle::Result RenderbufferVk::setStorageImpl(const gl::Context *context,
         {
             mImage     = new vk::ImageHelper();
             mOwnsImage = true;
-            mImageObserverBinding.bind(mImage);
         }
 
         const angle::Format &textureFormat = vkFormat.actualImageFormat();
@@ -121,7 +112,6 @@ angle::Result RenderbufferVk::setStorageEGLImageTarget(const gl::Context *contex
     ImageVk *imageVk = vk::GetImpl(image);
     mImage           = imageVk->getImage();
     mOwnsImage       = false;
-    mImageObserverBinding.bind(mImage);
 
     const vk::Format &vkFormat = renderer->getFormat(image->getFormat().info->sizedInternalFormat);
     const angle::Format &textureFormat = vkFormat.actualImageFormat();
@@ -183,7 +173,6 @@ void RenderbufferVk::releaseAndDeleteImage(ContextVk *contextVk)
 {
     releaseImage(contextVk);
     SafeDelete(mImage);
-    mImageObserverBinding.bind(nullptr);
 }
 
 void RenderbufferVk::releaseImage(ContextVk *contextVk)
@@ -198,7 +187,6 @@ void RenderbufferVk::releaseImage(ContextVk *contextVk)
     else
     {
         mImage = nullptr;
-        mImageObserverBinding.bind(nullptr);
     }
 
     mImageViews.release(renderer);
@@ -238,13 +226,4 @@ angle::Result RenderbufferVk::getRenderbufferImage(const gl::Context *context,
     return mImage->readPixelsForGetImage(contextVk, packState, packBuffer, 0, 0, format, type,
                                          pixels);
 }
-
-void RenderbufferVk::onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message)
-{
-    ASSERT(index == kRenderbufferImageSubjectIndex &&
-           message == angle::SubjectMessage::SubjectChanged);
-
-    // Forward the notification to the parent class that the staging buffer changed.
-    onStateChange(angle::SubjectMessage::SubjectChanged);
-}
 }  // namespace rx

src/libANGLE/renderer/vulkan/RenderbufferVk.h

@@ -17,7 +17,7 @@
 namespace rx
 {
 
-class RenderbufferVk : public RenderbufferImpl, public angle::ObserverInterface
+class RenderbufferVk : public RenderbufferImpl
 {
   public:
     RenderbufferVk(const gl::RenderbufferState &state);
@@ -70,15 +70,10 @@ class RenderbufferVk : public RenderbufferImpl, public angle::ObserverInterface
 
     const gl::InternalFormat &getImplementationSizedFormat() const;
 
-    // We monitor the staging buffer for changes. This handles staged data from outside this class.
-    void onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message) override;
-
     bool mOwnsImage;
     vk::ImageHelper *mImage;
     vk::ImageViewHelper mImageViews;
     RenderTargetVk mRenderTarget;
-
-    angle::ObserverBinding mImageObserverBinding;
 };
 
 }  // namespace rx

src/libANGLE/renderer/vulkan/SurfaceVk.cpp

@@ -27,8 +27,6 @@ namespace rx
 
 namespace
 {
-angle::SubjectIndex kAnySurfaceImageSubjectIndex = 0;
-
 GLint GetSampleCount(const egl::Config *config)
 {
     GLint samples = 1;
@@ -139,17 +137,7 @@ angle::Result SurfaceVk::getAttachmentRenderTarget(const gl::Context *context,
     return angle::Result::Continue;
 }
 
-void SurfaceVk::onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message)
-{
-    // Forward the notification to parent class that the staging buffer changed.
-    onStateChange(angle::SubjectMessage::SubjectChanged);
-}
-
-OffscreenSurfaceVk::AttachmentImage::AttachmentImage(SurfaceVk *surfaceVk)
-    : imageObserverBinding(surfaceVk, kAnySurfaceImageSubjectIndex)
-{
-    imageObserverBinding.bind(&image);
-}
+OffscreenSurfaceVk::AttachmentImage::AttachmentImage() {}
 
 OffscreenSurfaceVk::AttachmentImage::~AttachmentImage() = default;
 
@@ -229,9 +217,7 @@ void OffscreenSurfaceVk::AttachmentImage::destroy(const egl::Display *display)
 OffscreenSurfaceVk::OffscreenSurfaceVk(const egl::SurfaceState &surfaceState)
     : SurfaceVk(surfaceState),
       mWidth(mState.attributes.getAsInt(EGL_WIDTH, 0)),
-      mHeight(mState.attributes.getAsInt(EGL_HEIGHT, 0)),
-      mColorAttachment(this),
-      mDepthStencilAttachment(this)
+      mHeight(mState.attributes.getAsInt(EGL_HEIGHT, 0))
 {
     mColorRenderTarget.init(&mColorAttachment.image, &mColorAttachment.imageViews, 0, 0);
     mDepthStencilRenderTarget.init(&mDepthStencilAttachment.image,
@@ -465,16 +451,12 @@ WindowSurfaceVk::WindowSurfaceVk(const egl::SurfaceState &surfaceState, EGLNativ
       mPreTransform(VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR),
       mCompositeAlpha(VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR),
       mCurrentSwapHistoryIndex(0),
-      mCurrentSwapchainImageIndex(0),
-      mDepthStencilImageBinding(this, kAnySurfaceImageSubjectIndex),
-      mColorImageMSBinding(this, kAnySurfaceImageSubjectIndex)
+      mCurrentSwapchainImageIndex(0)
 {
     // Initialize the color render target with the multisampled targets.  If not multisampled, the
     // render target will be updated to refer to a swapchain image on every acquire.
     mColorRenderTarget.init(&mColorImageMS, &mColorImageMSViews, 0, 0);
     mDepthStencilRenderTarget.init(&mDepthStencilImage, &mDepthStencilImageViews, 0, 0);
-    mDepthStencilImageBinding.bind(&mDepthStencilImage);
-    mColorImageMSBinding.bind(&mColorImageMS);
 }
 
 WindowSurfaceVk::~WindowSurfaceVk()
@@ -799,25 +781,7 @@ static VkColorSpaceKHR MapEglColorSpaceToVkColorSpace(EGLenum EGLColorspace)
 
 angle::Result WindowSurfaceVk::resizeSwapchainImages(vk::Context *context, uint32_t imageCount)
 {
-    if (static_cast<size_t>(imageCount) != mSwapchainImages.size())
-    {
-        mSwapchainImageBindings.clear();
-        mSwapchainImages.resize(imageCount);
-
-        // Update the image bindings. Because the observer binding class uses raw pointers we
-        // need to first ensure the entire image vector is fully allocated before binding the
-        // subject and observer together.
-        for (uint32_t index = 0; index < imageCount; ++index)
-        {
-            mSwapchainImageBindings.push_back(
-                angle::ObserverBinding(this, kAnySurfaceImageSubjectIndex));
-        }
-
-        for (uint32_t index = 0; index < imageCount; ++index)
-        {
-            mSwapchainImageBindings[index].bind(&mSwapchainImages[index].image);
-        }
-    }
+    mSwapchainImages.resize(imageCount);
 
     // At this point, if there was a previous swapchain, the previous present semaphores have all
     // been moved to mOldSwapchains to be scheduled for destruction, so all semaphore handles in
@@ -1032,8 +996,6 @@ void WindowSurfaceVk::releaseSwapchainImages(ContextVk *contextVk)
         contextVk->addGarbage(&mFramebufferMS);
     }
 
-    mSwapchainImageBindings.clear();
-
     for (SwapchainImage &swapchainImage : mSwapchainImages)
     {
         // We don't own the swapchain image handles, so we just remove our reference to it.

src/libANGLE/renderer/vulkan/SurfaceVk.h

@@ -20,7 +20,7 @@ namespace rx
 {
 class RendererVk;
 
-class SurfaceVk : public SurfaceImpl, public angle::ObserverInterface
+class SurfaceVk : public SurfaceImpl
 {
   public:
     angle::Result getAttachmentRenderTarget(const gl::Context *context,
@@ -33,9 +33,6 @@ class SurfaceVk : public SurfaceImpl, public angle::ObserverInterface
     SurfaceVk(const egl::SurfaceState &surfaceState);
     ~SurfaceVk() override;
 
-    // We monitor the staging buffer for changes. This handles staged data from outside this class.
-    void onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message) override;
-
     RenderTargetVk mColorRenderTarget;
     RenderTargetVk mDepthStencilRenderTarget;
 };
@@ -81,7 +78,7 @@ class OffscreenSurfaceVk : public SurfaceVk
   protected:
     struct AttachmentImage final : angle::NonCopyable
     {
-        AttachmentImage(SurfaceVk *surfaceVk);
+        AttachmentImage();
         ~AttachmentImage();
 
         angle::Result initialize(DisplayVk *displayVk,
@@ -101,7 +98,6 @@ class OffscreenSurfaceVk : public SurfaceVk
 
         vk::ImageHelper image;
         vk::ImageViewHelper imageViews;
-        angle::ObserverBinding imageObserverBinding;
     };
 
     virtual angle::Result initializeImpl(DisplayVk *displayVk);
@@ -297,7 +293,6 @@ class WindowSurfaceVk : public SurfaceVk
     std::vector<impl::SwapchainCleanupData> mOldSwapchains;
 
     std::vector<impl::SwapchainImage> mSwapchainImages;
-    std::vector<angle::ObserverBinding> mSwapchainImageBindings;
     vk::Semaphore mAcquireImageSemaphore;
     uint32_t mCurrentSwapchainImageIndex;
 
@@ -306,12 +301,10 @@ class WindowSurfaceVk : public SurfaceVk
     // Depth/stencil image.  Possibly multisampled.
     vk::ImageHelper mDepthStencilImage;
     vk::ImageViewHelper mDepthStencilImageViews;
-    angle::ObserverBinding mDepthStencilImageBinding;
 
     // Multisample color image, view and framebuffer, if multisampling enabled.
     vk::ImageHelper mColorImageMS;
     vk::ImageViewHelper mColorImageMSViews;
-    angle::ObserverBinding mColorImageMSBinding;
     vk::Framebuffer mFramebufferMS;
 };
 

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -40,7 +40,7 @@ constexpr VkImageUsageFlags kTransferStagingImageFlags =
 constexpr VkFormatFeatureFlags kBlitFeatureFlags =
     VK_FORMAT_FEATURE_BLIT_SRC_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT;
 
-constexpr angle::SubjectIndex kTextureImageSubjectIndex = 0;
+constexpr angle::SubjectIndex kStagingBufferSubjectIndex = 0;
 
 bool CanCopyWithTransfer(RendererVk *renderer,
                          const vk::Format &srcFormat,
@@ -115,7 +115,7 @@ TextureVk::TextureVk(const gl::TextureState &state, RendererVk *renderer)
       mImage(nullptr),
       mStagingBufferInitialSize(vk::kStagingBufferSize),
       mImageUsageFlags(0),
-      mImageObserverBinding(this, kTextureImageSubjectIndex)
+      mStagingBufferObserverBinding(this, kStagingBufferSubjectIndex)
 {}
 
 TextureVk::~TextureVk() = default;
@@ -879,7 +879,7 @@ void TextureVk::releaseAndDeleteImage(ContextVk *contextVk)
     {
         releaseImage(contextVk);
         releaseStagingBuffer(contextVk);
-        mImageObserverBinding.bind(nullptr);
+        mStagingBufferObserverBinding.bind(nullptr);
         SafeDelete(mImage);
     }
 }
@@ -924,7 +924,7 @@ void TextureVk::setImageHelper(ContextVk *contextVk,
 {
     ASSERT(mImage == nullptr);
 
-    mImageObserverBinding.bind(imageHelper);
+    mStagingBufferObserverBinding.bind(imageHelper);
 
     mOwnsImage        = selfOwned;
     mImageNativeType  = imageType;
@@ -1686,7 +1686,7 @@ void TextureVk::releaseImage(ContextVk *contextVk)
         }
         else
         {
-            mImageObserverBinding.bind(nullptr);
+            mStagingBufferObserverBinding.bind(nullptr);
             mImage = nullptr;
         }
     }
@@ -1852,9 +1852,9 @@ const vk::Format &TextureVk::getBaseLevelFormat(RendererVk *renderer) const
 
 void TextureVk::onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message)
 {
-    ASSERT(index == kTextureImageSubjectIndex && message == angle::SubjectMessage::SubjectChanged);
+    ASSERT(index == kStagingBufferSubjectIndex && message == angle::SubjectMessage::SubjectChanged);
 
-    // Forward the notification to the parent that the staging buffer changed.
+    // Forward the notification to vk::Texture that the staging buffer changed.
     onStateChange(angle::SubjectMessage::SubjectChanged);
 }
 }  // namespace rx

src/libANGLE/renderer/vulkan/TextureVk.h

@@ -430,7 +430,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface
     // The created vkImage usage flag.
     VkImageUsageFlags mImageUsageFlags;
 
-    angle::ObserverBinding mImageObserverBinding;
+    angle::ObserverBinding mStagingBufferObserverBinding;
 };
 
 }  // namespace rx