commit 9d05b930eedac7053c0cef41f295939dc5372344
author Geoff Lang <geofflang@chromium.org> Fri Jul 27 15:47:18 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Aug 01 16:33:30 2018 +0000
tree 078944851e315316f1ee6b6f8087ea33b2a8b000
parent 0bc81b6cadc3cc1473aa32a19e8c63168ee72adc

Don't store a ref from an EGL image to its source.

ImageSiblings no longer inherit from RefCountObeject because they may be EGL
or GL objects and should handle their own deletion.

This can cause GL resources to outlive their contexts.  When the GL resource
is deleted, simply orphan the image.

BUG=angleproject:2668

Change-Id: I4a5c12bbe6e725f946209f9b48345a4097c9c91c
Reviewed-on: https://chromium-review.googlesource.com/1153601
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Image.cpp

diff --git a/src/libANGLE/Image.cpp b/src/libANGLE/Image.cpp
index dc2467b..69c7cb2 100644
--- a/src/libANGLE/Image.cpp
+++ b/src/libANGLE/Image.cpp
@@ -10,6 +10,7 @@
 
 #include "common/debug.h"
 #include "common/utilities.h"
+#include "libANGLE/Context.h"
 #include "libANGLE/Renderbuffer.h"
 #include "libANGLE/Texture.h"
 #include "libANGLE/angletypes.h"
@@ -43,10 +44,15 @@
         return gl::ImageIndex::MakeFromTarget(target, mip);
     }
 }
+
+const Display *DisplayFromContext(const gl::Context *context)
+{
+    return (context ? context->getCurrentDisplay() : nullptr);
+}
+
 }  // anonymous namespace
 
-ImageSibling::ImageSibling(GLuint id)
-    : RefCountObject(id), FramebufferAttachmentObject(), mSourcesOf(), mTargetOf()
+ImageSibling::ImageSibling() : FramebufferAttachmentObject(), mSourcesOf(), mTargetOf()
 {
 }
 
@@ -62,7 +68,7 @@
 void ImageSibling::setTargetImage(const gl::Context *context, egl::Image *imageTarget)
 {
     ASSERT(imageTarget != nullptr);
-    mTargetOf.set(context, imageTarget);
+    mTargetOf.set(DisplayFromContext(context), imageTarget);
     imageTarget->addTargetSibling(this);
 }
 
@@ -74,11 +80,11 @@
         ASSERT(mSourcesOf.empty());
 
         ANGLE_TRY(mTargetOf->orphanSibling(context, this));
-        mTargetOf.set(context, nullptr);
+        mTargetOf.set(DisplayFromContext(context), nullptr);
     }
     else
     {
-        for (egl::Image *sourceImage : mSourcesOf)
+        for (Image *sourceImage : mSourcesOf)
         {
             ANGLE_TRY(sourceImage->orphanSibling(context, this));
         }
@@ -137,8 +143,7 @@
              EGLenum target,
              ImageSibling *buffer,
              const AttributeMap &attribs)
-    : RefCountObject(0),
-      mState(target, buffer, attribs),
+    : mState(target, buffer, attribs),
       mImplementation(factory->createImage(mState, context, target, attribs)),
       mOrphanedAndNeedsInit(false)
 {
@@ -148,19 +153,20 @@
     mState.source->addImageSource(this);
 }
 
-gl::Error Image::onDestroy(const gl::Context *context)
+Error Image::onDestroy(const Display *display)
 {
     // All targets should hold a ref to the egl image and it should not be deleted until there are
     // no siblings left.
     ASSERT(mState.targets.empty());
 
     // Tell the source that it is no longer used by this image
-    if (mState.source.get() != nullptr)
+    if (mState.source != nullptr)
     {
         mState.source->removeImageSource(this);
-        mState.source.set(context, nullptr);
+        mState.source = nullptr;
     }
-    return gl::NoError();
+
+    return NoError();
 }
 
 Image::~Image()
@@ -185,14 +191,16 @@
 
 gl::Error Image::orphanSibling(const gl::Context *context, ImageSibling *sibling)
 {
+    ASSERT(sibling != nullptr);
+
     // notify impl
     ANGLE_TRY(mImplementation->orphan(context, sibling));
 
-    if (mState.source.get() == sibling)
+    if (mState.source == sibling)
     {
         // If the sibling is the source, it cannot be a target.
         ASSERT(mState.targets.find(sibling) == mState.targets.end());
-        mState.source.set(context, nullptr);
+        mState.source = nullptr;
         mOrphanedAndNeedsInit =
             (sibling->initState(mState.imageIndex) == gl::InitState::MayNeedInit);
     }
@@ -236,7 +244,7 @@
 
 bool Image::orphaned() const
 {
-    return (mState.source.get() == nullptr);
+    return (mState.source == nullptr);
 }
 
 gl::InitState Image::sourceInitState() const