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

src/gpu/vk/GrVkTextureRenderTarget.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 GrVkTextureRenderTarget_DEFINED
 #define GrVkTextureRenderTarget_DEFINED
 
 #include "GrVkTexture.h"
 #include "GrVkRenderTarget.h"
 #include "GrVkGpu.h"
 
 #ifdef SK_BUILD_FOR_WIN
 // Windows gives bogus warnings about inheriting asTexture/asRenderTarget via dominance.
 #pragma warning(push)
 #pragma warning(disable: 4250)
 #endif
 
 class GrVkImageView;
-struct GrVkTextureInfo;
+struct GrVkImageInfo;
 
 class GrVkTextureRenderTarget: public GrVkTexture, public GrVkRenderTarget {
 public:
     static GrVkTextureRenderTarget* CreateNewTextureRenderTarget(GrVkGpu*, SkBudgeted,
                                                                  const GrSurfaceDesc&,
                                                                  const GrVkImage::ImageDesc&);
 
     static GrVkTextureRenderTarget* CreateWrappedTextureRenderTarget(GrVkGpu*,
                                                                      const GrSurfaceDesc&,
                                                                      GrWrapOwnership,
-                                                                     VkFormat,
-                                                                     const GrVkTextureInfo*);
+                                                                     const GrVkImageInfo*);
 
 protected:
     void onAbandon() override {
         GrVkRenderTarget::onAbandon();
         GrVkTexture::onAbandon();
     }
 
     void onRelease() override {
         GrVkRenderTarget::onRelease();
         GrVkTexture::onRelease();
     }
 
 private:
     GrVkTextureRenderTarget(GrVkGpu* gpu,
                             SkBudgeted budgeted,
                             const GrSurfaceDesc& desc,
-                            const GrVkImage::Resource* imageResource,
+                            const GrVkImageInfo& info,
                             const GrVkImageView* texView,
-                            const GrVkImage::Resource* msaaResource,
+                            const GrVkImageInfo& msaaInfo,
                             const GrVkImageView* colorAttachmentView,
                             const GrVkImageView* resolveAttachmentView)
         : GrSurface(gpu, desc)
-        , GrVkImage(imageResource)
-        , GrVkTexture(gpu, desc, imageResource, texView)
-        , GrVkRenderTarget(gpu, desc, imageResource, msaaResource, colorAttachmentView,
-                           resolveAttachmentView) {
+        , GrVkImage(info, false)
+        , GrVkTexture(gpu, desc, info, texView, false)
+        , GrVkRenderTarget(gpu, desc, info, msaaInfo, colorAttachmentView,
+                           resolveAttachmentView, false) {
         this->registerWithCache(budgeted);
     }
 
     GrVkTextureRenderTarget(GrVkGpu* gpu,
                             SkBudgeted budgeted,
                             const GrSurfaceDesc& desc,
-                            const GrVkImage::Resource* imageResource,
+                            const GrVkImageInfo& info,
                             const GrVkImageView* texView,
                             const GrVkImageView* colorAttachmentView)
         : GrSurface(gpu, desc)
-        , GrVkImage(imageResource)
-        , GrVkTexture(gpu, desc, imageResource, texView)
-        , GrVkRenderTarget(gpu, desc, imageResource, colorAttachmentView) {
+        , GrVkImage(info, false)
+        , GrVkTexture(gpu, desc, info, texView, false)
+        , GrVkRenderTarget(gpu, desc, info, colorAttachmentView, false) {
         this->registerWithCache(budgeted);
     }
-    enum Wrapped { kWrapped };
     GrVkTextureRenderTarget(GrVkGpu* gpu,
-                            Wrapped,
                             const GrSurfaceDesc& desc,
-                            const GrVkImage::Resource* imageResource,
+                            const GrVkImageInfo& info,
                             const GrVkImageView* texView,
-                            const GrVkImage::Resource* msaaResource,
+                            const GrVkImageInfo& msaaInfo,
                             const GrVkImageView* colorAttachmentView,
-                            const GrVkImageView* resolveAttachmentView)
+                            const GrVkImageView* resolveAttachmentView,
+                            bool isBorrowed)
         : GrSurface(gpu, desc)
-        , GrVkImage(imageResource)
-        , GrVkTexture(gpu, desc, imageResource, texView)
-        , GrVkRenderTarget(gpu, desc, imageResource, msaaResource, colorAttachmentView,
-                           resolveAttachmentView) {
+        , GrVkImage(info, isBorrowed)
+        , GrVkTexture(gpu, desc, info, texView, isBorrowed)
+        , GrVkRenderTarget(gpu, desc, info, msaaInfo, colorAttachmentView,
+                           resolveAttachmentView, isBorrowed) {
         this->registerWithCacheWrapped();
     }
 
     GrVkTextureRenderTarget(GrVkGpu* gpu,
-                            Wrapped,
                             const GrSurfaceDesc& desc,
-                            const GrVkImage::Resource* imageResource,
+                            const GrVkImageInfo& info,
                             const GrVkImageView* texView,
-                            const GrVkImageView* colorAttachmentView)
+                            const GrVkImageView* colorAttachmentView,
+                            bool isBorrowed)
         : GrSurface(gpu, desc)
-        , GrVkImage(imageResource)
-        , GrVkTexture(gpu, desc, imageResource, texView)
-        , GrVkRenderTarget(gpu, desc, imageResource, colorAttachmentView) {
+        , GrVkImage(info, isBorrowed)
+        , GrVkTexture(gpu, desc, info, texView, isBorrowed)
+        , GrVkRenderTarget(gpu, desc, info, colorAttachmentView, isBorrowed) {
         this->registerWithCacheWrapped();
     }
 
-    template <typename ResourceType>
     static GrVkTextureRenderTarget* Create(GrVkGpu*,
-                                           ResourceType,
                                            const GrSurfaceDesc&,
-                                           VkFormat,
-                                           const GrVkImage::Resource* imageResource);
+                                           const GrVkImageInfo&,
+                                           SkBudgeted budgeted,
+                                           bool isWrapped,

[jvanverth1, 2016/05/13 16:14:40]

Here's a case where using an enum for isBorrowed would help -- when calling
Create it's easy to get the two bools confused.

[egdaniel, 2016/05/13 18:00:05]

Done.

+                                           bool isBorrowed);
 
     // GrGLRenderTarget accounts for the texture's memory and any MSAA renderbuffer's memory.
     size_t onGpuMemorySize() const override {
         return GrVkRenderTarget::onGpuMemorySize();
     }
 };
 
 #endif