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

src/gpu/vk/GrVkStencilAttachment.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrVkStencilAttachment.h"
 #include "GrVkGpu.h"
 #include "GrVkImage.h"
 #include "GrVkImageView.h"
 #include "GrVkUtil.h"
 
 #define VK_CALL(GPU, X) GR_VK_CALL(GPU->vkInterface(), X)
 
 GrVkStencilAttachment::GrVkStencilAttachment(GrVkGpu* gpu,
                                              const Format& format,
                                              const GrVkImage::ImageDesc& desc,
-                                             const GrVkImage::Resource* imageResource,
+                                             const GrVkImageInfo& info,
                                              const GrVkImageView* stencilView)
     : GrStencilAttachment(gpu, desc.fWidth, desc.fHeight,
                           format.fStencilBits, desc.fSamples)
-    , GrVkImage(imageResource)
+    , GrVkImage(info, GrVkImage::kNot_Wrapped)
     , fFormat(format)
     , fStencilView(stencilView) {
     this->registerWithCache(SkBudgeted::kYes);
     stencilView->ref();
 }
 
 GrVkStencilAttachment* GrVkStencilAttachment::Create(GrVkGpu* gpu,
                                                      int width,
                                                      int height,
                                                      int sampleCnt,
                                                      const Format& format) {
     GrVkImage::ImageDesc imageDesc;
     imageDesc.fImageType = VK_IMAGE_TYPE_2D;
     imageDesc.fFormat = format.fInternalFormat;
     imageDesc.fWidth = width;
     imageDesc.fHeight = height;
     imageDesc.fLevels = 1;
     imageDesc.fSamples = sampleCnt;
     imageDesc.fImageTiling = VK_IMAGE_TILING_OPTIMAL;
     imageDesc.fUsageFlags = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT |
                             VK_IMAGE_USAGE_TRANSFER_DST_BIT;
     imageDesc.fMemProps = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
 
-    const GrVkImage::Resource* imageResource = GrVkImage::CreateResource(gpu, imageDesc);
-    if (!imageResource) {
+    GrVkImageInfo info;
+    if (!GrVkImage::InitImageInfo(gpu, imageDesc, &info)) {
         return nullptr;
     }
 
-    const GrVkImageView* imageView = GrVkImageView::Create(gpu, imageResource->fImage,
+    const GrVkImageView* imageView = GrVkImageView::Create(gpu, info.fImage,
                                                            format.fInternalFormat,
                                                            GrVkImageView::kStencil_Type, 1);
     if (!imageView) {
-        imageResource->unref(gpu);
+        VK_CALL(gpu, DestroyImage(gpu->device(), info.fImage, nullptr));
+        VK_CALL(gpu, FreeMemory(gpu->device(), info.fAlloc, nullptr));
         return nullptr;
     }
 
     GrVkStencilAttachment* stencil = new GrVkStencilAttachment(gpu, format, imageDesc,
-                                                               imageResource, imageView);
-    imageResource->unref(gpu);
+                                                               info, imageView);
     imageView->unref(gpu);
 
     return stencil;
 }
 
 GrVkStencilAttachment::~GrVkStencilAttachment() {
     // should have been released or abandoned first
     SkASSERT(!fStencilView);
 }
 
@@ skipping 19 matching lines @@
     this->abandonImage();
     fStencilView->unrefAndAbandon();
     fStencilView = nullptr;
     GrStencilAttachment::onAbandon();
 }
 
 GrVkGpu* GrVkStencilAttachment::getVkGpu() const {
     SkASSERT(!this->wasDestroyed());
     return static_cast<GrVkGpu*>(this->getGpu());
 }