Refactor Vulkan image, texture, RTs so that create and getter handles match.

src/gpu/vk/GrVkRenderTarget.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrVkRenderTarget_DEFINED
 #define GrVkRenderTarget_DEFINED
 
 #include "GrVkImage.h"
 #include "GrRenderTarget.h"
 
 #include "GrVkRenderPass.h"
 
 class GrVkCommandBuffer;
 class GrVkFramebuffer;
 class GrVkGpu;
 class GrVkImageView;
 class GrVkStencilAttachment;
 
-struct GrVkTextureInfo;
+struct GrVkImageInfo;
 
 #ifdef SK_BUILD_FOR_WIN
 // Windows gives bogus warnings about inheriting asTexture/asRenderTarget via dominance.
 #pragma warning(push)
 #pragma warning(disable: 4250)
 #endif
 
 class GrVkRenderTarget: public GrRenderTarget, public virtual GrVkImage {
 public:
     static GrVkRenderTarget* CreateNewRenderTarget(GrVkGpu*, SkBudgeted, const GrSurfaceDesc&,
                                                    const GrVkImage::ImageDesc&);
 
     static GrVkRenderTarget* CreateWrappedRenderTarget(GrVkGpu*, const GrSurfaceDesc&,
                                                        GrWrapOwnership,
-                                                       const GrVkTextureInfo*);
+                                                       const GrVkImageInfo*);
 
     ~GrVkRenderTarget() override;
 
     const GrVkFramebuffer* framebuffer() const { return fFramebuffer; }
     const GrVkImageView* colorAttachmentView() const { return fColorAttachmentView; }
-    const GrVkImage::Resource* msaaImageResource() const { return fMSAAImageResource; }
+    const GrVkResource* msaaImageResource() const {
+        if (fMSAAImage) {
+            return fMSAAImage->fResource;
+        }
+        return nullptr;
+    }
     const GrVkImageView* resolveAttachmentView() const { return fResolveAttachmentView; }
-    const GrVkImage::Resource* stencilImageResource() const;
+    const GrVkResource* stencilImageResource() const;
     const GrVkImageView* stencilAttachmentView() const;
 
     const GrVkRenderPass* simpleRenderPass() const { return fCachedSimpleRenderPass; }
 
     // override of GrRenderTarget
     ResolveType getResolveType() const override {
         return kCanResolve_ResolveType;
     }
 
     bool canAttemptStencilAttachment() const override {
         return true;
     }
 
     GrBackendObject getRenderTargetHandle() const override;
 
     // Returns the total number of attachments
     void getAttachmentsDescriptor(GrVkRenderPass::AttachmentsDescriptor* desc,
                                   GrVkRenderPass::AttachmentFlags* flags) const;
 
     void addResources(GrVkCommandBuffer& commandBuffer) const;
 
 protected:
     GrVkRenderTarget(GrVkGpu* gpu,
-                     SkBudgeted,
                      const GrSurfaceDesc& desc,
-                     const GrVkImage::Resource* imageResource,
-                     const GrVkImage::Resource* msaaImageResource,
+                     const GrVkImageInfo& info,
+                     const GrVkImageInfo& msaaInfo,
                      const GrVkImageView* colorAttachmentView,
-                     const GrVkImageView* resolveAttachmentView);
+                     const GrVkImageView* resolveAttachmentView,
+                     GrVkImage::Wrapped wrapped);
 
     GrVkRenderTarget(GrVkGpu* gpu,
                      const GrSurfaceDesc& desc,
-                     const GrVkImage::Resource* imageResource,
-                     const GrVkImage::Resource* msaaImageResource,
+                     const GrVkImageInfo& info,
                      const GrVkImageView* colorAttachmentView,
-                     const GrVkImageView* resolveAttachmentView);
-
-    GrVkRenderTarget(GrVkGpu* gpu,
-                     SkBudgeted,
-                     const GrSurfaceDesc& desc,
-                     const GrVkImage::Resource* imageResource,
-                     const GrVkImageView* colorAttachmentView);
-
-    GrVkRenderTarget(GrVkGpu* gpu,
-                     const GrSurfaceDesc& desc,
-                     const GrVkImage::Resource* imageResource,
-                     const GrVkImageView* colorAttachmentView);
-
-    static GrVkRenderTarget* Create(GrVkGpu*, SkBudgeted, const GrSurfaceDesc&,
-                                    const GrVkImage::Resource* imageResource);
+                     GrVkImage::Wrapped wrapped);
 
     GrVkGpu* getVkGpu() const;
 
     void onAbandon() override;
     void onRelease() override;
 
     // This accounts for the texture's memory and any MSAA renderbuffer's memory.
     size_t onGpuMemorySize() const override {
         SkASSERT(kUnknown_GrPixelConfig != fDesc.fConfig);
         SkASSERT(!GrPixelConfigIsCompressed(fDesc.fConfig));
         size_t colorBytes = GrBytesPerPixel(fDesc.fConfig);
         SkASSERT(colorBytes > 0);
         return fColorValuesPerPixel * fDesc.fWidth * fDesc.fHeight * colorBytes;
     }
 
 private:
+    GrVkRenderTarget(GrVkGpu* gpu,
+                     SkBudgeted,
+                     const GrSurfaceDesc& desc,
+                     const GrVkImageInfo& info,
+                     const GrVkImageInfo& msaaInfo,
+                     const GrVkImageView* colorAttachmentView,
+                     const GrVkImageView* resolveAttachmentView,
+                     GrVkImage::Wrapped wrapped);
+
+    GrVkRenderTarget(GrVkGpu* gpu,
+                     SkBudgeted,
+                     const GrSurfaceDesc& desc,
+                     const GrVkImageInfo& info,
+                     const GrVkImageView* colorAttachmentView,
+                     GrVkImage::Wrapped wrapped);
+
+    static GrVkRenderTarget* Create(GrVkGpu*, SkBudgeted, const GrSurfaceDesc&,
+                                    const GrVkImageInfo&, GrVkImage::Wrapped wrapped);
+
     bool completeStencilAttachment() override;
 
     void createFramebuffer(GrVkGpu* gpu);
 
     void releaseInternalObjects();
     void abandonInternalObjects();
 
     const GrVkFramebuffer*     fFramebuffer;
     const GrVkImageView*       fColorAttachmentView;
-    const GrVkImage::Resource* fMSAAImageResource;
+    GrVkImage*                 fMSAAImage;
     const GrVkImageView*       fResolveAttachmentView;
     int                        fColorValuesPerPixel;
 
     // This is a cached pointer to a simple render pass. The render target should unref it
     // once it is done with it.
     const GrVkRenderPass*      fCachedSimpleRenderPass;
 };
 
 #endif