Vulkan: Make ImageViewHelper a Resource

src/libANGLE/renderer/vulkan/ResourceVk.h

@@ -185,7 +185,7 @@ class Resource : angle::NonCopyable
     angle::Result waitForIdle(ContextVk *contextVk, const char *debugMessage);
 
     // Adds the resource to a resource use list.
-    void retain(ResourceUseList *resourceUseList);
+    void retain(ResourceUseList *resourceUseList) const;
 
   protected:
     Resource();
@@ -195,7 +195,7 @@ class Resource : angle::NonCopyable
     SharedResourceUse mUse;
 };
 
-ANGLE_INLINE void Resource::retain(ResourceUseList *resourceUseList)
+ANGLE_INLINE void Resource::retain(ResourceUseList *resourceUseList) const
 {
     // Store reference in resource list.
     resourceUseList->add(mUse);

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -6146,13 +6146,14 @@ FramebufferHelper::FramebufferHelper() = default;
 
 FramebufferHelper::~FramebufferHelper() = default;
 
-FramebufferHelper::FramebufferHelper(FramebufferHelper &&other)
+FramebufferHelper::FramebufferHelper(FramebufferHelper &&other) : Resource(std::move(other))
 {
     mFramebuffer = std::move(other.mFramebuffer);
 }
 
 FramebufferHelper &FramebufferHelper::operator=(FramebufferHelper &&other)
 {
+    std::swap(mUse, other.mUse);
     std::swap(mFramebuffer, other.mFramebuffer);
     return *this;
 }
@@ -6170,12 +6171,9 @@ void FramebufferHelper::release(ContextVk *contextVk)
 }
 
 // ImageViewHelper implementation.
-ImageViewHelper::ImageViewHelper() : mCurrentMaxLevel(0), mLinearColorspace(true)
-{
-    mUse.init();
-}
+ImageViewHelper::ImageViewHelper() : mCurrentMaxLevel(0), mLinearColorspace(true) {}
 
-ImageViewHelper::ImageViewHelper(ImageViewHelper &&other)
+ImageViewHelper::ImageViewHelper(ImageViewHelper &&other) : Resource(std::move(other))
 {
     std::swap(mCurrentMaxLevel, other.mCurrentMaxLevel);
     std::swap(mPerLevelLinearReadImageViews, other.mPerLevelLinearReadImageViews);
@@ -6192,10 +6190,7 @@ ImageViewHelper::ImageViewHelper(ImageViewHelper &&other)
     std::swap(mImageViewSerial, other.mImageViewSerial);
 }
 
-ImageViewHelper::~ImageViewHelper()
-{
-    mUse.release();
-}
+ImageViewHelper::~ImageViewHelper() {}
 
 void ImageViewHelper::init(RendererVk *renderer)
 {

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -415,7 +415,7 @@ class DynamicQueryPool final : public DynamicallyGrowingPool<QueryPool>
 // of a fixed size as needed and allocates indices within those pools.
 //
 // The QueryHelper class below keeps the pool and index pair together.
-class QueryHelper final : public vk::Resource
+class QueryHelper final : public Resource
 {
   public:
     QueryHelper();
@@ -1894,12 +1894,12 @@ enum class SrgbDecodeMode
     SrgbDecode
 };
 
-class ImageViewHelper : angle::NonCopyable
+class ImageViewHelper final : public Resource
 {
   public:
     ImageViewHelper();
     ImageViewHelper(ImageViewHelper &&other);
-    ~ImageViewHelper();
+    ~ImageViewHelper() override;
 
     void init(RendererVk *renderer);
     void release(RendererVk *renderer);
@@ -1986,9 +1986,6 @@ class ImageViewHelper : angle::NonCopyable
         }
     }
 
-    // Store reference to usage in graph.
-    void retain(ResourceUseList *resourceUseList) const { resourceUseList->add(mUse); }
-
     // For applications that frequently switch a texture's max level, and make no other changes to
     // the texture, change the currently-used max level, and potentially create new "read views"
     // for the new max-level
@@ -2094,9 +2091,6 @@ class ImageViewHelper : angle::NonCopyable
                                         uint32_t layerCount,
                                         VkImageUsageFlags imageUsageFlags);
 
-    // Lifetime.
-    SharedResourceUse mUse;
-
     // For applications that frequently switch a texture's max level, and make no other changes to
     // the texture, keep track of the currently-used max level, and keep one "read view" per
     // max-level