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

src/gpu/vk/GrVkTexture.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 GrVkTexture_DEFINED
 #define GrVkTexture_DEFINED
 
 #include "GrGpu.h"
 #include "GrTexture.h"
 #include "GrVkImage.h"
 
 class GrVkGpu;
 class GrVkImageView;
-struct GrVkTextureInfo;
+struct GrVkImageInfo;
 
 class GrVkTexture : public GrTexture, public virtual GrVkImage {
 public:
     static GrVkTexture* CreateNewTexture(GrVkGpu*, SkBudgeted budgeted, const GrSurfaceDesc&,
                                          const GrVkImage::ImageDesc&);
 
     static GrVkTexture* CreateWrappedTexture(GrVkGpu*, const GrSurfaceDesc&,
-                                             GrWrapOwnership,
-                                             VkFormat, const GrVkTextureInfo*);
+                                             GrWrapOwnership, const GrVkImageInfo*);
 
     ~GrVkTexture() override;
 
     GrBackendObject getTextureHandle() const override;
 
     void textureParamsModified() override {}
 
     const GrVkImageView* textureView(bool allowSRGB);
 
     bool reallocForMipmap(const GrVkGpu* gpu, uint32_t mipLevels);
 
 protected:
-    GrVkTexture(GrVkGpu*, const GrSurfaceDesc&,
-                const GrVkImage::Resource*, const GrVkImageView* imageView);
-
-    template<typename ResourceType>
-    static GrVkTexture* Create(GrVkGpu*, ResourceType, const GrSurfaceDesc&, VkFormat,
-                               const GrVkImage::Resource* texImpl);
+    GrVkTexture(GrVkGpu*, const GrSurfaceDesc&, const GrVkImageInfo&, const GrVkImageView*,
+                GrVkImage::Wrapped wrapped);
 
     GrVkGpu* getVkGpu() const;
 
     void onAbandon() override;
     void onRelease() override;
 
 private:
     enum Wrapped { kWrapped };
     GrVkTexture(GrVkGpu*, SkBudgeted, const GrSurfaceDesc&,
-                const GrVkImage::Resource*, const GrVkImageView* imageView);
+                const GrVkImageInfo&, const GrVkImageView* imageView);
     GrVkTexture(GrVkGpu*, Wrapped, const GrSurfaceDesc&,
-                const GrVkImage::Resource*, const GrVkImageView* imageView);
+                const GrVkImageInfo&, const GrVkImageView* imageView, GrVkImage::Wrapped wrapped);
 
     const GrVkImageView*     fTextureView;
     const GrVkImageView*     fLinearTextureView;
 
     typedef GrTexture INHERITED;
 };
 
 #endif